';
- }
-
- public function task()
- {
- return '';
- }
-
- public function product()
- {
- return '';
- }
-
- public function footer()
- {
- return '
-
';
- }
-}
diff --git a/app/Events/Credit/CreditWasViewed.php b/app/Events/Credit/CreditWasViewed.php
index 2fb428f18268..d7e6a07ddd85 100644
--- a/app/Events/Credit/CreditWasViewed.php
+++ b/app/Events/Credit/CreditWasViewed.php
@@ -12,7 +12,6 @@
namespace App\Events\Credit;
use App\Models\Company;
-use App\Models\CreditWasViewed;
use Illuminate\Queue\SerializesModels;
/**
diff --git a/app/Events/Quote/QuoteWasViewed.php b/app/Events/Quote/QuoteWasViewed.php
index 725964994ac5..80452990837c 100644
--- a/app/Events/Quote/QuoteWasViewed.php
+++ b/app/Events/Quote/QuoteWasViewed.php
@@ -12,7 +12,6 @@
namespace App\Events\Quote;
use App\Models\Company;
-use App\Models\QuoteWasViewed;
use Illuminate\Queue\SerializesModels;
/**
diff --git a/app/Exceptions/PaymentFailed.php b/app/Exceptions/PaymentFailed.php
new file mode 100644
index 000000000000..06d3f9dda5cb
--- /dev/null
+++ b/app/Exceptions/PaymentFailed.php
@@ -0,0 +1,21 @@
+ $this->getMessage(),
+ 'code' => $this->getCode(),
+ ]);
+ }
+}
diff --git a/app/Factory/ExpenseFactory.php b/app/Factory/ExpenseFactory.php
index ddade6b1c18a..0272d8f3c288 100644
--- a/app/Factory/ExpenseFactory.php
+++ b/app/Factory/ExpenseFactory.php
@@ -33,7 +33,16 @@ class ExpenseFactory
$expense->tax_rate3 = 0;
$expense->date = null;
$expense->payment_date = null;
-
+ $expense->amount = 0;
+ $expense->foreign_amount = 0;
+ $expense->private_notes = '';
+ $expense->public_notes = '';
+ $expense->transaction_reference = '';
+ $expense->custom_value1 = '';
+ $expense->custom_value2 = '';
+ $expense->custom_value3 = '';
+ $expense->custom_value4 = '';
+
return $expense;
}
}
diff --git a/app/Factory/TaskStatusFactory.php b/app/Factory/TaskStatusFactory.php
new file mode 100644
index 000000000000..bead18ebb760
--- /dev/null
+++ b/app/Factory/TaskStatusFactory.php
@@ -0,0 +1,27 @@
+user_id = $user_id;
+ $task_status->company_id = $company_id;
+ $task_status->name = '';
+
+ return $task_status;
+ }
+}
diff --git a/app/Helpers/Email/EmailBuilder.php b/app/Helpers/Email/EmailBuilder.php
index aa7d19bcaa10..f8be6203f104 100644
--- a/app/Helpers/Email/EmailBuilder.php
+++ b/app/Helpers/Email/EmailBuilder.php
@@ -20,26 +20,6 @@ class EmailBuilder
public $view_link;
public $view_text;
- private function parseTemplate(string $data, bool $is_markdown = true, $contact = null): string
- {
- //process variables
- if (! empty($this->variables)) {
- $data = str_replace(array_keys($this->variables), array_values($this->variables), $data);
- }
-
- //process markdown
- if ($is_markdown) {
- $converter = new CommonMarkConverter([
- 'html_input' => 'allow',
- 'allow_unsafe_links' => true,
- ]);
-
- $data = $converter->convertToHtml($data);
- }
-
- return $data;
- }
-
/**
* @param $footer
* @return $this
@@ -75,7 +55,6 @@ class EmailBuilder
*/
public function setSubject($subject)
{
- //$this->subject = $this->parseTemplate($subject, false, $this->contact);
if (! empty($this->variables)) {
$subject = str_replace(array_keys($this->variables), array_values($this->variables), $subject);
@@ -92,8 +71,7 @@ class EmailBuilder
*/
public function setBody($body)
{
- //$this->body = $this->parseTemplate($body, true);
-
+ //todo move this to use HTMLEngine
if (! empty($this->variables)) {
$body = str_replace(array_keys($this->variables), array_values($this->variables), $body);
}
diff --git a/app/Helpers/Email/InvoiceEmail.php b/app/Helpers/Email/InvoiceEmail.php
index 68fe303e56fa..9fad11927ea8 100644
--- a/app/Helpers/Email/InvoiceEmail.php
+++ b/app/Helpers/Email/InvoiceEmail.php
@@ -8,8 +8,10 @@
namespace App\Helpers\Email;
+use App\Helpers\Email\EntityEmailInterface;
use App\Models\Invoice;
use App\Models\InvoiceInvitation;
+use App\Utils\HtmlEngine;
use App\Utils\Number;
class InvoiceEmail extends EmailBuilder
@@ -21,7 +23,7 @@ class InvoiceEmail extends EmailBuilder
$contact = $invitation->contact;
if (! $reminder_template) {
- $reminder_template = $invoice->calculateTemplate();
+ $reminder_template = $invoice->calculateTemplate('invoice');
}
$body_template = $client->getSetting('email_template_'.$reminder_template);
@@ -68,7 +70,7 @@ class InvoiceEmail extends EmailBuilder
$this->setTemplate($client->getSetting('email_style'))
->setContact($contact)
- ->setVariables($invoice->makeValues($contact))
+ ->setVariables((new HtmlEngine($invitation))->makeValues())
->setSubject($subject_template)
->setBody($body_template)
->setFooter("
".ctrans('texts.view_invoice').'')
diff --git a/app/Helpers/Email/QuoteEmail.php b/app/Helpers/Email/QuoteEmail.php
index a1f91da900f2..c98f1d0532f3 100644
--- a/app/Helpers/Email/QuoteEmail.php
+++ b/app/Helpers/Email/QuoteEmail.php
@@ -10,6 +10,7 @@ namespace App\Helpers\Email;
use App\Models\Quote;
use App\Models\QuoteInvitation;
+use App\Utils\HtmlEngine;
class QuoteEmail extends EmailBuilder
{
@@ -56,7 +57,7 @@ class QuoteEmail extends EmailBuilder
$this->setTemplate($quote->client->getSetting('email_style'))
->setContact($contact)
->setFooter("
Quote Link")
- ->setVariables($quote->makeValues($contact))
+ ->setVariables((new HtmlEngine($invitation))->makeValues())
->setSubject($subject_template)
->setBody($body_template);
diff --git a/app/Helpers/Invoice/InvoiceSum.php b/app/Helpers/Invoice/InvoiceSum.php
index c21308cdc172..3ee3c8d9f39c 100644
--- a/app/Helpers/Invoice/InvoiceSum.php
+++ b/app/Helpers/Invoice/InvoiceSum.php
@@ -187,6 +187,18 @@ class InvoiceSum
return $this->invoice;
}
+ public function getRecurringInvoice()
+ {
+
+ $this->invoice->amount = $this->formatValue($this->getTotal(), $this->invoice->client->currency()->precision);
+ $this->invoice->total_taxes = $this->getTotalTaxes();
+ $this->invoice->balance = $this->formatValue($this->getTotal(), $this->invoice->client->currency()->precision);
+
+ $this->invoice->save();
+
+ return $this->invoice;
+ }
+
/**
* Build $this->invoice variables after
* calculations have been performed.
diff --git a/app/Helpers/Invoice/InvoiceSumInclusive.php b/app/Helpers/Invoice/InvoiceSumInclusive.php
index 3887f968039d..307ad07040f8 100644
--- a/app/Helpers/Invoice/InvoiceSumInclusive.php
+++ b/app/Helpers/Invoice/InvoiceSumInclusive.php
@@ -174,6 +174,18 @@ class InvoiceSumInclusive
return $this;
}
+ public function getRecurringInvoice()
+ {
+
+ $this->invoice->amount = $this->formatValue($this->getTotal(), $this->invoice->client->currency()->precision);
+ $this->invoice->total_taxes = $this->getTotalTaxes();
+ $this->invoice->balance = $this->formatValue($this->getTotal(), $this->invoice->client->currency()->precision);
+
+ $this->invoice->save();
+
+ return $this->invoice;
+ }
+
public function getInvoice()
{
//Build invoice values here and return Invoice
diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index ba7111ef860d..2df8db9190b7 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -63,40 +63,42 @@ class BaseController extends Controller
'user.company_user',
'token.company_user',
'company.activities',
+ 'company.designs.company',
+ 'company.task_statuses',
+ 'company.expense_categories',
+ 'company.documents',
'company.users.company_user',
- 'company.tax_rates',
- 'company.groups',
- 'company.company_gateways.gateway',
- 'company.clients.contacts',
+ 'company.clients.contacts.company',
'company.clients.gateway_tokens',
'company.clients.documents',
- 'company.products',
- 'company.products.documents',
- 'company.recurring_invoices',
+ 'company.company_gateways.gateway',
+ 'company.credits.invitations.contact',
+ 'company.credits.invitations.company',
+ 'company.credits.documents',
+ 'company.expenses.documents',
+ 'company.groups',
'company.invoices.invitations.contact',
'company.invoices.invitations.company',
'company.invoices.documents',
+ 'company.products',
+ 'company.products.documents',
+ 'company.payments.paymentables',
+ 'company.payments.documents',
+ 'company.payment_terms.company',
+ 'company.projects.documents',
'company.recurring_invoices',
'company.recurring_invoices.invitations.contact',
'company.recurring_invoices.invitations.company',
'company.recurring_invoices.documents',
- 'company.payments.paymentables',
- 'company.payments.documents',
'company.quotes.invitations.contact',
'company.quotes.invitations.company',
'company.quotes.documents',
- 'company.credits.invitations.contact',
- 'company.credits.invitations.company',
- 'company.credits.documents',
- 'company.payment_terms.company',
- 'company.vendors.contacts',
- 'company.expenses.documents',
'company.tasks.documents',
- 'company.projects.documents',
- 'company.designs.company',
- 'company.documents',
- 'company.webhooks',
+ 'company.tax_rates',
'company.tokens_hashed',
+ 'company.vendors.contacts.company',
+ 'company.vendors.documents',
+ 'company.webhooks',
];
private $mini_load = [
@@ -208,56 +210,62 @@ class BaseController extends Controller
$query->whereNotNull('updated_at')->with('documents');
},
'company.clients' => function ($query) use ($updated_at) {
- $query->where('clients.updated_at', '>=', $updated_at)->with('contacts', 'gateway_tokens','documents');
- },
- 'company.tax_rates' => function ($query) use ($updated_at) {
- $query->where('updated_at', '>=', $updated_at);
- },
- 'company.groups' => function ($query) use ($updated_at) {
- $query->where('updated_at', '>=', $updated_at);
+ $query->where('clients.updated_at', '>=', $updated_at)->with('contacts.company', 'gateway_tokens','documents');
},
'company.company_gateways' => function ($query) {
$query->whereNotNull('updated_at');
},
- 'company.products' => function ($query) use ($updated_at) {
- $query->where('updated_at', '>=', $updated_at)->with('documents');
- },
- 'company.recurring_invoices'=> function ($query) use ($updated_at) {
- $query->where('updated_at', '>=', $updated_at)->with('company');
- },
- 'company.invoices'=> function ($query) use ($updated_at) {
- $query->where('updated_at', '>=', $updated_at)->with('invitations', 'company', 'documents');
- },
- 'company.recurring_invoices'=> function ($query) use ($updated_at) {
- $query->where('updated_at', '>=', $updated_at)->with('invitations', 'company', 'documents');
- },
- 'company.payments'=> function ($query) use ($updated_at) {
- $query->where('updated_at', '>=', $updated_at)->with('paymentables','documents');
- },
- 'company.quotes'=> function ($query) use ($updated_at) {
- $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents');
- },
'company.credits'=> function ($query) use ($updated_at) {
- $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents');
- },
- 'company.payment_terms'=> function ($query) use ($updated_at) {
- $query->where('updated_at', '>=', $updated_at);
- },
- 'company.vendors'=> function ($query) use ($updated_at) {
- $query->where('updated_at', '>=', $updated_at)->with('contacts');
- },
- 'company.expenses'=> function ($query) use ($updated_at) {
- $query->where('updated_at', '>=', $updated_at);
- },
- 'company.tasks'=> function ($query) use ($updated_at) {
- $query->where('updated_at', '>=', $updated_at);
- },
- 'company.projects'=> function ($query) use ($updated_at) {
- $query->where('updated_at', '>=', $updated_at);
+ $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents',);
},
'company.designs'=> function ($query) use ($updated_at) {
$query->where('updated_at', '>=', $updated_at)->with('company');
},
+ 'company.documents'=> function ($query) use ($updated_at) {
+ $query->where('updated_at', '>=', $updated_at);
+ },
+ 'company.expenses'=> function ($query) use ($updated_at) {
+ $query->where('updated_at', '>=', $updated_at)->with('documents' );
+ },
+ 'company.groups' => function ($query) use ($updated_at) {
+ $query->where('updated_at', '>=', $updated_at);
+ },
+ 'company.invoices'=> function ($query) use ($updated_at) {
+ $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents');
+ },
+ 'company.payments'=> function ($query) use ($updated_at) {
+ $query->where('updated_at', '>=', $updated_at)->with('paymentables','documents', );
+ },
+ 'company.payment_terms'=> function ($query) use ($updated_at) {
+ $query->where('updated_at', '>=', $updated_at);
+ },
+ 'company.products' => function ($query) use ($updated_at) {
+ $query->where('updated_at', '>=', $updated_at)->with('documents');
+ },
+ 'company.projects'=> function ($query) use ($updated_at) {
+ $query->where('updated_at', '>=', $updated_at)->with('documents' );
+ },
+ 'company.quotes'=> function ($query) use ($updated_at) {
+ $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents',);
+ },
+ 'company.recurring_invoices'=> function ($query) use ($updated_at) {
+ $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents');
+ },
+ 'company.tasks'=> function ($query) use ($updated_at) {
+ $query->where('updated_at', '>=', $updated_at)->with('documents' );
+ },
+ 'company.tax_rates' => function ($query) use ($updated_at) {
+ $query->where('updated_at', '>=', $updated_at);
+ },
+ 'company.vendors'=> function ($query) use ($updated_at) {
+ $query->where('updated_at', '>=', $updated_at)->with('contacts','documents' );
+ },
+ 'company.expense_categories'=> function ($query) use ($updated_at) {
+ $query->where('updated_at', '>=', $updated_at);
+ },
+ 'company.task_statuses'=> function ($query) use ($updated_at) {
+ $query->where('updated_at', '>=', $updated_at);
+ },
]
);
@@ -419,7 +427,8 @@ class BaseController extends Controller
public function flutterRoute()
{
- if ((bool) $this->checkAppSetup() !== false && Schema::hasTable('accounts') && $account = Account::first()) {
+ // if ((bool) $this->checkAppSetup() !== false && Schema::hasTable('accounts') && $account = Account::first()) {
+ if ((bool) $this->checkAppSetup() !== false && $account = Account::first()) {
if (config('ninja.require_https') && ! request()->isSecure()) {
return redirect()->secure(request()->getRequestUri());
}
diff --git a/app/Http/Controllers/ClientPortal/PaymentController.php b/app/Http/Controllers/ClientPortal/PaymentController.php
index ff36acb2ee4e..8a2774551cb1 100644
--- a/app/Http/Controllers/ClientPortal/PaymentController.php
+++ b/app/Http/Controllers/ClientPortal/PaymentController.php
@@ -175,7 +175,7 @@ class PaymentController extends Controller
$payment_method_id = $request->input('payment_method_id');
$invoice_totals = $payable_invoices->sum('amount');
$first_invoice = $invoices->first();
- $credit_totals = $first_invoice->company->use_credits_payment == 'off' ? 0 : $first_invoice->client->service()->getCreditBalance();
+ $credit_totals = $first_invoice->client->getSetting('use_credits_payment') == 'off' ? 0 : $first_invoice->client->service()->getCreditBalance();
$starting_invoice_amount = $first_invoice->amount;
if($gateway)
@@ -193,7 +193,7 @@ class PaymentController extends Controller
$payment_hash = new PaymentHash;
$payment_hash->hash = Str::random(128);
- $payment_hash->data = $payable_invoices->toArray();
+ $payment_hash->data = ['invoices' => $payable_invoices->toArray()];
$payment_hash->fee_total = $fee_totals;
$payment_hash->fee_invoice_id = $first_invoice->id;
$payment_hash->save();
@@ -220,17 +220,19 @@ class PaymentController extends Controller
return $gateway
->driver(auth()->user()->client)
->setPaymentMethod($payment_method_id)
+ ->setPaymentHash($payment_hash)
->processPaymentView($data);
}
public function response(PaymentResponseRequest $request)
{
- /*Payment Gateway*/
$gateway = CompanyGateway::find($request->input('company_gateway_id'))->firstOrFail();
+ $payment_hash = PaymentHash::whereRaw('BINARY `hash`= ?', [$request->payment_hash])->first();
return $gateway
->driver(auth()->user()->client)
->setPaymentMethod($request->input('payment_method_id'))
+ ->setPaymentHash($payment_hash)
->processPaymentResponse($request);
}
diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php
index a2cad28cc1ce..a023f7e63fa3 100644
--- a/app/Http/Controllers/CompanyController.php
+++ b/app/Http/Controllers/CompanyController.php
@@ -23,6 +23,7 @@ use App\Http\Requests\Company\UpdateCompanyRequest;
use App\Http\Requests\SignupRequest;
use App\Jobs\Company\CreateCompany;
use App\Jobs\Company\CreateCompanyPaymentTerms;
+use App\Jobs\Company\CreateCompanyTaskStatuses;
use App\Jobs\Company\CreateCompanyToken;
use App\Jobs\Ninja\RefundCancelledAccount;
use App\Jobs\RegisterNewAccount;
@@ -205,6 +206,7 @@ class CompanyController extends BaseController
$company = CreateCompany::dispatchNow($request->all(), auth()->user()->company()->account);
CreateCompanyPaymentTerms::dispatchNow($company, auth()->user());
+ CreateCompanyTaskStatuses::dispatchNow($company, auth()->user());
$company = $this->company_repo->save($request->all(), $company);
diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php
index 720a7f04a358..7b7800974c62 100644
--- a/app/Http/Controllers/CreditController.php
+++ b/app/Http/Controllers/CreditController.php
@@ -16,6 +16,7 @@ use App\Http\Requests\Credit\ShowCreditRequest;
use App\Http\Requests\Credit\StoreCreditRequest;
use App\Http\Requests\Credit\UpdateCreditRequest;
use App\Jobs\Credit\StoreCredit;
+use App\Jobs\Entity\EmailEntity;
use App\Jobs\Invoice\EmailCredit;
use App\Jobs\Invoice\MarkInvoicePaid;
use App\Models\Client;
@@ -545,7 +546,13 @@ class CreditController extends BaseController
}
break;
case 'email':
- EmailCredit::dispatch($credit, $credit->company);
+ // EmailCredit::dispatch($credit, $credit->company);
+
+ $credit->invitations->load('contact.client.country', 'credit.client.country', 'credit.company')->each(function ($invitation) use ($credit) {
+ EmailEntity::dispatch($invitation, $credit->company);
+ });
+
+
if (! $bulk) {
return response()->json(['message'=>'email sent'], 200);
}
diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php
index 6f60ef64765e..e99d92f0e231 100644
--- a/app/Http/Controllers/EmailController.php
+++ b/app/Http/Controllers/EmailController.php
@@ -13,15 +13,18 @@ namespace App\Http\Controllers;
use App\Helpers\Email\InvoiceEmail;
use App\Http\Requests\Email\SendEmailRequest;
+use App\Jobs\Entity\EmailEntity;
use App\Jobs\Invoice\EmailInvoice;
use App\Jobs\Mail\EntitySentMailer;
use App\Models\Credit;
use App\Models\Invoice;
use App\Models\Quote;
+use App\Models\RecurringInvoice;
use App\Notifications\SendGenericNotification;
use App\Transformers\CreditTransformer;
use App\Transformers\InvoiceTransformer;
use App\Transformers\QuoteTransformer;
+use App\Transformers\RecurringInvoiceTransformer;
use App\Utils\Traits\MakesHash;
class EmailController extends BaseController
@@ -116,32 +119,41 @@ class EmailController extends BaseController
$entity_obj->invitations->each(function ($invitation) use ($subject, $body, $entity_string, $entity_obj) {
if ($invitation->contact->send_email && $invitation->contact->email) {
- $when = now()->addSeconds(1);
- $invitation->contact->notify((new SendGenericNotification($invitation, $entity_string, $subject, $body))->delay($when));
+ EmailEntity::dispatchNow($invitation, $invitation->company);
+ //$invitation->contact->notify((new SendGenericNotification($invitation, $entity_string, $subject, $body))->delay($when));
}
});
+ $entity_obj->last_sent_date = now();
+ $entity_obj->save();
+
/*Only notify the admin ONCE, not once per contact/invite*/
$invitation = $entity_obj->invitations->first();
EntitySentMailer::dispatch($invitation, $entity_string, $entity_obj->user, $invitation->company);
- if ($this instanceof Invoice) {
+ if ($entity_obj instanceof Invoice) {
$this->entity_type = Invoice::class;
$this->entity_transformer = InvoiceTransformer::class;
}
- if ($this instanceof Quote) {
+ if ($entity_obj instanceof Quote) {
$this->entity_type = Quote::class;
$this->entity_transformer = QuoteTransformer::class;
}
- if ($this instanceof Credit) {
+ if ($entity_obj instanceof Credit) {
$this->entity_type = Credit::class;
$this->entity_transformer = CreditTransformer::class;
}
+ if ($entity_obj instanceof RecurringInvoice) {
+ $this->entity_type = RecurringInvoice::class;
+ $this->entity_transformer = RecurringInvoiceTransformer::class;
+ }
+
+
$entity_obj->service()->markSent()->save();
return $this->itemResponse($entity_obj);
diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index cdbcfffb361e..b1312f7b04f1 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -28,8 +28,7 @@ use App\Http\Requests\Invoice\EditInvoiceRequest;
use App\Http\Requests\Invoice\ShowInvoiceRequest;
use App\Http\Requests\Invoice\StoreInvoiceRequest;
use App\Http\Requests\Invoice\UpdateInvoiceRequest;
-use App\Jobs\Invoice\CreateInvoicePdf;
-use App\Jobs\Invoice\EmailInvoice;
+use App\Jobs\Entity\EmailEntity;
use App\Jobs\Invoice\StoreInvoice;
use App\Jobs\Invoice\ZipInvoices;
use App\Jobs\Util\UnlinkFile;
@@ -707,7 +706,7 @@ class InvoiceController extends BaseController
if (request()->has('email_type') && property_exists($invoice->company->settings, request()->input('email_type'))) {
$this->reminder_template = $invoice->client->getSetting(request()->input('email_type'));
} else {
- $this->reminder_template = $invoice->calculateTemplate();
+ $this->reminder_template = $invoice->calculateTemplate('invoice');
}
//touch reminder1,2,3_sent + last_sent here if the email is a reminder.
@@ -717,7 +716,7 @@ class InvoiceController extends BaseController
$invoice->invitations->load('contact.client.country', 'invoice.client.country', 'invoice.company')->each(function ($invitation) use ($invoice) {
$email_builder = (new InvoiceEmail())->build($invitation, $this->reminder_template);
- EmailInvoice::dispatch($email_builder, $invitation, $invoice->company);
+ EmailEntity::dispatch($invitation, $invoice->company);
});
if (! $bulk) {
diff --git a/app/Http/Controllers/OpenAPI/TaskStatusSchema.php b/app/Http/Controllers/OpenAPI/TaskStatusSchema.php
new file mode 100644
index 000000000000..6cfaa811f979
--- /dev/null
+++ b/app/Http/Controllers/OpenAPI/TaskStatusSchema.php
@@ -0,0 +1,12 @@
+load('client');
- $html = new HtmlEngine(null, $entity_obj->invitations()->first(), request()->entity_type);
+ $html = new HtmlEngine($entity_obj->invitations()->first());
$design_namespace = 'App\Services\PdfMaker\Designs\\'.request()->design['name'];
@@ -176,7 +175,7 @@ class PreviewController extends BaseController
return response()->json(['message' => 'Invalid custom design object'], 400);
}
- $html = new HtmlEngine(null, $invoice->invitations()->first(), 'invoice');
+ $html = new HtmlEngine($invoice->invitations()->first());
$design = new Design(Design::CUSTOM, ['custom_partials' => request()->design['design']]);
@@ -196,8 +195,6 @@ class PreviewController extends BaseController
->design($design)
->build();
- // info($maker->getCompiledHTML(true));
-
$file_path = PreviewPdf::dispatchNow($maker->getCompiledHTML(true), auth()->user()->company());
DB::rollBack();
diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index 4b8b721d38bd..cfc772554147 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -24,6 +24,7 @@ use App\Models\Project;
use App\Repositories\ProjectRepository;
use App\Transformers\ProjectTransformer;
use App\Utils\Traits\BulkOptions;
+use App\Utils\Traits\GeneratesCounter;
use App\Utils\Traits\MakesHash;
use App\Utils\Traits\SavesDocuments;
use Illuminate\Http\Request;
@@ -36,7 +37,8 @@ class ProjectController extends BaseController
{
use MakesHash;
use SavesDocuments;
-
+ use GeneratesCounter;
+
protected $entity_type = Project::class;
protected $entity_transformer = ProjectTransformer::class;
@@ -353,6 +355,7 @@ class ProjectController extends BaseController
{
$project = ProjectFactory::create(auth()->user()->company()->id, auth()->user()->id);
$project->fill($request->all());
+ $project->number = $this->getNextProjectNumber($request->getClient($request->input('client_id')));
$project->save();
if ($request->has('documents')) {
diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index ba5a96bdfc41..3bd39ea2c3db 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -16,6 +16,7 @@ use App\Http\Requests\Setup\CheckDatabaseRequest;
use App\Http\Requests\Setup\CheckMailRequest;
use App\Http\Requests\Setup\StoreSetupRequest;
use App\Jobs\Account\CreateAccount;
+use App\Jobs\Util\VersionCheck;
use App\Models\Account;
use App\Utils\SystemHealth;
use Illuminate\Http\Response;
@@ -124,6 +125,8 @@ class SetupController extends Controller
CreateAccount::dispatchNow($request->all());
}
+ VersionCheck::dispatchNow();
+
return redirect('/');
} catch (\Exception $e) {
info($e->getMessage());
@@ -192,7 +195,7 @@ class SetupController extends Controller
return $this->testPhantom();
}
- Browsershot::html('PDF GENERATION WORKS! Thank you for using Invoice Ninja!')
+ Browsershot::html('GENERATING PDFs WORKS! Thank you for using Invoice Ninja!')
->setNodeBinary(config('ninja.system.node_path'))
->setNpmBinary(config('ninja.system.npm_path'))
->noSandbox()
diff --git a/app/Http/Controllers/TaskStatusController.php b/app/Http/Controllers/TaskStatusController.php
new file mode 100644
index 000000000000..f012db3babe5
--- /dev/null
+++ b/app/Http/Controllers/TaskStatusController.php
@@ -0,0 +1,463 @@
+task_status_repo = $task_status_repo;
+ }
+
+ /**
+ * @OA\Get(
+ * path="/api/v1/task_status",
+ * operationId="getTaskStatuss",
+ * tags={"task_status"},
+ * summary="Gets a list of task statuses",
+ * description="Lists task statuses",
+ * @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
+ * @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
+ * @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
+ * @OA\Parameter(ref="#/components/parameters/include"),
+ * @OA\Parameter(ref="#/components/parameters/index"),
+ * @OA\Response(
+ * response=200,
+ * description="A list of task statuses",
+ * @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
+ * @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
+ * @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
+ * @OA\JsonContent(ref="#/components/schemas/TaskStatus"),
+ * ),
+ * @OA\Response(
+ * response=422,
+ * description="Validation error",
+ * @OA\JsonContent(ref="#/components/schemas/ValidationError"),
+
+ * ),
+ * @OA\Response(
+ * response="default",
+ * description="Unexpected Error",
+ * @OA\JsonContent(ref="#/components/schemas/Error"),
+ * ),
+ * )
+ */
+ public function index()
+ {
+ $task_status = TaskStatus::whereCompanyId(auth()->user()->company()->id)->orWhere('company_id', null);
+
+ return $this->listResponse($task_status);
+ }
+
+ /**
+ * Show the form for creating a new resource.
+ *
+ * @param \App\Http\Requests\TaskStatus\CreateTaskStatusRequest $request The request
+ *
+ * @return \Illuminate\Http\Response
+ *
+ *
+ *
+ * @OA\Get(
+ * path="/api/v1/task_statuses/create",
+ * operationId="getTaskStatussCreate",
+ * tags={"task_status"},
+ * summary="Gets a new blank TaskStatus object",
+ * description="Returns a blank object with default values",
+ * @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
+ * @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
+ * @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
+ * @OA\Parameter(ref="#/components/parameters/include"),
+ * @OA\Response(
+ * response=200,
+ * description="A blank TaskStatus object",
+ * @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
+ * @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
+ * @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
+ * @OA\JsonContent(ref="#/components/schemas/TaskStatus"),
+ * ),
+ * @OA\Response(
+ * response=422,
+ * description="Validation error",
+ * @OA\JsonContent(ref="#/components/schemas/ValidationError"),
+ *
+ * ),
+ * @OA\Response(
+ * response="default",
+ * description="Unexpected Error",
+ * @OA\JsonContent(ref="#/components/schemas/Error"),
+ * ),
+ * )
+ */
+ public function create(CreateTaskStatusRequest $request)
+ {
+ $task_status = TaskStatusFactory::create(auth()->user()->company()->id, auth()->user()->id);
+
+ return $this->itemResponse($task_status);
+ }
+
+ /**
+ * Store a newly created resource in storage.
+ *
+ * @param \App\Http\Requests\TaskStatus\StoreTaskStatusRequest $request The request
+ *
+ * @return \Illuminate\Http\Response
+ *
+ *
+ *
+ * @OA\Post(
+ * path="/api/v1/task_status",
+ * operationId="storeTaskStatus",
+ * tags={"task_status"},
+ * summary="Adds a TaskStatus",
+ * description="Adds a TaskStatusto the system",
+ * @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
+ * @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
+ * @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
+ * @OA\Parameter(ref="#/components/parameters/include"),
+ * @OA\RequestBody(
+ * description="The task_status request",
+ * required=true,
+ * @OA\JsonContent(ref="#/components/schemas/TaskStatus"),
+ * ),
+ * @OA\Response(
+ * response=200,
+ * description="Returns the saved TaskStatus object",
+ * @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
+ * @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
+ * @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
+ * @OA\JsonContent(ref="#/components/schemas/TaskStatus"),
+ * ),
+ * @OA\Response(
+ * response=422,
+ * description="Validation error",
+ * @OA\JsonContent(ref="#/components/schemas/ValidationError"),
+ *
+ * ),
+ * @OA\Response(
+ * response="default",
+ * description="Unexpected Error",
+ * @OA\JsonContent(ref="#/components/schemas/Error"),
+ * ),
+ * )
+ */
+ public function store(StoreTaskStatusRequest $request)
+ {
+ $task_status = TaskStatusFactory::create(auth()->user()->company()->id, auth()->user()->id);
+ $task_status->fill($request->all());
+ $task_status->save();
+
+ return $this->itemResponse($task_status->fresh());
+ }
+
+ /**
+ * @OA\Get(
+ * path="/api/v1/task_statuses/{id}",
+ * operationId="showTaskStatus",
+ * tags={"task_status"},
+ * summary="Shows a TaskStatus Term",
+ * description="Displays an TaskStatusby id",
+ * @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
+ * @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
+ * @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
+ * @OA\Parameter(ref="#/components/parameters/include"),
+ * @OA\Parameter(
+ * name="id",
+ * in="path",
+ * description="The TaskStatusHashed ID",
+ * example="D2J234DFA",
+ * required=true,
+ * @OA\Schema(
+ * type="string",
+ * format="string",
+ * ),
+ * ),
+ * @OA\Response(
+ * response=200,
+ * description="Returns the TaskStatusobject",
+ * @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
+ * @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
+ * @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
+ * @OA\JsonContent(ref="#/components/schemas/TaskStatus"),
+ * ),
+ * @OA\Response(
+ * response=422,
+ * description="Validation error",
+ * @OA\JsonContent(ref="#/components/schemas/ValidationError"),
+ *
+ * ),
+ * @OA\Response(
+ * response="default",
+ * description="Unexpected Error",
+ * @OA\JsonContent(ref="#/components/schemas/Error"),
+ * ),
+ * )
+ */
+ public function show(ShowTaskStatusRequest $request, TaskStatus $task_status)
+ {
+ return $this->itemResponse($task_status);
+ }
+
+ /**
+ * @OA\Get(
+ * path="/api/v1/task_statuses/{id}/edit",
+ * operationId="editTaskStatuss",
+ * tags={"task_status"},
+ * summary="Shows an TaskStatusfor editting",
+ * description="Displays an TaskStatusby id",
+ * @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
+ * @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
+ * @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
+ * @OA\Parameter(ref="#/components/parameters/include"),
+ * @OA\Parameter(
+ * name="id",
+ * in="path",
+ * description="The TaskStatusHashed ID",
+ * example="D2J234DFA",
+ * required=true,
+ * @OA\Schema(
+ * type="string",
+ * format="string",
+ * ),
+ * ),
+ * @OA\Response(
+ * response=200,
+ * description="Returns the TaskStatus object",
+ * @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
+ * @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
+ * @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
+ * @OA\JsonContent(ref="#/components/schemas/TaskStatus"),
+ * ),
+ * @OA\Response(
+ * response=422,
+ * description="Validation error",
+ * @OA\JsonContent(ref="#/components/schemas/ValidationError"),
+ *
+ * ),
+ * @OA\Response(
+ * response="default",
+ * description="Unexpected Error",
+ * @OA\JsonContent(ref="#/components/schemas/Error"),
+ * ),
+ * )
+ */
+ public function edit(EditTaskStatusRequest $request, TaskStatus $payment)
+ {
+ return $this->itemResponse($payment);
+ }
+
+ /**
+ * Update the specified resource in storage.
+ *
+ * @param \App\Http\Requests\TaskStatus\UpdateTaskStatusRequest $request The request
+ * @param \App\Models\TaskStatus $task_status The payment term
+ *
+ * @return \Illuminate\Http\Response
+ *
+ *
+ * @OA\Put(
+ * path="/api/v1/task_statuses/{id}",
+ * operationId="updateTaskStatus",
+ * tags={"task_status"},
+ * summary="Updates a TaskStatus Term",
+ * description="Handles the updating of an TaskStatus Termby id",
+ * @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
+ * @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
+ * @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
+ * @OA\Parameter(ref="#/components/parameters/include"),
+ * @OA\Parameter(
+ * name="id",
+ * in="path",
+ * description="The TaskStatusHashed ID",
+ * example="D2J234DFA",
+ * required=true,
+ * @OA\Schema(
+ * type="string",
+ * format="string",
+ * ),
+ * ),
+ * @OA\Response(
+ * response=200,
+ * description="Returns the TaskStatusobject",
+ * @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
+ * @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
+ * @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
+ * @OA\JsonContent(ref="#/components/schemas/TaskStatus"),
+ * ),
+ * @OA\Response(
+ * response=422,
+ * description="Validation error",
+ * @OA\JsonContent(ref="#/components/schemas/ValidationError"),
+ *
+ * ),
+ * @OA\Response(
+ * response="default",
+ * description="Unexpected Error",
+ * @OA\JsonContent(ref="#/components/schemas/Error"),
+ * ),
+ * )
+ */
+ public function update(UpdateTaskStatusRequest $request, TaskStatus $task_status)
+ {
+ $task_status->fill($request->all());
+ $task_status->save();
+
+ return $this->itemResponse($task_status->fresh());
+ }
+
+ /**
+ * Remove the specified resource from storage.
+ *
+ * @param \App\Http\Requests\TaskStatus\DestroyTaskStatusRequest $request
+ * @param \App\Models\TaskStatus $task_status
+ *
+ * @return \Illuminate\Http\Response
+ *
+ *
+ * @OA\Delete(
+ * path="/api/v1/task_statuses/{id}",
+ * operationId="deleteTaskStatus",
+ * tags={"task_statuss"},
+ * summary="Deletes a TaskStatus Term",
+ * description="Handles the deletion of an TaskStatus by id",
+ * @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
+ * @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
+ * @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
+ * @OA\Parameter(ref="#/components/parameters/include"),
+ * @OA\Parameter(
+ * name="id",
+ * in="path",
+ * description="The TaskStatusHashed ID",
+ * example="D2J234DFA",
+ * required=true,
+ * @OA\Schema(
+ * type="string",
+ * format="string",
+ * ),
+ * ),
+ * @OA\Response(
+ * response=200,
+ * description="Returns a HTTP status",
+ * @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
+ * @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
+ * @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
+ * ),
+ * @OA\Response(
+ * response=422,
+ * description="Validation error",
+ * @OA\JsonContent(ref="#/components/schemas/ValidationError"),
+ *
+ * ),
+ * @OA\Response(
+ * response="default",
+ * description="Unexpected Error",
+ * @OA\JsonContent(ref="#/components/schemas/Error"),
+ * ),
+ * )
+ */
+ public function destroy(DestroyTaskStatusRequest $request, TaskStatus $task_status)
+ {
+ $task_status->delete();
+
+ return response()->json([], 200);
+ }
+
+ /**
+ * Perform bulk actions on the list view.
+ *
+ * @return Collection
+ *
+ *
+ * @OA\Post(
+ * path="/api/v1/task_statuses/bulk",
+ * operationId="bulkTaskStatuss",
+ * tags={"task_status"},
+ * summary="Performs bulk actions on an array of task statuses",
+ * description="",
+ * @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
+ * @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
+ * @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
+ * @OA\Parameter(ref="#/components/parameters/index"),
+ * @OA\RequestBody(
+ * description="TaskStatus Ter,s",
+ * required=true,
+ * @OA\MediaType(
+ * mediaType="application/json",
+ * @OA\Schema(
+ * type="array",
+ * @OA\Items(
+ * type="integer",
+ * description="Array of hashed IDs to be bulk 'actioned",
+ * example="[0,1,2,3]",
+ * ),
+ * )
+ * )
+ * ),
+ * @OA\Response(
+ * response=200,
+ * description="The TaskStatus Terms response",
+ * @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
+ * @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
+ * @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
+ * @OA\JsonContent(ref="#/components/schemas/TaskStatus"),
+ * ),
+ * @OA\Response(
+ * response=422,
+ * description="Validation error",
+ * @OA\JsonContent(ref="#/components/schemas/ValidationError"),
+
+ * ),
+ * @OA\Response(
+ * response="default",
+ * description="Unexpected Error",
+ * @OA\JsonContent(ref="#/components/schemas/Error"),
+ * ),
+ * )
+ */
+ public function bulk()
+ {
+ $action = request()->input('action');
+
+ $ids = request()->input('ids');
+
+ $task_status = TaskStatus::withTrashed()->company()->find($this->transformKeys($ids));
+
+ $task_status->each(function ($task_status, $key) use ($action) {
+ if (auth()->user()->can('edit', $task_status)) {
+ $this->task_status_repo->{$action}($task_status);
+ }
+ });
+
+ return $this->listResponse(TaskStatus::withTrashed()->whereIn('id', $this->transformKeys($ids)));
+ }
+}
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index b7f4db0c3774..8c754ff78d42 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -52,10 +52,9 @@ class Kernel extends HttpKernel
],
'api' => [
- 'throttle:60,1',
+ 'throttle:300,1',
'bindings',
'query_logging',
- //\App\Http\Middleware\StartupCheck::class,
\App\Http\Middleware\Cors::class,
],
'contact' => [
@@ -75,7 +74,7 @@ class Kernel extends HttpKernel
\App\Http\Middleware\QueryLogging::class,
],
'shop' => [
- 'throttle:60,1',
+ 'throttle:120,1',
'bindings',
'query_logging',
],
diff --git a/app/Http/Middleware/ContactKeyLogin.php b/app/Http/Middleware/ContactKeyLogin.php
index 4362be0854cb..094bebb34bbc 100644
--- a/app/Http/Middleware/ContactKeyLogin.php
+++ b/app/Http/Middleware/ContactKeyLogin.php
@@ -33,8 +33,6 @@ class ContactKeyLogin
*/
public function handle($request, Closure $next)
{
- info($request->segment(3));
- info($request->route('contact_key'));
if(Auth::guard('contact')->check())
Auth::guard('contact')->logout();
diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php
index 32d854d17b3b..bf71e2969221 100644
--- a/app/Http/Middleware/QueryLogging.php
+++ b/app/Http/Middleware/QueryLogging.php
@@ -53,7 +53,8 @@ class QueryLogging
Log::info($request->method().' - '.$request->url().": $count queries - ".$time);
// if($count > 50)
- // Log::info($queries);
+ // Log::info($queries);
+
}
}
diff --git a/app/Http/Requests/Client/StoreClientRequest.php b/app/Http/Requests/Client/StoreClientRequest.php
index 1b8bba5dde70..93c8877a22f1 100644
--- a/app/Http/Requests/Client/StoreClientRequest.php
+++ b/app/Http/Requests/Client/StoreClientRequest.php
@@ -84,9 +84,8 @@ class StoreClientRequest extends Request
}
}
- if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
- $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
- }
+ $input = $this->decodePrimaryKeys($input);
+
//is no settings->currency_id is set then lets dive in and find either a group or company currency all the below may be redundant!!
if (! property_exists($settings, 'currency_id') && isset($input['group_settings_id'])) {
@@ -108,29 +107,6 @@ class StoreClientRequest extends Request
$input['settings'] = $settings;
- if (isset($input['contacts'])) {
- foreach ($input['contacts'] as $key => $contact) {
- if (array_key_exists('id', $contact) && is_numeric($contact['id'])) {
- unset($input['contacts'][$key]['id']);
- } elseif (array_key_exists('id', $contact) && is_string($contact['id'])) {
- $input['contacts'][$key]['id'] = $this->decodePrimaryKey($contact['id']);
- }
-
- //Filter the client contact password - if it is sent with ***** we should ignore it!
- if (isset($contact['password'])) {
- if (strlen($contact['password']) == 0) {
- $input['contacts'][$key]['password'] = '';
- } else {
- $contact['password'] = str_replace('*', '', $contact['password']);
-
- if (strlen($contact['password']) == 0) {
- unset($input['contacts'][$key]['password']);
- }
- }
- }
- }
- }
-
if (isset($input['country_code'])) {
$input['country_id'] = $this->getCountryCode($input['country_code']);
}
diff --git a/app/Http/Requests/Client/UpdateClientRequest.php b/app/Http/Requests/Client/UpdateClientRequest.php
index 7d9e05f4966f..a29416c06bcf 100644
--- a/app/Http/Requests/Client/UpdateClientRequest.php
+++ b/app/Http/Requests/Client/UpdateClientRequest.php
@@ -95,33 +95,7 @@ class UpdateClientRequest extends Request
$input['group_settings_id'] = $this->decodePrimaryKey($input['group_settings_id']);
}
- if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
- $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
- }
-
- if (isset($input['contacts'])) {
- foreach ($input['contacts'] as $key => $contact) {
- if (array_key_exists('id', $contact) && is_numeric($contact['id'])) {
- unset($input['contacts'][$key]['id']);
- } elseif (array_key_exists('id', $contact) && is_string($contact['id'])) {
- $input['contacts'][$key]['id'] = $this->decodePrimaryKey($contact['id']);
- }
-
- //Filter the client contact password - if it is sent with ***** we should ignore it!
- if (isset($contact['password'])) {
- if (strlen($contact['password']) == 0) {
- $input['contacts'][$key]['password'] = '';
- } else {
- $input['contacts'][$key]['password'] = str_replace('*', '', $contact['password']);
-
- if (strlen($contact['password']) == 0) {
- unset($input['contacts'][$key]['password']);
- }
-
- }
- }
- }
- }
+ $input = $this->decodePrimaryKeys($input);
if (array_key_exists('settings', $input)) {
$input['settings'] = $this->filterSaveableSettings($input['settings']);
diff --git a/app/Http/Requests/ClientPortal/CreatePaymentMethodRequest.php b/app/Http/Requests/ClientPortal/CreatePaymentMethodRequest.php
index 8af355a95f79..7997eb9efa69 100644
--- a/app/Http/Requests/ClientPortal/CreatePaymentMethodRequest.php
+++ b/app/Http/Requests/ClientPortal/CreatePaymentMethodRequest.php
@@ -2,6 +2,7 @@
namespace App\Http\Requests\ClientPortal;
+use App\Http\Requests\Request;
use Illuminate\Foundation\Http\FormRequest;
class CreatePaymentMethodRequest extends FormRequest
diff --git a/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php b/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php
index dadcd7ec25a4..6db1346cbbc1 100644
--- a/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php
+++ b/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php
@@ -14,6 +14,7 @@ namespace App\Http\Requests\ClientPortal\Documents;
use App\Models\Document;
use App\Utils\Traits\MakesHash;
+
use Illuminate\Foundation\Http\FormRequest;
class ShowDocumentRequest extends FormRequest
diff --git a/app/Http/Requests/Credit/ActionCreditRequest.php b/app/Http/Requests/Credit/ActionCreditRequest.php
index 6889c663831a..41919c632822 100644
--- a/app/Http/Requests/Credit/ActionCreditRequest.php
+++ b/app/Http/Requests/Credit/ActionCreditRequest.php
@@ -1,4 +1,13 @@
decodePrimaryKey($input['design_id']);
}
- if (array_key_exists('client_id', $input) && is_string($input['client_id'])) {
- $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
- }
-
- if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
- $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
- }
-
- if (isset($input['client_contacts'])) {
- foreach ($input['client_contacts'] as $key => $contact) {
- if (! array_key_exists('send_email', $contact) || ! array_key_exists('id', $contact)) {
- unset($input['client_contacts'][$key]);
- }
- }
- }
-
- if (isset($input['invitations'])) {
- foreach ($input['invitations'] as $key => $value) {
- if (isset($input['invitations'][$key]['id']) && is_numeric($input['invitations'][$key]['id'])) {
- unset($input['invitations'][$key]['id']);
- }
-
- if (isset($input['invitations'][$key]['id']) && is_string($input['invitations'][$key]['id'])) {
- $input['invitations'][$key]['id'] = $this->decodePrimaryKey($input['invitations'][$key]['id']);
- }
-
- if (is_string($input['invitations'][$key]['client_contact_id'])) {
- $input['invitations'][$key]['client_contact_id'] = $this->decodePrimaryKey($input['invitations'][$key]['client_contact_id']);
- }
- }
- }
+ $input = $this->decodePrimaryKeys($input);
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
//$input['line_items'] = json_encode($input['line_items']);
diff --git a/app/Http/Requests/Credit/UpdateCreditRequest.php b/app/Http/Requests/Credit/UpdateCreditRequest.php
index 03e7ca722116..a1d1acecb056 100644
--- a/app/Http/Requests/Credit/UpdateCreditRequest.php
+++ b/app/Http/Requests/Credit/UpdateCreditRequest.php
@@ -1,13 +1,23 @@
all();
- if (array_key_exists('design_id', $input) && is_string($input['design_id'])) {
- $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
- }
-
- if (isset($input['client_id'])) {
- $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
- }
-
- if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
- $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
- }
-
- if (isset($input['invitations'])) {
- foreach ($input['invitations'] as $key => $value) {
- if (is_numeric($input['invitations'][$key]['id'])) {
- unset($input['invitations'][$key]['id']);
- }
-
- if (is_string($input['invitations'][$key]['id'])) {
- $input['invitations'][$key]['id'] = $this->decodePrimaryKey($input['invitations'][$key]['id']);
- }
-
- if (is_string($input['invitations'][$key]['client_contact_id'])) {
- $input['invitations'][$key]['client_contact_id'] = $this->decodePrimaryKey($input['invitations'][$key]['client_contact_id']);
- }
- }
- }
+ $input = $this->decodePrimaryKeys($input);
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
diff --git a/app/Http/Requests/Document/DownloadMultipleDocumentsRequest.php b/app/Http/Requests/Document/DownloadMultipleDocumentsRequest.php
index 34c6b11e3b3d..38e3b419a85d 100644
--- a/app/Http/Requests/Document/DownloadMultipleDocumentsRequest.php
+++ b/app/Http/Requests/Document/DownloadMultipleDocumentsRequest.php
@@ -12,9 +12,9 @@
namespace App\Http\Requests\Document;
-use Illuminate\Foundation\Http\FormRequest;
+use App\Http\Requests\Request;
-class DownloadMultipleDocumentsRequest extends FormRequest
+class DownloadMultipleDocumentsRequest extends Request
{
/**
* Determine if the user is authorized to make this request.
diff --git a/app/Http/Requests/Expense/BulkExpenseRequest.php b/app/Http/Requests/Expense/BulkExpenseRequest.php
index ac0fade1591b..9d4d430d2586 100644
--- a/app/Http/Requests/Expense/BulkExpenseRequest.php
+++ b/app/Http/Requests/Expense/BulkExpenseRequest.php
@@ -1,12 +1,22 @@
id.',id,company_id,'.$this->company_id;
- //$rules['settings'] = new ValidExpenseGroupSettingsRule();
$rules['contacts.*.email'] = 'nullable|distinct';
-
$rules['number'] = new UniqueExpenseNumberRule($this->all());
+ $rules['client_id'] = 'bail|sometimes|exists:clients,id,company_id,'.auth()->user()->company()->id;
- // $contacts = request('contacts');
- // if (is_array($contacts)) {
- // for ($i = 0; $i < count($contacts); $i++) {
-
- // //$rules['contacts.' . $i . '.email'] = 'nullable|email|distinct';
- // }
- // }
-
- return $rules;
+ return $this->globalRules($rules);
}
protected function prepareForValidation()
{
- // $input = $this->all();
+ $input = $this->all();
+ $input = $this->decodePrimaryKeys($input);
- // $this->replace($input);
+ $this->replace($input);
}
public function messages()
diff --git a/app/Http/Requests/Expense/UpdateExpenseRequest.php b/app/Http/Requests/Expense/UpdateExpenseRequest.php
index 62ca15c72b12..06f42e6b414d 100644
--- a/app/Http/Requests/Expense/UpdateExpenseRequest.php
+++ b/app/Http/Requests/Expense/UpdateExpenseRequest.php
@@ -46,16 +46,7 @@ class UpdateExpenseRequest extends Request
$rules['number'] = 'unique:expenses,number,'.$this->id.',id,company_id,'.$this->expense->company_id;
}
- $contacts = request('contacts');
-
- if (is_array($contacts)) {
- // for ($i = 0; $i < count($contacts); $i++) {
- // // $rules['contacts.' . $i . '.email'] = 'nullable|email|unique:client_contacts,email,' . isset($contacts[$i]['id'].',company_id,'.$this->company_id);
- // //$rules['contacts.' . $i . '.email'] = 'nullable|email';
- // }
- }
-
- return $rules;
+ return $this->globalRules($rules);
}
public function messages()
@@ -72,6 +63,8 @@ class UpdateExpenseRequest extends Request
{
$input = $this->all();
+ $input = $this->decodePrimaryKeys($input);
+
$this->replace($input);
}
}
diff --git a/app/Http/Requests/ExpenseCategory/BulkExpenseCategoryRequest.php b/app/Http/Requests/ExpenseCategory/BulkExpenseCategoryRequest.php
index 92b72f5e5b13..39ea6f22b2e7 100644
--- a/app/Http/Requests/ExpenseCategory/BulkExpenseCategoryRequest.php
+++ b/app/Http/Requests/ExpenseCategory/BulkExpenseCategoryRequest.php
@@ -1,12 +1,22 @@
all();
- if (array_key_exists('design_id', $input) && is_string($input['design_id'])) {
- $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
- }
-
- if (array_key_exists('client_id', $input) && is_string($input['client_id'])) {
- $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
- }
-
- if (array_key_exists('project_id', $input) && is_string($input['project_id'])) {
- $input['project_id'] = $this->decodePrimaryKey($input['project_id']);
- }
-
- if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
- $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
- }
-
- if (isset($input['client_contacts'])) {
- foreach ($input['client_contacts'] as $key => $contact) {
- if (! array_key_exists('send_email', $contact) || ! array_key_exists('id', $contact)) {
- unset($input['client_contacts'][$key]);
- }
- }
- }
-
- if (isset($input['invitations'])) {
- foreach ($input['invitations'] as $key => $value) {
- if (isset($input['invitations'][$key]['id']) && is_numeric($input['invitations'][$key]['id'])) {
- unset($input['invitations'][$key]['id']);
- }
-
- if (isset($input['invitations'][$key]['id']) && is_string($input['invitations'][$key]['id'])) {
- $input['invitations'][$key]['id'] = $this->decodePrimaryKey($input['invitations'][$key]['id']);
- }
-
- if (is_string($input['invitations'][$key]['client_contact_id'])) {
- $input['invitations'][$key]['client_contact_id'] = $this->decodePrimaryKey($input['invitations'][$key]['client_contact_id']);
- }
- }
- }
+ $input = $this->decodePrimaryKeys($input);
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
//$input['line_items'] = json_encode($input['line_items']);
diff --git a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
index a38cbe90f14d..6f71c4ab6dc5 100644
--- a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
@@ -62,35 +62,10 @@ class UpdateInvoiceRequest extends Request
{
$input = $this->all();
- if (array_key_exists('design_id', $input) && is_string($input['design_id'])) {
- $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
- }
-
- if (isset($input['client_id'])) {
- $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
- }
-
- if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
- $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
- }
-
- if (isset($input['invitations'])) {
- foreach ($input['invitations'] as $key => $value) {
- if (array_key_exists('id', $input['invitations'][$key]) && is_numeric($input['invitations'][$key]['id'])) {
- unset($input['invitations'][$key]['id']);
- }
-
- if (array_key_exists('id', $input['invitations'][$key]) && is_string($input['invitations'][$key]['id'])) {
- $input['invitations'][$key]['id'] = $this->decodePrimaryKey($input['invitations'][$key]['id']);
- }
-
- if (is_string($input['invitations'][$key]['client_contact_id'])) {
- $input['invitations'][$key]['client_contact_id'] = $this->decodePrimaryKey($input['invitations'][$key]['client_contact_id']);
- }
- }
- }
+ $input = $this->decodePrimaryKeys($input);
$input['id'] = $this->invoice->id;
+
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
$this->replace($input);
diff --git a/app/Http/Requests/Migration/UploadMigrationFileRequest.php b/app/Http/Requests/Migration/UploadMigrationFileRequest.php
index 0900f634a34c..6beae1f5c8c0 100644
--- a/app/Http/Requests/Migration/UploadMigrationFileRequest.php
+++ b/app/Http/Requests/Migration/UploadMigrationFileRequest.php
@@ -1,10 +1,20 @@
all();
- //info(print_r($input,1));
+ // info(print_r($input,1));
$invoices_total = 0;
$credits_total = 0;
@@ -77,7 +77,7 @@ class StorePaymentRequest extends Request
if (! isset($input['amount']) || $input['amount'] == 0) {
//$input['amount'] = $invoices_total - $credits_total;
- $input['amount'] = $invoices_total;
+ $input['amount'] = $invoices_total - $credits_total; //todo the payment amount is always less the credit amount applied
}
$input['is_manual'] = true;
@@ -94,17 +94,15 @@ class StorePaymentRequest extends Request
$rules = [
'amount' => 'numeric|required',
'amount' => [new PaymentAmountsBalanceRule(), new ValidCreditsPresentRule()],
- //'date' => 'required',
'client_id' => 'bail|required|exists:clients,id',
- 'invoices.*.invoice_id' => 'required|distinct|exists:invoices,id',
+ 'invoices.*.invoice_id' => 'bail|required|distinct|exists:invoices,id',
'invoices.*.invoice_id' => new ValidInvoicesRules($this->all()),
'invoices.*.amount' => 'required',
- 'credits.*.credit_id' => 'required|exists:credits,id',
+ 'credits.*.credit_id' => 'bail|required|exists:credits,id',
'credits.*.credit_id' => new ValidCreditsRules($this->all()),
'credits.*.amount' => 'required',
'invoices' => new ValidPayableInvoicesRule(),
- 'number' => 'nullable|unique:payments,number,'.$this->id.',id,company_id,'.$this->company_id,
- //'number' => 'nullable',
+ 'number' => 'bail|nullable|unique:payments,number,'.$this->id.',id,company_id,'.$this->company_id,
];
if ($this->input('documents') && is_array($this->input('documents'))) {
diff --git a/app/Http/Requests/Payment/UpdatePaymentRequest.php b/app/Http/Requests/Payment/UpdatePaymentRequest.php
index 910ef9002d1f..961fd3e93274 100644
--- a/app/Http/Requests/Payment/UpdatePaymentRequest.php
+++ b/app/Http/Requests/Payment/UpdatePaymentRequest.php
@@ -34,12 +34,13 @@ class UpdatePaymentRequest extends Request
}
public function rules()
- {//min:1 removed, 'required'
- $rules = [
+ {
+
+ $rules = [
+ 'number' => 'nullable|unique:payments,number,'.$this->id.',id,company_id,'.$this->payment->company_id,
'invoices' => ['array', new PaymentAppliedValidAmount, new ValidCreditsPresentRule],
'invoices.*.invoice_id' => 'distinct',
'documents' => 'mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx',
- 'number' => 'nullable|unique:payments,number,'.$this->id.',id,company_id,'.$this->company_id,
];
if ($this->input('documents') && is_array($this->input('documents'))) {
@@ -59,9 +60,7 @@ class UpdatePaymentRequest extends Request
{
$input = $this->all();
- if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
- $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
- }
+ $input = $this->decodePrimaryKeys($input);
if (isset($input['client_id'])) {
unset($input['client_id']);
@@ -71,18 +70,6 @@ class UpdatePaymentRequest extends Request
unset($input['amount']);
}
- // if (isset($input['type_id'])) {
- // unset($input['type_id']);
- // }
-
- // if (isset($input['date'])) {
- // unset($input['date']);
- // }
-
- // if (isset($input['transaction_reference'])) {
- // unset($input['transaction_reference']);
- // }
-
if (isset($input['number'])) {
unset($input['number']);
}
diff --git a/app/Http/Requests/Payments/PaymentWebhookRequest.php b/app/Http/Requests/Payments/PaymentWebhookRequest.php
index 48896cd418d1..f4177fe8b4b6 100644
--- a/app/Http/Requests/Payments/PaymentWebhookRequest.php
+++ b/app/Http/Requests/Payments/PaymentWebhookRequest.php
@@ -1,12 +1,22 @@
user()->companyId();
$rules['name'] = 'required';
$rules['client_id'] = 'required|exists:clients,id,company_id,'.auth()->user()->company()->id;
@@ -42,13 +42,13 @@ class StoreProjectRequest extends Request
protected function prepareForValidation()
{
- $input = $this->all();
+ $input = $this->decodePrimaryKeys($this->all());
- if (array_key_exists('client_id', $input) && is_string($input['client_id'])) {
- $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
- }
-
-
$this->replace($input);
}
+
+ public function getClient($client_id)
+ {
+ return Client::find($client_id);
+ }
}
diff --git a/app/Http/Requests/Project/UpdateProjectRequest.php b/app/Http/Requests/Project/UpdateProjectRequest.php
index 73b1c642e105..3c4c3892f1ad 100644
--- a/app/Http/Requests/Project/UpdateProjectRequest.php
+++ b/app/Http/Requests/Project/UpdateProjectRequest.php
@@ -36,7 +36,7 @@ class UpdateProjectRequest extends Request
protected function prepareForValidation()
{
- $input = $this->all();
+ $input = $this->decodePrimaryKeys($this->all());
$this->replace($input);
}
diff --git a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
index f5782f7ad989..cd512f03f09b 100644
--- a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
+++ b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
@@ -36,6 +36,7 @@ class UpdateRecurringInvoiceRequest extends Request
public function rules()
{
+
$rules = [];
if ($this->input('documents') && is_array($this->input('documents'))) {
@@ -49,7 +50,7 @@ class UpdateRecurringInvoiceRequest extends Request
}
if ($this->input('number')) {
- $rules['number'] = 'unique:recurring_invoices,number,'.$this->id.',id,company_id,'.$this->recurring_invoice->company_id;
+ $rules['number'] = 'unique:recurring_invoices,number,'.$this->recurring_invoice->id.',id,company_id,'.$this->recurring_invoice->company_id;
}
return $rules;
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
index 9517e75fd9cb..2b254144074b 100644
--- a/app/Http/Requests/Request.php
+++ b/app/Http/Requests/Request.php
@@ -11,10 +11,14 @@
namespace App\Http\Requests;
+use App\Http\ValidationRules\User\RelatedUserRule;
+use App\Utils\Traits\MakesHash;
use Illuminate\Foundation\Http\FormRequest;
class Request extends FormRequest
{
+ use MakesHash;
+
/**
* Get the validation rules that apply to the request.
*
@@ -24,4 +28,124 @@ class Request extends FormRequest
{
return [];
}
+
+ public function globalRules($rules)
+ {
+ $rules = [];
+
+ foreach($this->all() as $key => $value)
+ {
+ if(method_exists($this, $key))
+ $rules = $this->{$key}($rules);
+ }
+
+ return $rules;
+ }
+
+ private function assigned_user_id($rules)
+ {
+ $rules['assigned_user_id'] = [
+ 'bail' ,
+ 'sometimes',
+ 'nullable',
+ new RelatedUserRule($this->all())
+ ];
+
+ return $rules;
+ }
+
+ private function invoice_id($rules)
+ {
+ $rules['invoice_id'] = 'bail|nullable|sometimes|exists:invoices,id,company_id,'.auth()->user()->company()->id.',client_id,'.$this['client_id'];
+
+ return $rules;
+ }
+
+ private function vendor_id($rules)
+ {
+ $rules['vendor_id'] = 'bail|nullable|sometimes|exists:vendors,id,company_id,'.auth()->user()->company()->id;
+
+ return $rules;
+ }
+
+ public function decodePrimaryKeys($input)
+ {
+
+ if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
+ $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
+ }
+
+ if (array_key_exists('user_id', $input) && is_string($input['user_id'])) {
+ $input['user_id'] = $this->decodePrimaryKey($input['user_id']);
+ }
+
+ if (array_key_exists('vendor_id', $input) && is_string($input['vendor_id'])) {
+ $input['vendor_id'] = $this->decodePrimaryKey($input['vendor_id']);
+ }
+
+ if (array_key_exists('client_id', $input) && is_string($input['client_id'])) {
+ $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
+ }
+
+ if (array_key_exists('invoice_id', $input) && is_string($input['invoice_id'])) {
+ $input['invoice_id'] = $this->decodePrimaryKey($input['invoice_id']);
+ }
+
+ if (array_key_exists('design_id', $input) && is_string($input['design_id'])) {
+ $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
+ }
+
+ if (array_key_exists('project_id', $input) && is_string($input['project_id'])) {
+ $input['project_id'] = $this->decodePrimaryKey($input['project_id']);
+ }
+
+ if (isset($input['client_contacts'])) {
+ foreach ($input['client_contacts'] as $key => $contact) {
+ if (! array_key_exists('send_email', $contact) || ! array_key_exists('id', $contact)) {
+ unset($input['client_contacts'][$key]);
+ }
+ }
+ }
+
+ if (isset($input['invitations'])) {
+ foreach ($input['invitations'] as $key => $value) {
+ if (isset($input['invitations'][$key]['id']) && is_numeric($input['invitations'][$key]['id'])) {
+ unset($input['invitations'][$key]['id']);
+ }
+
+ if (isset($input['invitations'][$key]['id']) && is_string($input['invitations'][$key]['id'])) {
+ $input['invitations'][$key]['id'] = $this->decodePrimaryKey($input['invitations'][$key]['id']);
+ }
+
+ if (is_string($input['invitations'][$key]['client_contact_id'])) {
+ $input['invitations'][$key]['client_contact_id'] = $this->decodePrimaryKey($input['invitations'][$key]['client_contact_id']);
+ }
+ }
+ }
+
+ if (isset($input['contacts'])) {
+ foreach ($input['contacts'] as $key => $contact) {
+ if (array_key_exists('id', $contact) && is_numeric($contact['id'])) {
+ unset($input['contacts'][$key]['id']);
+ } elseif (array_key_exists('id', $contact) && is_string($contact['id'])) {
+ $input['contacts'][$key]['id'] = $this->decodePrimaryKey($contact['id']);
+ }
+
+ //Filter the client contact password - if it is sent with ***** we should ignore it!
+ if (isset($contact['password'])) {
+ if (strlen($contact['password']) == 0) {
+ $input['contacts'][$key]['password'] = '';
+ } else {
+ $contact['password'] = str_replace('*', '', $contact['password']);
+
+ if (strlen($contact['password']) == 0) {
+ unset($input['contacts'][$key]['password']);
+ }
+ }
+ }
+ }
+ }
+
+ return $input;
+ }
}
diff --git a/app/Http/Requests/Setup/CheckDatabaseRequest.php b/app/Http/Requests/Setup/CheckDatabaseRequest.php
index 082cd56cf4cc..9de2aa8a3c41 100644
--- a/app/Http/Requests/Setup/CheckDatabaseRequest.php
+++ b/app/Http/Requests/Setup/CheckDatabaseRequest.php
@@ -1,10 +1,20 @@
user()->company()->id;
-
- // $rules['number'] = new UniqueTaskNumberRule($this->all());
-
-
- return $rules;
+
+ return $this->globalRules($rules);
}
protected function prepareForValidation()
{
- $input = $this->all();
+ $input = $this->all();
- if (array_key_exists('design_id', $input) && is_string($input['design_id'])) {
- $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
- }
+ $input = $this->decodePrimaryKeys($this->all());
- if (array_key_exists('client_id', $input) && is_string($input['client_id'])) {
- $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
- }
-
- if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
- $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
- }
-
- if (array_key_exists('project_id', $input) && is_string($input['project_id'])) {
- $input['project_id'] = $this->decodePrimaryKey($input['project_id']);
- }
-
- if (array_key_exists('invoice_id', $input) && is_string($input['invoice_id'])) {
- $input['invoice_id'] = $this->decodePrimaryKey($input['invoice_id']);
- }
-
- $this->replace($input);
+ $this->replace($input);
}
- // public function messages()
- // {
- // // return [
- // // 'unique' => ctrans('validation.unique', ['attribute' => 'email']),
- // // //'required' => trans('validation.required', ['attribute' => 'email']),
- // // 'contacts.*.email.required' => ctrans('validation.email', ['attribute' => 'email']),
- // // ];
- // }
}
diff --git a/app/Http/Requests/Task/UpdateTaskRequest.php b/app/Http/Requests/Task/UpdateTaskRequest.php
index 9d03ab13c4f6..902e51a60c82 100644
--- a/app/Http/Requests/Task/UpdateTaskRequest.php
+++ b/app/Http/Requests/Task/UpdateTaskRequest.php
@@ -40,46 +40,16 @@ class UpdateTaskRequest extends Request
/* Ensure we have a client name, and that all emails are unique*/
if ($this->input('number')) {
- $rules['number'] = 'unique:tasks,number,'.$this->id.',id,company_id,'.$this->taskss->company_id;
+ $rules['number'] = 'unique:tasks,number,'.$this->id.',id,company_id,'.$this->task->company_id;
}
- return $rules;
+ return $this->globalRules($rules);
}
- // public function messages()
- // {
- // return [
- // 'unique' => ctrans('validation.unique', ['attribute' => 'email']),
- // 'email' => ctrans('validation.email', ['attribute' => 'email']),
- // 'name.required' => ctrans('validation.required', ['attribute' => 'name']),
- // 'required' => ctrans('validation.required', ['attribute' => 'email']),
- // ];
- // }
-
protected function prepareForValidation()
{
- $input = $this->all();
+ $input = $this->decodePrimaryKeys($this->all());
- if (array_key_exists('design_id', $input) && is_string($input['design_id'])) {
- $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
- }
-
- if (array_key_exists('client_id', $input) && is_string($input['client_id'])) {
- $input['client_id'] = $this->decodePrimaryKey($input['client_id']);
- }
-
- if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
- $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
- }
-
- if (array_key_exists('project_id', $input) && is_string($input['project_id'])) {
- $input['project_id'] = $this->decodePrimaryKey($input['project_id']);
- }
-
- if (array_key_exists('invoice_id', $input) && is_string($input['invoice_id'])) {
- $input['invoice_id'] = $this->decodePrimaryKey($input['invoice_id']);
- }
-
- $this->replace($input);
+ $this->replace($input);
}
}
diff --git a/app/Http/Requests/TaskStatus/ActionTaskStatusRequest.php b/app/Http/Requests/TaskStatus/ActionTaskStatusRequest.php
new file mode 100644
index 000000000000..379417df8d08
--- /dev/null
+++ b/app/Http/Requests/TaskStatus/ActionTaskStatusRequest.php
@@ -0,0 +1,28 @@
+user()->isAdmin();
+ }
+}
diff --git a/app/Http/Requests/TaskStatus/CreateTaskStatusRequest.php b/app/Http/Requests/TaskStatus/CreateTaskStatusRequest.php
new file mode 100644
index 000000000000..42850061ecff
--- /dev/null
+++ b/app/Http/Requests/TaskStatus/CreateTaskStatusRequest.php
@@ -0,0 +1,28 @@
+user()->isAdmin();
+ }
+}
diff --git a/app/Http/Requests/TaskStatus/DestroyTaskStatusRequest.php b/app/Http/Requests/TaskStatus/DestroyTaskStatusRequest.php
new file mode 100644
index 000000000000..37cceac60e45
--- /dev/null
+++ b/app/Http/Requests/TaskStatus/DestroyTaskStatusRequest.php
@@ -0,0 +1,28 @@
+user()->isAdmin();
+ }
+}
diff --git a/app/Http/Requests/TaskStatus/EditTaskStatusRequest.php b/app/Http/Requests/TaskStatus/EditTaskStatusRequest.php
new file mode 100644
index 000000000000..f47d92f4cd5e
--- /dev/null
+++ b/app/Http/Requests/TaskStatus/EditTaskStatusRequest.php
@@ -0,0 +1,44 @@
+user()->isAdmin();
+ }
+
+ public function rules()
+ {
+ $rules = [];
+
+ return $rules;
+ }
+
+ protected function prepareForValidation()
+ {
+ $input = $this->all();
+
+ //$input['id'] = $this->encodePrimaryKey($input['id']);
+
+ $this->replace($input);
+ }
+}
diff --git a/app/Http/Requests/TaskStatus/ShowTaskStatusRequest.php b/app/Http/Requests/TaskStatus/ShowTaskStatusRequest.php
new file mode 100644
index 000000000000..9037c2628abb
--- /dev/null
+++ b/app/Http/Requests/TaskStatus/ShowTaskStatusRequest.php
@@ -0,0 +1,28 @@
+user()->isAdmin();
+ }
+}
diff --git a/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php b/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php
new file mode 100644
index 000000000000..9ecfc444ec34
--- /dev/null
+++ b/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php
@@ -0,0 +1,47 @@
+user()->isAdmin();
+ }
+
+ protected function prepareForValidation()
+ {
+ $input = $this->all();
+
+ $this->replace($input);
+ }
+
+ public function rules()
+ {
+ $rules = [];
+
+ $rules['name'] ='required|unique:task_statuses,name,null,null,company_id,'.auth()->user()->companyId();
+
+ return $rules;
+ }
+}
diff --git a/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php b/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php
new file mode 100644
index 000000000000..d6e550427f98
--- /dev/null
+++ b/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php
@@ -0,0 +1,42 @@
+user()->isAdmin();
+ }
+
+ public function rules()
+ {
+ $rules = [];
+
+ if ($this->input('name'))
+ $rules['name'] = 'unique:task_statuses,name,'.$this->id.',id,company_id,'.$this->task_status->company_id;
+
+ return $rules;
+ }
+
+}
diff --git a/app/Http/Requests/Token/BulkTokenRequest.php b/app/Http/Requests/Token/BulkTokenRequest.php
index e63a588479bb..21fc4c5fe21a 100644
--- a/app/Http/Requests/Token/BulkTokenRequest.php
+++ b/app/Http/Requests/Token/BulkTokenRequest.php
@@ -1,11 +1,21 @@
all();
- if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
- $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
- }
+ $input = $this->decodePrimaryKeys($input);
$this->replace($input);
}
diff --git a/app/Http/Requests/Webhook/BulkWebhookRequest.php b/app/Http/Requests/Webhook/BulkWebhookRequest.php
index aa178f22f266..4d10836505d2 100644
--- a/app/Http/Requests/Webhook/BulkWebhookRequest.php
+++ b/app/Http/Requests/Webhook/BulkWebhookRequest.php
@@ -1,12 +1,22 @@
input['client_id'])
- ->where('number', $this->input['number'])
- ->withTrashed()
- ->exists();
+ if(empty($this->input['number']))
+ return true;
- if ($expense) {
- return false;
- }
+ $expense = Expense::query()
+ ->where('number', $this->input['number'])
+ ->withTrashed();
- return true;
+ // if(isset($this->input['client_id']))
+ // $expense->where('client_id', $this->input['client_id']);
+
+ return $expense->exists();
+
+ // $expense = Expense::where('client_id', $this->input['client_id'])
+ // ->where('number', $this->input['number'])
+ // ->withTrashed()
+ // ->exists();
+
+ // if ($expense) {
+ // return false;
+ // }
+
+ // return true;
}
}
diff --git a/app/Http/ValidationRules/PaymentAmountsBalanceRule.php b/app/Http/ValidationRules/PaymentAmountsBalanceRule.php
index 47305a2e964f..cc9ff5251b21 100644
--- a/app/Http/ValidationRules/PaymentAmountsBalanceRule.php
+++ b/app/Http/ValidationRules/PaymentAmountsBalanceRule.php
@@ -73,6 +73,9 @@ class PaymentAmountsBalanceRule implements Rule
return true;
} // if no invoices are present, then this is an unapplied payment, let this pass validation!
+// info("payment amounts = {$payment_amounts}");
+// info("invoice amounts = {$invoice_amounts}");
+
return $payment_amounts >= $invoice_amounts;
}
}
diff --git a/app/Http/ValidationRules/Project/ValidProjectForClient.php b/app/Http/ValidationRules/Project/ValidProjectForClient.php
index a23e421de398..e33d5366a2bd 100644
--- a/app/Http/ValidationRules/Project/ValidProjectForClient.php
+++ b/app/Http/ValidationRules/Project/ValidProjectForClient.php
@@ -35,6 +35,9 @@ class ValidProjectForClient implements Rule
*/
public function passes($attribute, $value)
{
+ if(empty($this->input['project_id']))
+ return true;
+
if(is_string($this->input['project_id']))
$this->input['project_id'] = $this->decodePrimaryKey($this->input['project_id']);
diff --git a/app/Http/ValidationRules/User/RelatedUserRule.php b/app/Http/ValidationRules/User/RelatedUserRule.php
new file mode 100644
index 000000000000..82ecbc6d8ac2
--- /dev/null
+++ b/app/Http/ValidationRules/User/RelatedUserRule.php
@@ -0,0 +1,62 @@
+input = $input;
+ }
+ /**
+ * @param string $attribute
+ * @param mixed $value
+ * @return bool
+ */
+ public function passes($attribute, $value)
+ {
+ return $this->checkUserIsRelated($value);
+ }
+
+ /**
+ * @return string
+ */
+ public function message()
+ {
+ return 'User not associated with this account';
+ }
+
+ /**
+ * @param $email
+ * @return bool
+ */
+ private function checkUserIsRelated($user_id) : bool
+ {
+
+ if(empty($user_id))
+ return true;
+
+ return User::query()
+ ->where('id', $user_id)
+ ->where('account_id', auth()->user()->company()->account_id)
+ ->exists();
+ }
+}
diff --git a/app/Jobs/Account/CreateAccount.php b/app/Jobs/Account/CreateAccount.php
index 70b9d1be080a..1f69e0e60ebd 100644
--- a/app/Jobs/Account/CreateAccount.php
+++ b/app/Jobs/Account/CreateAccount.php
@@ -15,6 +15,7 @@ use App\DataMapper\Analytics\AccountCreated as AnalyticsAccountCreated;
use App\Events\Account\AccountCreated;
use App\Jobs\Company\CreateCompany;
use App\Jobs\Company\CreateCompanyPaymentTerms;
+use App\Jobs\Company\CreateCompanyTaskStatuses;
use App\Jobs\Company\CreateCompanyToken;
use App\Jobs\User\CreateUser;
use App\Models\Account;
@@ -74,6 +75,7 @@ class CreateAccount
$spaa9f78 = CreateUser::dispatchNow($this->request, $sp794f3f, $sp035a66, true);
CreateCompanyPaymentTerms::dispatchNow($sp035a66, $spaa9f78);
+ CreateCompanyTaskStatuses::dispatchNow($sp035a66, $spaa9f78);
if ($spaa9f78) {
auth()->login($spaa9f78, false);
diff --git a/app/Jobs/Company/CreateCompanyTaskStatuses.php b/app/Jobs/Company/CreateCompanyTaskStatuses.php
new file mode 100644
index 000000000000..04814e173515
--- /dev/null
+++ b/app/Jobs/Company/CreateCompanyTaskStatuses.php
@@ -0,0 +1,61 @@
+company = $company;
+
+ $this->user = $user;
+ }
+
+ /**
+ * Execute the job.
+ *
+ * @return void
+ */
+ public function handle()
+ {
+ $task_statuses = [
+ ['name' => ctrans('texts.backlog'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now()],
+ ['name' => ctrans('texts.ready_to_do'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now()],
+ ['name' => ctrans('texts.in_progress'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now()],
+ ['name' => ctrans('texts.done'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now()],
+
+ ];
+
+ TaskStatus::insert($task_statuses);
+ }
+}
diff --git a/app/Jobs/Credit/CreateCreditPdf.php b/app/Jobs/Credit/CreateCreditPdf.php
deleted file mode 100644
index 27ba0a9413a6..000000000000
--- a/app/Jobs/Credit/CreateCreditPdf.php
+++ /dev/null
@@ -1,99 +0,0 @@
-invitation = $invitation;
-
- $this->credit = $invitation->credit;
-
- $this->company = $invitation->company;
-
- $this->contact = $invitation->contact;
-
- $this->disk = $disk ?? config('filesystems.default');
- }
-
- public function handle()
- {
- if (config('ninja.phantomjs_key')) {
- return (new Phantom)->generate($this->invitation);
- }
-
- $this->credit->load('client');
-
- App::setLocale($this->contact->preferredLocale());
-
- $path = $this->credit->client->credit_filepath();
-
- $file_path = $path.$this->credit->number.'.pdf';
-
- $credit_design_id = $this->credit->design_id ? $this->credit->design_id : $this->decodePrimaryKey($this->credit->client->getSetting('credit_design_id'));
-
- $design = Design::find($credit_design_id);
-
- $designer = new Designer($this->credit, $design, $this->credit->client->getSetting('pdf_variables'), 'credit');
-
- $html = (new HtmlEngine($designer, $this->invitation, 'credit'))->build();
-
- Storage::makeDirectory($path, 0775);
-
- $pdf = $this->makePdf(null, null, $html);
-
- $instance = Storage::disk($this->disk)->put($file_path, $pdf);
-
- return $file_path;
- }
-}
diff --git a/app/Jobs/Credit/EmailCredit.php b/app/Jobs/Credit/EmailCredit.php
deleted file mode 100644
index 7356c4002070..000000000000
--- a/app/Jobs/Credit/EmailCredit.php
+++ /dev/null
@@ -1,101 +0,0 @@
-credit = $credit;
-
- $this->company = $company;
- }
-
- /**
- * Execute the job.
- *
- *
- * @return void
- */
- public function handle()
- {
- //todo - change runtime config of mail driver if necessary
- MultiDB::setDb($this->company->db);
-
- $this->settings = $this->credit->client->getMergedSettings();
-
- $template_style = $this->credit->client->getSetting('email_style');
-
- $this->setMailDriver();
-
- $this->credit->invitations->each(function ($invitation) use ($template_style) {
-
- if ($invitation->contact->send_email && $invitation->contact->email)
- {
-
- $message_array = $this->credit->getEmailData('', $invitation->contact);
- $message_array['title'] = &$message_array['subject'];
- $message_array['footer'] = 'Sent to '.$invitation->contact->present()->name();
-
- MailRouter::dispatch(new TemplateEmail($message_array, $template_style, $invitation->contact->user, $invitation->contact->client), $invitation->company, $invitation->contact);
-
- //fire any events
- event(new CreditWasEmailed($this->credit, $this->company, Ninja::eventVars()));
- }
-
- });
- }
-
- private function logMailError($errors)
- {
- SystemLogger::dispatch(
- $errors,
- SystemLog::CATEGORY_MAIL,
- SystemLog::EVENT_MAIL_SEND,
- SystemLog::TYPE_FAILURE,
- $this->credit->client
- );
- }
-}
diff --git a/app/Jobs/Cron/RecurringInvoicesCron.php b/app/Jobs/Cron/RecurringInvoicesCron.php
index 34b5f6e2f4c0..29554493b959 100644
--- a/app/Jobs/Cron/RecurringInvoicesCron.php
+++ b/app/Jobs/Cron/RecurringInvoicesCron.php
@@ -54,7 +54,7 @@ class RecurringInvoicesCron
info("Current date = " . now()->format("Y-m-d") . " Recurring date = " .$recurring_invoice->next_send_date);
- SendRecurring::dispatch($recurring_invoice, $recurring_invoice->company->db);
+ SendRecurring::dispatchNow($recurring_invoice, $recurring_invoice->company->db);
});
@@ -74,7 +74,7 @@ class RecurringInvoicesCron
info("Current date = " . now()->format("Y-m-d") . " Recurring date = " .$recurring_invoice->next_send_date);
- SendRecurring::dispatch($recurring_invoice, $recurring_invoice->company->db);
+ SendRecurring::dispatchNow($recurring_invoice, $recurring_invoice->company->db);
});
}
diff --git a/app/Jobs/Entity/CreateEntityPdf.php b/app/Jobs/Entity/CreateEntityPdf.php
new file mode 100644
index 000000000000..b6cadc3583d2
--- /dev/null
+++ b/app/Jobs/Entity/CreateEntityPdf.php
@@ -0,0 +1,166 @@
+invitation = $invitation;
+
+ if($invitation instanceof InvoiceInvitation){
+ $this->entity = $invitation->invoice;
+ $this->entity_string = 'invoice';
+ }
+ elseif($invitation instanceof QuoteInvitation){
+ $this->entity = $invitation->quote;
+ $this->entity_string = 'quote';
+ }
+ elseif($invitation instanceof CreditInvitation){
+ $this->entity = $invitation->credit;
+ $this->entity_string = 'credit';
+ }
+ elseif($invitation instanceof RecurringInvoiceInvitation){
+ $this->entity = $invitation->recurring_invoice;
+ $this->entity_string = 'recurring_invoice';
+ }
+
+ $this->company = $invitation->company;
+
+ $this->contact = $invitation->contact;
+
+ $this->disk = $disk ?? config('filesystems.default');
+ }
+
+ public function handle()
+ {
+
+ if (config('ninja.phantomjs_key')) {
+ return (new Phantom)->generate($this->invitation);
+ }
+
+ App::setLocale($this->contact->preferredLocale());
+
+ $entity_design_id = '';
+
+ if($this->entity instanceof Invoice){
+ $path = $this->entity->client->invoice_filepath();
+ $entity_design_id = 'invoice_design_id';
+ }
+ elseif($this->entity instanceof Quote){
+ $path = $this->entity->client->quote_filepath();
+ $entity_design_id = 'quote_design_id';
+ }
+ elseif($this->entity instanceof Credit){
+ $path = $this->entity->client->credit_filepath();
+ $entity_design_id = 'credit_design_id';
+ }
+
+ $file_path = $path.$this->entity->number.'.pdf';
+
+ $entity_design_id = $this->entity->design_id ? $this->entity->design_id : $this->decodePrimaryKey($this->entity->client->getSetting($entity_design_id));
+
+ $design = Design::find($entity_design_id);
+ $html = new HtmlEngine($this->invitation);
+
+ if ($design->is_custom) {
+ $options = [
+ 'custom_partials' => json_decode(json_encode($design->design), true)
+ ];
+ $template = new PdfMakerDesign(PdfDesignModel::CUSTOM, $options);
+ } else {
+ $template = new PdfMakerDesign(strtolower($design->name));
+ }
+
+ $state = [
+ 'template' => $template->elements([
+ 'client' => $this->entity->client,
+ 'entity' => $this->entity,
+ 'pdf_variables' => (array) $this->entity->company->settings->pdf_variables,
+ 'products' => $design->design->product,
+ ]),
+ 'variables' => $html->generateLabelsAndValues(),
+ 'options' => [
+ 'all_pages_header' => $this->entity->client->getSetting('all_pages_header'),
+ 'all_pages_footer' => $this->entity->client->getSetting('all_pages_footer'),
+ ],
+ ];
+
+ $maker = new PdfMakerService($state);
+
+ $maker
+ ->design($template)
+ ->build();
+
+ //todo - move this to the client creation stage so we don't keep hitting this unnecessarily
+ Storage::makeDirectory($path, 0775);
+
+ $pdf = $this->makePdf(null, null, $maker->getCompiledHTML(true));
+
+ $instance = Storage::disk($this->disk)->put($file_path, $pdf);
+
+ return $file_path;
+ }
+}
diff --git a/app/Jobs/Entity/EmailEntity.php b/app/Jobs/Entity/EmailEntity.php
new file mode 100644
index 000000000000..b288e0620727
--- /dev/null
+++ b/app/Jobs/Entity/EmailEntity.php
@@ -0,0 +1,187 @@
+company = $company;
+
+ $this->invitation = $invitation;
+
+ $this->settings = $invitation->contact->client->getMergedSettings();
+
+ $this->entity_string = $this->resolveEntityString();
+
+ $this->entity = $invitation->{$this->entity_string};
+
+ $this->reminder_template = $reminder_template ?: $this->findReminderTemplate();
+
+ $this->html_engine = new HtmlEngine($invitation);
+
+ $this->email_entity_builder = $this->resolveEmailBuilder();
+ }
+
+ /**
+ * Execute the job.
+ *
+ *
+ * @return void
+ */
+ public function handle()
+ {
+
+ MultiDB::setDB($this->company->db);
+
+ $this->setMailDriver();
+
+ try {
+ Mail::to($this->invitation->contact->email, $this->invitation->contact->present()->name())
+ ->send(
+ new TemplateEmail(
+ $this->email_entity_builder,
+ $this->invitation->contact->user,
+ $this->invitation->contact->client
+ )
+ );
+ } catch (\Swift_TransportException $e) {
+ $this->entityEmailFailed($e->getMessage());
+ }
+
+ if (count(Mail::failures()) > 0) {
+ $this->logMailError(Mail::failures(), $this->entity->client);
+ } else {
+ $this->entityEmailSucceeded();
+ }
+
+ /* Mark entity sent */
+ $this->entity->service()->markSent()->save();
+ }
+
+ public function failed($exception = null)
+ {
+ info('the job failed');
+
+ $job_failure = new EmailInvoiceFailure();
+ $job_failure->string_metric5 = $this->entity_string;
+ $job_failure->string_metric6 = $exception->getMessage();
+
+ LightLogs::create($job_failure)
+ ->batch();
+
+ }
+
+ private function resolveEntityString() :string
+ {
+ if($this->invitation instanceof InvoiceInvitation)
+ return 'invoice';
+ elseif($this->invitation instanceof QuoteInvitation)
+ return 'quote';
+ elseif($this->invitation instanceof CreditInvitation)
+ return 'credit';
+ elseif($this->invitation instanceof RecurringInvoiceInvitation)
+ return 'recurring_invoice';
+ }
+
+ private function entityEmailFailed($message)
+ {
+ switch ($this->entity_string) {
+ case 'invoice':
+ event(new InvoiceWasEmailedAndFailed($this->invitation->invoice, $this->company, $message, Ninja::eventVars()));
+ break;
+
+ default:
+ # code...
+ break;
+ }
+
+ }
+
+ private function entityEmailSucceeded()
+ {
+ switch ($this->entity_string) {
+ case 'invoice':
+ event(new InvoiceWasEmailed($this->invitation, $this->company, Ninja::eventVars()));
+ break;
+
+ default:
+ # code...
+ break;
+ }
+ }
+
+ private function findReminderTemplate()
+ {
+
+ }
+
+ private function resolveEmailBuilder()
+ {
+ $class = 'App\Mail\Engine\\' . ucfirst(Str::camel($this->entity_string)) . "EmailEngine";
+
+ return (new $class($this->invitation, $this->reminder_template))->build();
+ }
+}
diff --git a/app/Jobs/Invoice/CreateInvoicePdf.php b/app/Jobs/Invoice/CreateInvoicePdf.php
deleted file mode 100644
index 6695c3a429dd..000000000000
--- a/app/Jobs/Invoice/CreateInvoicePdf.php
+++ /dev/null
@@ -1,121 +0,0 @@
-invitation = $invitation;
-
- $this->invoice = $invitation->invoice;
-
- $this->company = $invitation->company;
-
- $this->contact = $invitation->contact;
-
- $this->disk = $disk ?? config('filesystems.default');
- }
-
- public function handle()
- {
-
- if (config('ninja.phantomjs_key')) {
- return (new Phantom)->generate($this->invitation);
- }
-
- App::setLocale($this->contact->preferredLocale());
-
- $path = $this->invoice->client->invoice_filepath();
-
- $file_path = $path.$this->invoice->number.'.pdf';
-
- $invoice_design_id = $this->invoice->design_id ? $this->invoice->design_id : $this->decodePrimaryKey($this->invoice->client->getSetting('invoice_design_id'));
-
- $design = Design::find($invoice_design_id);
- $html = new HtmlEngine(null, $this->invitation, 'invoice');
-
- $template = new PdfMakerDesign(strtolower($design->name));
-
- $state = [
- 'template' => $template->elements([
- 'client' => $this->invoice->client,
- 'entity' => $this->invoice,
- 'pdf_variables' => (array) $this->invoice->company->settings->pdf_variables,
- 'products' => $design->design->product,
- ]),
- 'variables' => $html->generateLabelsAndValues(),
- 'options' => [
- 'all_pages_header' => $this->invoice->client->getSetting('all_pages_header'),
- 'all_pages_footer' => $this->invoice->client->getSetting('all_pages_footer'),
- ],
- ];
-
- $maker = new PdfMakerService($state);
-
- $maker
- ->design($template)
- ->build();
-
- //todo - move this to the client creation stage so we don't keep hitting this unnecessarily
- Storage::makeDirectory($path, 0775);
-
- $pdf = $this->makePdf(null, null, $maker->getCompiledHTML(true));
-
- $instance = Storage::disk($this->disk)->put($file_path, $pdf);
-
- return $file_path;
- }
-}
diff --git a/app/Jobs/Invoice/EmailInvoice.php b/app/Jobs/Invoice/EmailInvoice.php
deleted file mode 100644
index 4f84dd975a27..000000000000
--- a/app/Jobs/Invoice/EmailInvoice.php
+++ /dev/null
@@ -1,113 +0,0 @@
-company = $company;
-
- $this->invoice_invitation = $invoice_invitation;
-
- $this->email_builder = $email_builder;
-
- $this->settings = $invoice_invitation->contact->client->getMergedSettings();
- }
-
- /**
- * Execute the job.
- *
- *
- * @return void
- */
- public function handle()
- {
- MultiDB::setDB($this->company->db);
-
- $this->setMailDriver();
-
- try {
- Mail::to($this->invoice_invitation->contact->email, $this->invoice_invitation->contact->present()->name())
- ->send(
- new TemplateEmail(
- $this->email_builder,
- $this->invoice_invitation->contact->user,
- $this->invoice_invitation->contact->client
- )
- );
- } catch (\Swift_TransportException $e) {
- event(new InvoiceWasEmailedAndFailed($this->invoice_invitation->invoice, $this->company, $e->getMessage(), Ninja::eventVars()));
- }
-
- if (count(Mail::failures()) > 0) {
- $this->logMailError(Mail::failures(), $this->invoice->client);
- } else {
- event(new InvoiceWasEmailed($this->invoice_invitation, $this->company, Ninja::eventVars()));
- }
-
- /* Mark invoice sent */
- $this->invoice_invitation->invoice->service()->markSent()->save();
- }
-
- public function failed($exception = null)
- {
- info('the job failed');
-
- $job_failure = new EmailInvoiceFailure();
- $job_failure->string_metric5 = get_class($this);
- $job_failure->string_metric6 = $exception->getMessage();
-
- LightLogs::create($job_failure)
- ->batch();
-
- }
-}
diff --git a/app/Jobs/Invoice/InjectSignature.php b/app/Jobs/Invoice/InjectSignature.php
index cd93d07c7704..159553704620 100644
--- a/app/Jobs/Invoice/InjectSignature.php
+++ b/app/Jobs/Invoice/InjectSignature.php
@@ -2,6 +2,7 @@
namespace App\Jobs\Invoice;
+use App\Jobs\Entity\CreateEntityPdf;
use App\Models\Invoice;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
@@ -51,6 +52,6 @@ class InjectSignature implements ShouldQueue
$invitation->signature_base64 = $this->signature;
$invitation->save();
- CreateInvoicePdf::dispatch($invitation);
+ CreateEntityPdf::dispatch($invitation);
}
}
diff --git a/app/Jobs/Mail/BaseMailerJob.php b/app/Jobs/Mail/BaseMailerJob.php
index 2567f954eef6..38ef8ade78e9 100644
--- a/app/Jobs/Mail/BaseMailerJob.php
+++ b/app/Jobs/Mail/BaseMailerJob.php
@@ -82,7 +82,7 @@ class BaseMailerJob implements ShouldQueue
public function failed($exception = null)
{
- info('the job failed');
+ // info('the job failed');
$job_failure = new EmailFailure();
$job_failure->string_metric5 = get_parent_class($this);
diff --git a/app/Jobs/Quote/CreateQuotePdf.php b/app/Jobs/Quote/CreateQuotePdf.php
deleted file mode 100644
index 4a3bad8e29ce..000000000000
--- a/app/Jobs/Quote/CreateQuotePdf.php
+++ /dev/null
@@ -1,121 +0,0 @@
-invitation = $invitation;
-
- $this->quote = $invitation->quote;
-
- $this->company = $invitation->company;
-
- $this->contact = $invitation->contact;
-
- $this->disk = $disk ?? config('filesystems.default');
- }
-
- public function handle()
- {
- if (config('ninja.phantomjs_key')) {
- return (new Phantom)->generate($this->invitation);
- }
-
- $this->quote->load('client');
-
- App::setLocale($this->contact->preferredLocale());
-
- $path = $this->quote->client->quote_filepath();
-
- $quote_design_id = $this->quote->design_id ? $this->quote->design_id : $this->decodePrimaryKey($this->quote->client->getSetting('quote_design_id'));
-
- $design = Design::find($quote_design_id);
- $html = new HtmlEngine(null, $this->invitation, 'quote');
-
- $template = new PdfMakerDesign(strtolower($design->name));
-
- $state = [
- 'template' => $template->elements([
- 'client' => $this->quote->client,
- 'entity' => $this->quote,
- 'pdf_variables' => (array) $this->quote->company->settings->pdf_variables,
- 'products' => $design->design->product,
- ]),
- 'variables' => $html->generateLabelsAndValues(),
- 'options' => [
- 'all_pages_header' => $this->quote->client->getSetting('all_pages_header'),
- 'all_pages_footer' => $this->quote->client->getSetting('all_pages_footer'),
- ],
- ];
-
- $maker = new PdfMakerService($state);
-
- $maker
- ->design($template)
- ->build();
-
- //todo - move this to the client creation stage so we don't keep hitting this unnecessarily
- Storage::makeDirectory($path, 0775);
-
- $pdf = $this->makePdf(null, null, $maker->getCompiledHTML());
-
- $file_path = $path.$this->quote->number.'.pdf';
-
- $instance = Storage::disk($this->disk)->put($file_path, $pdf);
-
- return $file_path;
- }
-}
diff --git a/app/Jobs/Quote/EmailQuote.php b/app/Jobs/Quote/EmailQuote.php
deleted file mode 100644
index 596944d5b12c..000000000000
--- a/app/Jobs/Quote/EmailQuote.php
+++ /dev/null
@@ -1,87 +0,0 @@
-quote_invitation = $quote_invitation;
- $this->email_builder = $email_builder;
- $this->company = $company;
- }
-
- /**
- * Execute the job.
- *
- *
- * @return void
- */
- public function handle()
- {
- MultiDB::setDb($this->company->db);
-
- $this->settings = $this->quote_invitation->contact->client->getMergedSettings();
-
- $this->setMailDriver();
-
- Mail::to($this->quote_invitation->contact->email, $this->quote_invitation->contact->present()->name())
- ->send(
- new TemplateEmail(
- $this->email_builder,
- $this->quote_invitation->contact->user,
- $this->quote_invitation->contact->client
- )
- );
-
- if (count(Mail::failures()) > 0) {
- return $this->logMailError(Mail::failures());
- }
-
- $this->quote_invitation->quote->service()->markSent()->save();
- }
-
- private function logMailError($errors)
- {
- SystemLogger::dispatch(
- $errors,
- SystemLog::CATEGORY_MAIL,
- SystemLog::EVENT_MAIL_SEND,
- SystemLog::TYPE_FAILURE,
- $this->quote->client
- );
- }
-}
diff --git a/app/Jobs/RecurringInvoice/SendRecurring.php b/app/Jobs/RecurringInvoice/SendRecurring.php
index ccbdc7ae949b..e06624942224 100644
--- a/app/Jobs/RecurringInvoice/SendRecurring.php
+++ b/app/Jobs/RecurringInvoice/SendRecurring.php
@@ -15,7 +15,7 @@ use App\DataMapper\Analytics\SendRecurringFailure;
use App\Events\Invoice\InvoiceWasEmailed;
use App\Factory\RecurringInvoiceToInvoiceFactory;
use App\Helpers\Email\InvoiceEmail;
-use App\Jobs\Invoice\EmailInvoice;
+use App\Jobs\Entity\EmailEntity;
use App\Models\Invoice;
use App\Models\RecurringInvoice;
use App\Utils\Ninja;
@@ -76,7 +76,7 @@ class SendRecurring implements ShouldQueue
$email_builder = (new InvoiceEmail())->build($invitation);
if($invitation->contact && strlen($invitation->contact->email) >=1){
- EmailInvoice::dispatch($email_builder, $invitation, $invoice->company);
+ EmailEntity::dispatch($invitation, $invoice->company);
info("Firing email for invoice {$invoice->number}");
}
@@ -95,9 +95,9 @@ class SendRecurring implements ShouldQueue
if ($this->recurring_invoice->remaining_cycles == 0)
$this->recurring_invoice->setCompleted();
- info($this->recurring_invoice->next_send_date);
- info($this->recurring_invoice->remaining_cycles);
- info($this->recurring_invoice->last_sent_date);
+ info("next send date = " . $this->recurring_invoice->next_send_date);
+ info("remaining cycles = " . $this->recurring_invoice->remaining_cycles);
+ info("last send date = " . $this->recurring_invoice->last_sent_date);
$this->recurring_invoice->save();
diff --git a/app/Jobs/User/UserEmailChanged.php b/app/Jobs/User/UserEmailChanged.php
index 8043d4e2232c..fcb9fc969253 100644
--- a/app/Jobs/User/UserEmailChanged.php
+++ b/app/Jobs/User/UserEmailChanged.php
@@ -93,6 +93,7 @@ class UserEmailChanged extends BaseMailerJob implements ShouldQueue
'signature' => $this->company->owner()->signature,
'logo' => $this->company->present()->logo(),
'settings' => $this->settings,
+ 'whitelabel' => $this->company->account->isPaid() ? true : false,
];
}
}
diff --git a/app/Jobs/Util/ReminderJob.php b/app/Jobs/Util/ReminderJob.php
index 01826882b267..a49d560f90c8 100644
--- a/app/Jobs/Util/ReminderJob.php
+++ b/app/Jobs/Util/ReminderJob.php
@@ -66,7 +66,7 @@ class ReminderJob implements ShouldQueue
if ($invoice->isPayable()) {
- $reminder_template = $invoice->calculateTemplate();
+ $reminder_template = $invoice->calculateTemplate('invoice');
$invoice->service()->touchReminder($this->reminder_template)->save();
$invoice->invitations->each(function ($invitation) use ($invoice) {
diff --git a/app/Jobs/Util/SendFailedEmails.php b/app/Jobs/Util/SendFailedEmails.php
index 329ed566c00b..91f0850657e6 100644
--- a/app/Jobs/Util/SendFailedEmails.php
+++ b/app/Jobs/Util/SendFailedEmails.php
@@ -12,6 +12,7 @@
namespace App\Jobs\Util;
use App\Helpers\Email\InvoiceEmail;
+use App\Jobs\Entity\EmailEntity;
use App\Jobs\Invoice\EmailInvoice;
use App\Libraries\MultiDB;
use App\Models\SystemLog;
@@ -56,9 +57,6 @@ class SendFailedEmails implements ShouldQueue
private function processEmails()
{
- //\Log::error('processing emails');
- //info("process emails");
- //@todo check that the quota is available for the job
$email_jobs = SystemLog::where('event_id', SystemLog::EVENT_MAIL_RETRY_QUEUE)->get();
@@ -71,7 +69,7 @@ class SendFailedEmails implements ShouldQueue
$email_builder = (new InvoiceEmail())->build($invitation, $job_meta_array['reminder_template']);
if ($invitation->contact->send_email && $invitation->contact->email) {
- EmailInvoice::dispatch($email_builder, $invitation, $invitation->company);
+ EmailEntity::dispatch($invitation, $invitation->company);
}
}
});
diff --git a/app/Jobs/Util/UploadAvatar.php b/app/Jobs/Util/UploadAvatar.php
index a3b9a5b131c8..3b1775607b91 100644
--- a/app/Jobs/Util/UploadAvatar.php
+++ b/app/Jobs/Util/UploadAvatar.php
@@ -39,13 +39,16 @@ class UploadAvatar implements ShouldQueue
{
//make dir
- Storage::makeDirectory('public/'.$this->directory, 0775);
+ Storage::makeDirectory($this->directory, 0775);
$tmp_file = sha1(time()).'.png';
- $file_png = imagepng(imagecreatefromstring(file_get_contents($this->file)), sys_get_temp_dir().'/'.$tmp_file);
+ $im = imagecreatefromstring(file_get_contents($this->file));
+ imagealphablending($im, false);
+ imagesavealpha($im, true);
+ $file_png = imagepng($im, sys_get_temp_dir().'/'.$tmp_file);
- $path = Storage::putFile('public/'.$this->directory, new File(sys_get_temp_dir().'/'.$tmp_file));
+ $path = Storage::putFile($this->directory, new File(sys_get_temp_dir().'/'.$tmp_file));
info($path);
info($tmp_file);
diff --git a/app/Jobs/Util/VersionCheck.php b/app/Jobs/Util/VersionCheck.php
index 9662fa1b4136..9d04f9c3230a 100644
--- a/app/Jobs/Util/VersionCheck.php
+++ b/app/Jobs/Util/VersionCheck.php
@@ -34,7 +34,7 @@ class VersionCheck implements ShouldQueue
*/
public function handle()
{
- $version_file = file_get_contents(config('ninja.version_url'));
+ $version_file = trim(file_get_contents(config('ninja.version_url')));
info("latest version = {$version_file}");
diff --git a/app/Libraries/MultiDB.php b/app/Libraries/MultiDB.php
index ad997d15c22c..cd7a0baf3ce7 100644
--- a/app/Libraries/MultiDB.php
+++ b/app/Libraries/MultiDB.php
@@ -16,6 +16,7 @@ use App\Models\ClientContact;
use App\Models\Company;
use App\Models\CompanyToken;
use App\Models\User;
+use Illuminate\Support\Str;
/**
* Class MultiDB.
@@ -237,7 +238,7 @@ class MultiDB
public static function findAndSetDbByInvitation($entity, $invitation_key)
{
- $class = 'App\Models\\'.ucfirst($entity).'Invitation';
+ $class = 'App\Models\\'.ucfirst(Str::camel($entity)).'Invitation';
foreach (self::$dbs as $db) {
if ($invite = $class::on($db)->whereRaw('BINARY `key`= ?', [$invitation_key])->first()) {
diff --git a/app/Listeners/Invoice/CreateInvoicePdf.php b/app/Listeners/Invoice/CreateInvoicePdf.php
index 824006fe6dc1..e48174ba75e4 100644
--- a/app/Listeners/Invoice/CreateInvoicePdf.php
+++ b/app/Listeners/Invoice/CreateInvoicePdf.php
@@ -11,7 +11,7 @@
namespace App\Listeners\Invoice;
-use App\Jobs\Invoice\CreateInvoicePdf as PdfCreator;
+use App\Jobs\Entity\CreateEntityPdf;
use App\Libraries\MultiDB;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\InteractsWithQueue;
@@ -38,7 +38,7 @@ class CreateInvoicePdf implements ShouldQueue
MultiDB::setDb($event->company->db);
$event->invoice->invitations->each(function ($invitation) {
- PdfCreator::dispatch($invitation);
+ CreateEntityPdf::dispatch($invitation);
});
}
}
diff --git a/app/Listeners/Invoice/InvoiceEmailedNotification.php b/app/Listeners/Invoice/InvoiceEmailedNotification.php
index 21b2348bed4a..dfd71d8b9cc7 100644
--- a/app/Listeners/Invoice/InvoiceEmailedNotification.php
+++ b/app/Listeners/Invoice/InvoiceEmailedNotification.php
@@ -46,6 +46,10 @@ class InvoiceEmailedNotification implements ShouldQueue
$first_notification_sent = true;
+ $invoice = $event->invitation->invoice;
+ $invoice->last_sent_date = now();
+ $invoice->save();
+
foreach ($event->invitation->company->company_users as $company_user) {
$user = $company_user->user;
diff --git a/app/Mail/Admin/EntityPaidObject.php b/app/Mail/Admin/EntityPaidObject.php
index a3ab38b12b21..33c155a21b13 100644
--- a/app/Mail/Admin/EntityPaidObject.php
+++ b/app/Mail/Admin/EntityPaidObject.php
@@ -90,6 +90,7 @@ class EntityPaidObject
'signature' => $settings->email_signature,
'logo' => $this->company->present()->logo(),
'settings' => $settings,
+ 'whitelabel' => $this->company->account->isPaid() ? true : false,
];
return $data;
diff --git a/app/Mail/Admin/EntitySentObject.php b/app/Mail/Admin/EntitySentObject.php
index 4367acda86c7..901adab7183b 100644
--- a/app/Mail/Admin/EntitySentObject.php
+++ b/app/Mail/Admin/EntitySentObject.php
@@ -85,7 +85,7 @@ class EntitySentObject
'signature' => $settings->email_signature,
'logo' => $this->company->present()->logo(),
'settings' => $settings,
-
+ 'whitelabel' => $this->company->account->isPaid() ? true : false,
];
}
}
diff --git a/app/Mail/Admin/EntityViewedObject.php b/app/Mail/Admin/EntityViewedObject.php
index 367c3f2de2a2..36909312715d 100644
--- a/app/Mail/Admin/EntityViewedObject.php
+++ b/app/Mail/Admin/EntityViewedObject.php
@@ -85,7 +85,7 @@ class EntityViewedObject
'signature' => $settings->email_signature,
'logo' => $this->company->present()->logo(),
'settings' => $settings,
-
+ 'whitelabel' => $this->company->account->isPaid() ? true : false,
];
return $data;
diff --git a/app/Mail/Admin/PaymentFailureObject.php b/app/Mail/Admin/PaymentFailureObject.php
index 12e041740f05..ed34e338a164 100644
--- a/app/Mail/Admin/PaymentFailureObject.php
+++ b/app/Mail/Admin/PaymentFailureObject.php
@@ -77,7 +77,7 @@ class PaymentFailureObject
'signature' => $signature,
'logo' => $this->company->present()->logo(),
'settings' => $this->client->getMergedSettings(),
-
+ 'whitelabel' => $this->company->account->isPaid() ? true : false,
];
return $data;
diff --git a/app/Mail/Engine/BaseEmailEngine.php b/app/Mail/Engine/BaseEmailEngine.php
new file mode 100644
index 000000000000..a1fc0208f437
--- /dev/null
+++ b/app/Mail/Engine/BaseEmailEngine.php
@@ -0,0 +1,135 @@
+footer = $footer;
+
+ return $this;
+ }
+
+ public function setVariables($variables)
+ {
+ $this->variables = $variables;
+
+ return $this;
+ }
+
+ public function setContact($contact)
+ {
+ $this->contact = $contact;
+
+ return $this;
+ }
+
+ public function setSubject($subject)
+ {
+ $this->subject = $subject;
+
+ return $this;
+ }
+
+ public function setBody($body)
+ {
+ $this->body = $body;
+
+ return $this;
+ }
+
+ public function setTemplate($template_style)
+ {
+ $this->template_style = $template_style;
+
+ return $this;
+ }
+
+ public function setAttachments($attachments)
+ {
+ $this->attachments = $attachments;
+
+ return $this;
+ }
+
+ public function setViewLink($link)
+ {
+ $this->link = $link;
+
+ return $this;
+ }
+
+ public function setViewText($text)
+ {
+ $this->text = $text;
+
+ return $this;
+ }
+
+ public function getSubject()
+ {
+ return $this->subject;
+ }
+
+ public function getBody()
+ {
+ return $this->body;
+ }
+
+ public function getAttachments()
+ {
+ return $this->attachments;
+ }
+
+ public function getFooter()
+ {
+ return $this->footer;
+ }
+
+ public function getTemplate()
+ {
+ return $this->template_style;
+ }
+
+ public function getViewLink()
+ {
+ return $this->link;
+ }
+
+
+ public function getViewText()
+ {
+ return $this->text;
+ }
+
+ public function build(){}
+
+}
\ No newline at end of file
diff --git a/app/Mail/Engine/CreditEmailEngine.php b/app/Mail/Engine/CreditEmailEngine.php
new file mode 100644
index 000000000000..019248b658ed
--- /dev/null
+++ b/app/Mail/Engine/CreditEmailEngine.php
@@ -0,0 +1,91 @@
+invitation = $invitation;
+ $this->reminder_template = $reminder_template;
+ $this->client = $invitation->contact->client;
+ $this->credit = $invitation->credit;
+ $this->contact = $invitation->contact;
+ }
+
+ public function build()
+ {
+
+ $body_template = $this->client->getSetting('email_template_'.$this->reminder_template);
+
+ /* Use default translations if a custom message has not been set*/
+ if (iconv_strlen($body_template) == 0) {
+ $body_template = trans(
+ 'texts.credit_message',
+ [
+ 'credit' => $this->credit->number,
+ 'company' => $this->credit->company->present()->name(),
+ 'amount' => Number::formatMoney($this->credit->balance, $this->client),
+ ],
+ null,
+ $this->client->locale()
+ );
+ }
+
+ $subject_template = $this->client->getSetting('email_subject_'.$this->reminder_template);
+
+ if (iconv_strlen($subject_template) == 0) {
+
+ $subject_template = trans(
+ 'texts.credit_subject',
+ [
+ 'number' => $this->credit->number,
+ 'account' => $this->credit->company->present()->name(),
+ ],
+ null,
+ $this->client->locale()
+ );
+
+ }
+
+ $this->setTemplate($this->client->getSetting('email_style'))
+ ->setContact($this->contact)
+ ->setVariables((new HtmlEngine($this->invitation))->makeValues())//move make values into the htmlengine
+ ->setSubject($subject_template)
+ ->setBody($body_template)
+ ->setFooter("
".ctrans('texts.view_credit').'')
+ ->setViewLink($this->invitation->getLink())
+ ->setViewText(ctrans('texts.view_credit'));
+
+ if ($this->client->getSetting('pdf_email_attachment') !== false) {
+ $this->setAttachments($invitation->pdf_file_path());
+ }
+
+ return $this;
+
+ }
+
+}
+
diff --git a/app/Mail/Engine/EngineInterface.php b/app/Mail/Engine/EngineInterface.php
new file mode 100644
index 000000000000..9196b1a1619a
--- /dev/null
+++ b/app/Mail/Engine/EngineInterface.php
@@ -0,0 +1,51 @@
+invitation = $invitation;
+ $this->reminder_template = $reminder_template;
+ $this->client = $invitation->contact->client;
+ $this->invoice = $invitation->invoice;
+ $this->contact = $invitation->contact;
+ }
+
+ public function build()
+ {
+
+ $body_template = $this->client->getSetting('email_template_'.$this->reminder_template);
+
+ /* Use default translations if a custom message has not been set*/
+ if (iconv_strlen($body_template) == 0) {
+ $body_template = trans(
+ 'texts.invoice_message',
+ [
+ 'invoice' => $this->invoice->number,
+ 'company' => $this->invoice->company->present()->name(),
+ 'amount' => Number::formatMoney($this->invoice->balance, $this->client),
+ ],
+ null,
+ $this->client->locale()
+ );
+ }
+
+ $subject_template = $this->client->getSetting('email_subject_'.$this->reminder_template);
+
+ if (iconv_strlen($subject_template) == 0) {
+
+ $subject_template = trans(
+ 'texts.invoice_subject',
+ [
+ 'number' => $this->invoice->number,
+ 'account' => $this->invoice->company->present()->name(),
+ ],
+ null,
+ $this->client->locale()
+ );
+
+ }
+
+ $this->setTemplate($this->client->getSetting('email_style'))
+ ->setContact($this->contact)
+ ->setVariables((new HtmlEngine($this->invitation))->makeValues())//move make values into the htmlengine
+ ->setSubject($subject_template)
+ ->setBody($body_template)
+ ->setFooter("
".ctrans('texts.view_invoice').'')
+ ->setViewLink($this->invitation->getLink())
+ ->setViewText(ctrans('texts.view_invoice'));
+
+ if ($this->client->getSetting('pdf_email_attachment') !== false) {
+ $this->setAttachments($invitation->pdf_file_path());
+ }
+
+ return $this;
+
+ }
+
+}
+
diff --git a/app/Mail/Engine/QuoteEmailEngine.php b/app/Mail/Engine/QuoteEmailEngine.php
new file mode 100644
index 000000000000..6121787c22b5
--- /dev/null
+++ b/app/Mail/Engine/QuoteEmailEngine.php
@@ -0,0 +1,90 @@
+invitation = $invitation;
+ $this->reminder_template = $reminder_template;
+ $this->client = $invitation->contact->client;
+ $this->quote = $invitation->quote;
+ $this->contact = $invitation->contact;
+ }
+
+ public function build()
+ {
+
+ $body_template = $this->client->getSetting('email_template_'.$this->reminder_template);
+
+ /* Use default translations if a custom message has not been set*/
+ if (iconv_strlen($body_template) == 0) {
+ $body_template = trans(
+ 'texts.quote_message',
+ [
+ 'quote' => $this->quote->number,
+ 'company' => $this->quote->company->present()->name(),
+ 'amount' => Number::formatMoney($this->quote->balance, $this->client),
+ ],
+ null,
+ $this->client->locale()
+ );
+ }
+
+ $subject_template = $this->client->getSetting('email_subject_'.$this->reminder_template);
+
+ if (iconv_strlen($subject_template) == 0) {
+
+ $subject_template = trans(
+ 'texts.quote_subject',
+ [
+ 'number' => $this->quote->number,
+ 'account' => $this->quote->company->present()->name(),
+ ],
+ null,
+ $this->client->locale()
+ );
+
+ }
+
+ $this->setTemplate($this->client->getSetting('email_style'))
+ ->setContact($this->contact)
+ ->setVariables((new HtmlEngine($this->invitation))->makeValues())//move make values into the htmlengine
+ ->setSubject($subject_template)
+ ->setBody($body_template)
+ ->setFooter("
".ctrans('texts.view_quote').'')
+ ->setViewLink($this->invitation->getLink())
+ ->setViewText(ctrans('texts.view_quote'));
+
+ if ($this->client->getSetting('pdf_email_attachment') !== false) {
+ $this->setAttachments($invitation->pdf_file_path());
+ }
+
+ return $this;
+
+ }
+
+}
+
diff --git a/app/Mail/TemplateEmail.php b/app/Mail/TemplateEmail.php
index f8e1a1079a77..0d3bdec9c668 100644
--- a/app/Mail/TemplateEmail.php
+++ b/app/Mail/TemplateEmail.php
@@ -46,9 +46,7 @@ class TemplateEmail extends Mailable
*/
public function build()
{
- /*Alter Run Time Mailer configuration (driver etc etc) to regenerate the Mailer Singleton*/
- //if using a system level template
$template_name = 'email.template.'.$this->build_email->getTemplate();
$settings = $this->client->getMergedSettings();
@@ -60,6 +58,8 @@ class TemplateEmail extends Mailable
->text('email.template.plain', [
'body' => $this->build_email->getBody(),
'footer' => $this->build_email->getFooter(),
+ 'whitelabel' => $this->client->user->account->isPaid() ? true : false,
+ 'settings' => $settings,
])
->view($template_name, [
'body' => $this->build_email->getBody(),
diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php
index d6ea195907cc..a1cb856d2cb0 100644
--- a/app/Models/BaseModel.php
+++ b/app/Models/BaseModel.php
@@ -13,7 +13,6 @@ namespace App\Models;
use App\DataMapper\ClientSettings;
use App\DataMapper\CompanySettings;
-use App\Designs\Designer;
use App\Filters\QueryFilters;
use App\Models\Design;
use App\Utils\Traits\MakesHash;
@@ -176,15 +175,6 @@ class BaseModel extends Model
->where('id', $this->decodePrimaryKey($value))->firstOrFail();
}
- public function getEntityDesigner()
- {
- $design = Design::find($this->decodePrimaryKey($this->client->getSetting('invoice_design_id')));
-
- $entity = strtolower(class_basename($this));
-
- return new Designer($this, $design, $this->client->getSetting('pdf_variables'), $entity);
- }
-
/**
* @return string
*/
diff --git a/app/Models/Client.php b/app/Models/Client.php
index a97e306d51c7..5894e91872a7 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -98,6 +98,8 @@ class Client extends BaseModel implements HasLocalePreference
];
protected $with = [
+ 'gateway_tokens',
+ 'documents'
//'currency',
// 'primary_contact',
// 'country',
@@ -240,7 +242,6 @@ class Client extends BaseModel implements HasLocalePreference
return $item->id == $this->getSetting('date_format_id');
})->first()->format;
- //return DateFormat::find($this->getSetting('date_format_id'))->format;
}
public function currency()
@@ -524,7 +525,7 @@ class Client extends BaseModel implements HasLocalePreference
}
}
- if($this->company->use_credits_payment == 'option' && $this->service()->getCreditBalance() > 0) {
+ if(($this->getSetting('use_credits_payment') == 'option' || $this->getSetting('use_credits_payment') == 'always') && $this->service()->getCreditBalance() > 0) {
$payment_urls[] = [
'label' => ctrans('texts.apply_credit'),
'company_gateway_id' => CompanyGateway::GATEWAY_CREDIT,
diff --git a/app/Models/Company.php b/app/Models/Company.php
index af1efb90ed6f..b7bc9676f614 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -69,9 +69,9 @@ class Company extends BaseModel
protected $presenter = \App\Models\Presenters\CompanyPresenter::class;
protected $fillable = [
+ 'show_tasks_table',
'mark_expenses_invoiceable',
'mark_expenses_paid',
- 'use_credits_payment',
'enabled_item_tax_rates',
'fill_products',
'industry_id',
@@ -98,6 +98,8 @@ class Company extends BaseModel
'google_analytics_key',
'client_can_register',
'enable_shop_api',
+ 'invoice_task_timelog',
+ 'auto_start_tasks',
];
protected $hidden = [
@@ -165,14 +167,20 @@ class Company extends BaseModel
return $this->hasManyThrough(User::class, CompanyUser::class, 'company_id', 'id', 'id', 'user_id');
}
- /**
- * @return \Illuminate\Database\Eloquent\Relations\HasMany
- */
+ public function expense_categories()
+ {
+ return $this->hasMany(ExpenseCategory::class)->withTrashed();
+ }
+
+ public function task_statuses()
+ {
+ return $this->hasMany(TaskStatus::class)->withTrashed();
+ }
+
public function clients()
{
return $this->hasMany(Client::class)->withTrashed();
}
-
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
diff --git a/app/Models/Credit.php b/app/Models/Credit.php
index 4c1a0ef25998..f1517bb654ba 100644
--- a/app/Models/Credit.php
+++ b/app/Models/Credit.php
@@ -14,7 +14,7 @@ namespace App\Models;
use App\Events\Credit\CreditWasUpdated;
use App\Helpers\Invoice\InvoiceSum;
use App\Helpers\Invoice\InvoiceSumInclusive;
-use App\Jobs\Credit\CreateCreditPdf;
+use App\Jobs\Entity\CreateEntityPdf;
use App\Models\Filterable;
use App\Services\Credit\CreditService;
use App\Services\Ledger\LedgerService;
@@ -244,10 +244,10 @@ class Credit extends BaseModel
if (! $invitation) {
event(new CreditWasUpdated($this, $this->company, Ninja::eventVars()));
- CreateCreditPdf::dispatchNow($this, $this->company, $this->client->primary_contact()->first());
+ CreateEntityPdf::dispatchNow($this, $this->company, $this->client->primary_contact()->first());
} else {
event(new CreditWasUpdated($this, $this->company, Ninja::eventVars()));
- CreateCreditPdf::dispatchNow($invitation->credit, $invitation->company, $invitation->contact);
+ CreateEntityPdf::dispatchNow($invitation->credit, $invitation->company, $invitation->contact);
}
return $storage_path;
diff --git a/app/Models/CreditInvitation.php b/app/Models/CreditInvitation.php
index 7cc5df13d891..02f5428c7ef4 100644
--- a/app/Models/CreditInvitation.php
+++ b/app/Models/CreditInvitation.php
@@ -12,7 +12,7 @@
namespace App\Models;
use App\Events\Credit\CreditWasUpdated;
-use App\Jobs\Credit\CreateCreditPdf;
+use App\Jobs\Entity\CreateEntityPdf;
use App\Models\Invoice;
use App\Utils\Ninja;
use App\Utils\Traits\Inviteable;
@@ -131,7 +131,7 @@ class CreditInvitation extends BaseModel
if (! Storage::exists($this->credit->client->credit_filepath().$this->credit->number.'.pdf')) {
event(new CreditWasUpdated($this, $this->company, Ninja::eventVars()));
- CreateCreditPdf::dispatchNow($this);
+ CreateEntityPdf::dispatchNow($this);
}
return $storage_path;
diff --git a/app/Models/Expense.php b/app/Models/Expense.php
index e8db121cb19d..1747164b7769 100644
--- a/app/Models/Expense.php
+++ b/app/Models/Expense.php
@@ -23,7 +23,9 @@ class Expense extends BaseModel
protected $fillable = [
'client_id',
+ 'assigned_user_id',
'vendor_id',
+ 'invoice_id',
'expense_currency_id',
'date',
'invoice_currency_id',
@@ -34,7 +36,7 @@ class Expense extends BaseModel
'public_notes',
'bank_id',
'transaction_id',
- 'expense_category_id',
+ 'category_id',
'tax_rate1',
'tax_name1',
'tax_rate2',
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 2da78e574a7f..0d4f8df9f74f 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -18,7 +18,7 @@ use App\Helpers\Invoice\InvoiceSum;
use App\Helpers\Invoice\InvoiceSumInclusive;
use App\Jobs\Client\UpdateClientBalance;
use App\Jobs\Company\UpdateCompanyLedgerWithInvoice;
-use App\Jobs\Invoice\CreateInvoicePdf;
+use App\Jobs\Entity\CreateEntityPdf;
use App\Models\Backup;
use App\Models\CompanyLedger;
use App\Models\Currency;
@@ -30,7 +30,6 @@ use App\Utils\Ninja;
use App\Utils\Number;
use App\Utils\Traits\Archivable;
use App\Utils\Traits\Invoice\ActionsInvoice;
-use App\Utils\Traits\InvoiceEmailBuilder;
use App\Utils\Traits\MakesDates;
use App\Utils\Traits\MakesInvoiceValues;
use App\Utils\Traits\MakesReminders;
@@ -50,7 +49,6 @@ class Invoice extends BaseModel
use MakesDates;
use PresentableTrait;
use MakesInvoiceValues;
- use InvoiceEmailBuilder;
use MakesReminders;
use ActionsInvoice;
@@ -395,7 +393,7 @@ class Invoice extends BaseModel
if (! Storage::exists($this->client->invoice_filepath().$this->number.'.pdf')) {
event(new InvoiceWasUpdated($this, $this->company, Ninja::eventVars()));
- CreateInvoicePdf::dispatchNow($invitation);
+ CreateEntityPdf::dispatchNow($invitation);
}
return $storage_path;
diff --git a/app/Models/InvoiceInvitation.php b/app/Models/InvoiceInvitation.php
index 60669e07483b..f4599868446b 100644
--- a/app/Models/InvoiceInvitation.php
+++ b/app/Models/InvoiceInvitation.php
@@ -12,7 +12,7 @@
namespace App\Models;
use App\Events\Invoice\InvoiceWasUpdated;
-use App\Jobs\Invoice\CreateInvoicePdf;
+use App\Jobs\Entity\CreateEntityPdf;
use App\Models\Invoice;
use App\Utils\Ninja;
use App\Utils\Traits\Inviteable;
@@ -28,7 +28,6 @@ class InvoiceInvitation extends BaseModel
use Inviteable;
protected $fillable = [
- //'key',
'client_contact_id',
];
@@ -145,7 +144,7 @@ class InvoiceInvitation extends BaseModel
if (! Storage::exists($this->invoice->client->invoice_filepath().$this->invoice->number.'.pdf')) {
event(new InvoiceWasUpdated($this->invoice, $this->company, Ninja::eventVars()));
- CreateInvoicePdf::dispatchNow($this);
+ CreateEntityPdf::dispatchNow($this);
}
return $storage_path;
diff --git a/app/Models/PaymentHash.php b/app/Models/PaymentHash.php
index 2e16a8fc2631..f8eddf35f915 100644
--- a/app/Models/PaymentHash.php
+++ b/app/Models/PaymentHash.php
@@ -21,9 +21,10 @@ class PaymentHash extends Model
'data' => 'object',
];
+
public function invoices()
{
- return $this->data;
+ return $this->data->invoices;
}
public function payment()
diff --git a/app/Models/Presenters/CompanyPresenter.php b/app/Models/Presenters/CompanyPresenter.php
index aac2ff141ce7..dfe272e13518 100644
--- a/app/Models/Presenters/CompanyPresenter.php
+++ b/app/Models/Presenters/CompanyPresenter.php
@@ -76,7 +76,7 @@ class CompanyPresenter extends EntityPresenter
$settings = $this->entity->settings;
}
- $country = Country::find($settings->country_id)->first();
+ $country = Country::find($settings->country_id);
$swap = $country && $country->swap_postal_code;
diff --git a/app/Models/Presenters/EntityPresenter.php b/app/Models/Presenters/EntityPresenter.php
index 27534220fc3b..99bd5392f57a 100644
--- a/app/Models/Presenters/EntityPresenter.php
+++ b/app/Models/Presenters/EntityPresenter.php
@@ -14,7 +14,6 @@ namespace App\Models\Presenters;
use App\Utils\Traits\MakesHash;
use Hashids\Hashids;
use Laracasts\Presenter\Presenter;
-use stdClass;
use URL;
use Utils;
diff --git a/app/Models/Presenters/VendorPresenter.php b/app/Models/Presenters/VendorPresenter.php
new file mode 100644
index 000000000000..b74212cf67a8
--- /dev/null
+++ b/app/Models/Presenters/VendorPresenter.php
@@ -0,0 +1,160 @@
+entity->name) {
+ return $this->entity->name;
+ }
+
+ $contact = $this->entity->primary_contact->first();
+
+ $contact_name = 'No Contact Set';
+
+ if ($contact && (strlen($contact->first_name) >= 1 || strlen($contact->last_name) >= 1)) {
+ $contact_name = $contact->first_name.' '.$contact->last_name;
+ } elseif ($contact && (strlen($contact->email))) {
+ $contact_name = $contact->email;
+ }
+
+ return $contact_name;
+ }
+
+ public function primary_contact_name()
+ {
+ return $this->entity->primary_contact->first() !== null ? $this->entity->primary_contact->first()->first_name.' '.$this->entity->primary_contact->first()->last_name : 'No primary contact set';
+ }
+
+ public function email()
+ {
+ return $this->entity->primary_contact->first() !== null ? $this->entity->primary_contact->first()->email : 'No Email Set';
+ }
+
+ public function address()
+ {
+ $str = '';
+ $vendor = $this->entity;
+
+ if ($address1 = $vendor->address1) {
+ $str .= e($address1).'
';
+ }
+ if ($address2 = $vendor->address2) {
+ $str .= e($address2).'
';
+ }
+ if ($cityState = $this->getCityState()) {
+ $str .= e($cityState).'
';
+ }
+ if ($country = $vendor->country) {
+ $str .= e($country->name).'
';
+ }
+
+ return $str;
+ }
+
+ public function shipping_address()
+ {
+ $str = '';
+ $vendor = $this->entity;
+
+ if ($address1 = $vendor->shipping_address1) {
+ $str .= e($address1).'
';
+ }
+ if ($address2 = $vendor->shipping_address2) {
+ $str .= e($address2).'
';
+ }
+ if ($cityState = $this->getCityState()) {
+ $str .= e($cityState).'
';
+ }
+ if ($country = $vendor->country) {
+ $str .= e($country->name).'
';
+ }
+
+ return $str;
+ }
+
+ public function phone()
+ {
+ return $this->entity->phone ?: '';
+ }
+
+ public function website()
+ {
+ return $this->entity->website ?: '';
+ }
+
+ /**
+ * Calculated company data fields
+ * using settings.
+ */
+ public function company_name()
+ {
+ $settings = $this->entity->company->settings;;
+
+ return $settings->name ?: ctrans('texts.untitled_account');
+ }
+
+ public function company_address()
+ {
+ $settings = $this->entity->company->settings;;
+
+ $str = '';
+
+ if ($settings->address1) {
+ $str .= e($settings->address1).'
';
+ }
+ if ($settings->address2) {
+ $str .= e($settings->address2).'
';
+ }
+ if ($cityState = $this->getCityState()) {
+ $str .= e($cityState).'
';
+ }
+ if ($country = Country::find($settings->country_id)) {
+ $str .= e($country->name).'
';
+ }
+
+ return $str;
+ }
+
+ public function getCityState()
+ {
+ $settings = $this->entity->company->settings;;
+
+ $country = false;
+
+ if ($settings->country_id) {
+ $country = Country::find($settings->country_id);
+ }
+
+ $swap = $country && $country->swap_postal_code;
+
+ $city = e($settings->city ?: '');
+ $state = e($settings->state ?: '');
+ $postalCode = e($settings->postal_code ?: '');
+
+ if ($city || $state || $postalCode) {
+ return $this->cityStateZip($city, $state, $postalCode, $swap);
+ } else {
+ return false;
+ }
+ }
+}
diff --git a/app/Models/Project.php b/app/Models/Project.php
index e3669bc3ad7b..6e43247fd3a6 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -11,7 +11,7 @@ use Laracasts\Presenter\PresentableTrait;
*/
class Project extends BaseModel
{
- // Expense Categories
+
use SoftDeletes;
use PresentableTrait;
use Filterable;
diff --git a/app/Models/Quote.php b/app/Models/Quote.php
index 5ee3026c4345..caed1e3fd3c1 100644
--- a/app/Models/Quote.php
+++ b/app/Models/Quote.php
@@ -14,8 +14,7 @@ namespace App\Models;
use App\Events\Quote\QuoteWasUpdated;
use App\Helpers\Invoice\InvoiceSum;
use App\Helpers\Invoice\InvoiceSumInclusive;
-use App\Jobs\Invoice\CreateInvoicePdf;
-use App\Jobs\Quote\CreateQuotePdf;
+use App\Jobs\Entity\CreateEntityPdf;
use App\Models\Filterable;
use App\Services\Quote\QuoteService;
use App\Utils\Ninja;
@@ -206,7 +205,7 @@ class Quote extends BaseModel
event(new QuoteWasUpdated($this, $this->company, Ninja::eventVars()));
- CreateQuotePdf::dispatchNow($invitation);
+ CreateEntityPdf::dispatchNow($invitation);
return $storage_path;
}
diff --git a/app/Models/QuoteInvitation.php b/app/Models/QuoteInvitation.php
index 78b1ae7e4cc4..d46e1ce901f7 100644
--- a/app/Models/QuoteInvitation.php
+++ b/app/Models/QuoteInvitation.php
@@ -12,7 +12,7 @@
namespace App\Models;
use App\Events\Quote\QuoteWasUpdated;
-use App\Jobs\Quote\CreateQuotePdf;
+use App\Jobs\Entity\CreateEntityPdf;
use App\Models\Quote;
use App\Utils\Ninja;
use App\Utils\Traits\Inviteable;
@@ -135,7 +135,7 @@ class QuoteInvitation extends BaseModel
if (! Storage::exists($this->quote->client->quote_filepath().$this->quote->number.'.pdf')) {
event(new QuoteWasUpdated($this->quote, $this->company, Ninja::eventVars()));
- CreateQuotePdf::dispatchNow($this);
+ CreateEntityPdf::dispatchNow($this);
}
return $storage_path;
diff --git a/app/Models/RecurringInvoiceInvitation.php b/app/Models/RecurringInvoiceInvitation.php
index d958f6b28a1b..3b54b32ad9a5 100644
--- a/app/Models/RecurringInvoiceInvitation.php
+++ b/app/Models/RecurringInvoiceInvitation.php
@@ -27,6 +27,11 @@ class RecurringInvoiceInvitation extends BaseModel
protected $touches = ['recurring_invoice'];
+ protected $with = [
+ 'company',
+ 'contact',
+ ];
+
public function getEntityType()
{
return self::class;
@@ -69,5 +74,16 @@ class RecurringInvoiceInvitation extends BaseModel
return $this->belongsTo(Company::class);
}
+ public function markViewed()
+ {
+ $this->viewed_date = now();
+ $this->save();
+ }
+
+ public function markOpened()
+ {
+ $this->opened_date = now();
+ $this->save();
+ }
}
diff --git a/app/Models/Task.php b/app/Models/Task.php
index 9a3345f7cfb0..373ae4f548f3 100644
--- a/app/Models/Task.php
+++ b/app/Models/Task.php
@@ -26,6 +26,7 @@ class Task extends BaseModel
'client_id',
'invoice_id',
'project_id',
+ 'assigned_user_id',
'custom_value1',
'custom_value2',
'custom_value3',
@@ -33,6 +34,9 @@ class Task extends BaseModel
'description',
'is_running',
'time_log',
+ 'status_id',
+ 'status_sort_order',
+ 'invoice_documents',
];
protected $touches = [];
diff --git a/app/Models/TaskStatus.php b/app/Models/TaskStatus.php
new file mode 100644
index 000000000000..c90ab601978a
--- /dev/null
+++ b/app/Models/TaskStatus.php
@@ -0,0 +1,34 @@
+withTrashed()
->where('id', $this->decodePrimaryKey($value))->firstOrFail();
}
+
+ /**
+ * Send the password reset notification.
+ *
+ * @param string $token
+ * @return void
+ */
+ public function sendPasswordResetNotification($token)
+ {
+ $this->notify(new ResetPasswordNotification($token));
+ }
}
diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php
index 3cb8b05265ff..7538b3ed5f10 100644
--- a/app/Models/Vendor.php
+++ b/app/Models/Vendor.php
@@ -17,13 +17,15 @@ use App\Utils\Traits\GeneratesCounter;
use App\Utils\Traits\MakesHash;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
+use Laracasts\Presenter\PresentableTrait;
class Vendor extends BaseModel
{
use SoftDeletes;
use Filterable;
use GeneratesCounter;
-
+ use PresentableTrait;
+
protected $fillable = [
'name',
'assigned_user_id',
@@ -62,6 +64,8 @@ class Vendor extends BaseModel
// 'contacts',
];
+ protected $presenter = \App\Models\Presenters\VendorPresenter::class;
+
public function getEntityType()
{
return self::class;
diff --git a/app/Notifications/Admin/EntityViewedNotification.php b/app/Notifications/Admin/EntityViewedNotification.php
index 13adb05d9201..04c73dfbca10 100644
--- a/app/Notifications/Admin/EntityViewedNotification.php
+++ b/app/Notifications/Admin/EntityViewedNotification.php
@@ -51,7 +51,7 @@ class EntityViewedNotification extends Notification implements ShouldQueue
$this->entity = $invitation->{$entity_name};
$this->contact = $invitation->contact;
$this->company = $invitation->company;
- $this->settings = $this->entity->client->getMergedSettings();
+ $this->settings = $invitation->contact->client->getMergedSettings();
$this->is_system = $is_system;
$this->invitation = $invitation;
$this->method = null;
diff --git a/app/Notifications/BaseNotification.php b/app/Notifications/BaseNotification.php
index 34542e8b790a..3fe2314da4a0 100644
--- a/app/Notifications/BaseNotification.php
+++ b/app/Notifications/BaseNotification.php
@@ -124,7 +124,7 @@ class BaseNotification extends Notification implements ShouldQueue
'logo' => $this->entity->company->present()->logo(),
'signature' => $this->settings->email_signature,
'settings' => $this->settings,
-
+ 'whitelabel' => $this->entity->company->account->isPaid() ? true : false,
];
return $data;
diff --git a/app/Notifications/ResetPasswordNotification.php b/app/Notifications/ResetPasswordNotification.php
new file mode 100644
index 000000000000..56a341e5fcd5
--- /dev/null
+++ b/app/Notifications/ResetPasswordNotification.php
@@ -0,0 +1,61 @@
+token = $token;
+ }
+
+ /**
+ * Get the notification's delivery channels.
+ *
+ * @param mixed $notifiable
+ * @return array
+ */
+ public function via($notifiable)
+ {
+ return ['mail'];
+ }
+
+ /**
+ * Get the mail representation of the notification.
+ *
+ * @param mixed $notifiable
+ * @return \Illuminate\Notifications\Messages\MailMessage
+ */
+ public function toMail($notifiable)
+ {
+ return (new MailMessage)
+ ->view('email.auth.password-reset', ['link' => route('password.reset', $this->token)]);
+ }
+
+ /**
+ * Get the array representation of the notification.
+ *
+ * @param mixed $notifiable
+ * @return array
+ */
+ public function toArray($notifiable)
+ {
+ return [
+ //
+ ];
+ }
+}
diff --git a/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php b/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php
index c531d6d82852..38ad15a89400 100644
--- a/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php
+++ b/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php
@@ -201,7 +201,7 @@ class AuthorizeCreditCard
private function processFailedResponse($data, $request)
{
//dd($data);
- info(print_r($data, 1));
+// info(print_r($data, 1));
}
private function formatGatewayResponse($data, $vars)
diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php
index 678d2728ba77..82c82d836071 100644
--- a/app/PaymentDrivers/BaseDriver.php
+++ b/app/PaymentDrivers/BaseDriver.php
@@ -13,8 +13,12 @@
namespace App\PaymentDrivers;
use App\Events\Invoice\InvoiceWasPaid;
+use App\Events\Payment\PaymentWasCreated;
+use App\Exceptions\PaymentFailed;
use App\Factory\PaymentFactory;
use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
+use App\Jobs\Mail\PaymentFailureMailer;
+use App\Jobs\Util\SystemLogger;
use App\Models\Client;
use App\Models\ClientContact;
use App\Models\ClientGatewayToken;
@@ -22,6 +26,7 @@ use App\Models\CompanyGateway;
use App\Models\Invoice;
use App\Models\Payment;
use App\Models\PaymentHash;
+use App\Models\SystemLog;
use App\PaymentDrivers\AbstractPaymentDriver;
use App\Utils\Ninja;
use App\Utils\Traits\MakesHash;
@@ -57,6 +62,11 @@ class BaseDriver extends AbstractPaymentDriver
/* The initiated gateway driver class*/
public $payment_method;
+ /**
+ * @var \App\Models\PaymentHash
+ */
+ public $payment_hash;
+
public static $methods = [];
public function __construct(CompanyGateway $company_gateway, Client $client = null, $invitation = false)
@@ -111,6 +121,13 @@ class BaseDriver extends AbstractPaymentDriver
{
}
+ public function setPaymentHash(PaymentHash $payment_hash)
+ {
+ $this->payment_hash = $payment_hash;
+
+ return $this;
+ }
+
/**
* Helper method to attach invoices to a payment.
*
@@ -147,6 +164,24 @@ class BaseDriver extends AbstractPaymentDriver
$payment->currency_id = $this->client->getSetting('currency_id');
$payment->date = Carbon::now();
+ $client_contact = $this->getContact();
+ $client_contact_id = $client_contact ? $client_contact->id : null;
+
+ $payment->amount = $data['amount'];
+ $payment->type_id = $data['payment_type'];
+ $payment->transaction_reference = $data['payment_method'];
+ $payment->client_contact_id = $client_contact_id;
+ $payment->save();
+
+ $this->payment_hash->payment_id = $payment->id;
+ $this->payment_hash->save();
+
+ $this->attachInvoices($payment, $this->payment_hash);
+
+ $payment->service()->updateInvoicePayment($this->payment_hash);
+
+ event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
+
return $payment->service()->applyNumber()->save();
}
@@ -228,4 +263,64 @@ class BaseDriver extends AbstractPaymentDriver
}
}
+
+ /**
+ * Store payment method as company gateway token.
+ *
+ * @param array $data
+ * @return null|\App\Models\ClientGatewayToken
+ */
+ public function storeGatewayToken(array $data, array $additional = []): ?ClientGatewayToken
+ {
+ $company_gateway_token = new ClientGatewayToken();
+ $company_gateway_token->company_id = $this->client->company->id;
+ $company_gateway_token->client_id = $this->client->id;
+ $company_gateway_token->token = $data['token'];
+ $company_gateway_token->company_gateway_id = $this->company_gateway->id;
+ $company_gateway_token->gateway_type_id = $data['payment_method_id'];
+ $company_gateway_token->meta = $data['payment_meta'];
+
+ foreach ($additional as $key => $value) {
+ $company_gateway_token->{$key} = $value;
+ }
+
+ $company_gateway_token->save();
+
+ if ($this->client->gateway_tokens->count() == 1) {
+ $this->client->gateway_tokens()->update(['is_default' => 0]);
+
+ $company_gateway_token->is_default = 1;
+ $company_gateway_token->save();
+ }
+
+ return $company_gateway_token;
+ }
+
+ public function processInternallyFailedPayment($gateway, $e)
+ {
+ if ($e instanceof \Exception) {
+ $error = $e->getMessage();
+ }
+
+ if ($e instanceof \Checkout\Library\Exceptions\CheckoutHttpException) {
+ $error = $e->getBody();
+ }
+
+ PaymentFailureMailer::dispatch(
+ $gateway->client,
+ $error,
+ $gateway->client->company,
+ $this->payment_hash->data->value
+ );
+
+ SystemLogger::dispatch(
+ $gateway->payment_hash,
+ SystemLog::CATEGORY_GATEWAY_RESPONSE,
+ SystemLog::EVENT_GATEWAY_ERROR,
+ $gateway::SYSTEM_LOG_TYPE,
+ $gateway->client,
+ );
+
+ throw new PaymentFailed($error, $e->getCode());
+ }
}
diff --git a/app/PaymentDrivers/CheckoutCom/CreditCard.php b/app/PaymentDrivers/CheckoutCom/CreditCard.php
new file mode 100644
index 000000000000..55f7f2af9e73
--- /dev/null
+++ b/app/PaymentDrivers/CheckoutCom/CreditCard.php
@@ -0,0 +1,152 @@
+checkout = $checkout;
+ }
+
+ /**
+ * An authorization view for credit card.
+ *
+ * @param mixed $data
+ * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ */
+ public function authorizeView($data)
+ {
+ return render('gateways.checkout.credit_card.authorize');
+ }
+
+ /**
+ * Checkout.com supports doesn't support direct authorization of the credit card.
+ * Token can be saved after the first (successful) purchase.
+ *
+ * @param mixed $data
+ * @return void
+ */
+ public function authorizeResponse($data)
+ {
+ return;
+ }
+
+ public function paymentView($data)
+ {
+ $data['gateway'] = $this->checkout;
+ $data['company_gateway'] = $this->checkout->company_gateway;
+ $data['client'] = $this->checkout->client;
+ $data['currency'] = $this->checkout->client->getCurrencyCode();
+ $data['value'] = $this->checkout->convertToCheckoutAmount($data['amount_with_fee'], $this->checkout->client->getCurrencyCode());
+ $data['raw_value'] = $data['amount_with_fee'];
+ $data['customer_email'] = $this->checkout->client->present()->email;
+
+ return render('gateways.checkout.credit_card.pay', $data);
+ }
+
+ public function paymentResponse(PaymentResponseRequest $request)
+ {
+ $this->checkout->init();
+
+ $state = [
+ 'server_response' => json_decode($request->gateway_response),
+ 'value' => $request->value,
+ 'raw_value' => $request->raw_value,
+ 'currency' => $request->currency,
+ 'payment_hash' => $request->payment_hash,
+ 'reference' => $request->payment_hash,
+ ];
+
+ $state = array_merge($state, $request->all());
+ $state['store_card'] = boolval($state['store_card']);
+
+ $this->checkout->payment_hash->data = array_merge((array) $this->checkout->payment_hash->data, $state);
+ $this->checkout->payment_hash->save();
+
+ if ($request->has('token') && !is_null($request->token)) {
+ return $this->attemptPaymentUsingToken($request);
+ }
+
+ return $this->attemptPaymentUsingCreditCard($request);
+ }
+
+ private function attemptPaymentUsingToken(PaymentResponseRequest $request)
+ {
+ $method = new IdSource($this->checkout->payment_hash->data->token);
+
+ return $this->completePayment($method, $request);
+ }
+
+ private function attemptPaymentUsingCreditCard(PaymentResponseRequest $request)
+ {
+ $checkout_response = $this->checkout->payment_hash->data->server_response;
+
+ $method = new TokenSource(
+ $checkout_response->cardToken
+ );
+
+ return $this->completePayment($method, $request);
+ }
+
+ private function completePayment($method, PaymentResponseRequest $request)
+ {
+ $payment = new Payment($method, $this->checkout->payment_hash->data->currency);
+ $payment->amount = $this->checkout->payment_hash->data->value;
+ $payment->reference = $this->checkout->payment_hash->data->reference;
+
+ if ($this->checkout->client->currency()->code === 'EUR') {
+ $payment->{'3ds'} = ['enabled' => true];
+ }
+
+ try {
+ $response = $this->checkout->gateway->payments()->request($payment);
+
+ if ($response->status == 'Authorized') {
+ $this->checkout->confirmGatewayFee($request);
+
+ return $this->processSuccessfulPayment($response);
+ }
+
+ if ($response->status == 'Pending') {
+ $this->checkout->confirmGatewayFee($request);
+
+ return $this->processPendingPayment($response);
+ }
+
+ if ($response->status == 'Declined') {
+ $this->checkout->unWindGatewayFees($this->checkout->payment_hash);
+
+ return $this->processUnsuccessfulPayment($response);
+ }
+ } catch (\Checkout\Library\Exceptions\CheckoutHttpException $e) {
+ $this->checkout->unWindGatewayFees($this->checkout->payment_hash);
+
+ return $this->checkout->processInternallyFailedPayment($this->checkout, $e);
+ }
+ }
+}
diff --git a/app/PaymentDrivers/CheckoutCom/Utilities.php b/app/PaymentDrivers/CheckoutCom/Utilities.php
index 20804a258de0..291eeb4b80f4 100644
--- a/app/PaymentDrivers/CheckoutCom/Utilities.php
+++ b/app/PaymentDrivers/CheckoutCom/Utilities.php
@@ -12,6 +12,13 @@
namespace App\PaymentDrivers\CheckoutCom;
+use App\Exceptions\PaymentFailed;
+use App\Jobs\Mail\PaymentFailureMailer;
+use App\Jobs\Util\SystemLogger;
+use App\Models\GatewayType;
+use App\Models\PaymentType;
+use App\Models\SystemLog;
+
trait Utilities
{
public function getPublishableKey()
@@ -39,4 +46,101 @@ trait Utilities
// https://docs.checkout.com/resources/calculating-the-value#Calculatingthevalue-Option3:Thevaluedividedby100valuediv100
return round($amount * 100);
}
+
+ private function processSuccessfulPayment(\Checkout\Models\Payments\Payment $_payment)
+ {
+ if ($this->checkout->payment_hash->data->store_card) {
+ $this->storePaymentMethod($_payment);
+ }
+
+ $data = [
+ 'payment_method' => $_payment->source['id'],
+ 'payment_type' => PaymentType::parseCardType(strtolower($_payment->source['scheme'])),
+ 'amount' => $this->checkout->payment_hash->data->raw_value,
+ ];
+
+ $payment = $this->checkout->createPayment($data, \App\Models\Payment::STATUS_COMPLETED);
+
+ SystemLogger::dispatch(
+ ['response' => $_payment, 'data' => $data],
+ SystemLog::CATEGORY_GATEWAY_RESPONSE,
+ SystemLog::EVENT_GATEWAY_SUCCESS,
+ SystemLog::TYPE_CHECKOUT,
+ $this->checkout->client
+ );
+
+ return redirect()->route('client.payments.show', ['payment' => $this->checkout->encodePrimaryKey($payment->id)]);
+ }
+
+ public function processUnsuccessfulPayment(\Checkout\Models\Payments\Payment $_payment)
+ {
+ PaymentFailureMailer::dispatch(
+ $this->checkout->client,
+ $_payment,
+ $this->checkout->client->company,
+ $this->checkout->payment_hash->data->value
+ );
+
+ $message = [
+ 'server_response' => $_payment,
+ 'data' => $this->checkout->payment_hash->data,
+ ];
+
+ SystemLogger::dispatch(
+ $message,
+ SystemLog::CATEGORY_GATEWAY_RESPONSE,
+ SystemLog::EVENT_GATEWAY_FAILURE,
+ SystemLog::TYPE_CHECKOUT,
+ $this->checkout->client
+ );
+
+ throw new PaymentFailed($_payment->status, $_payment->http_code);
+ }
+
+ private function processPendingPayment(\Checkout\Models\Payments\Payment $_payment)
+ {
+ $data = [
+ 'payment_method' => $_payment->source['id'],
+ 'payment_type' => PaymentType::parseCardType(strtolower($_payment->source['scheme'])),
+ 'amount' => $this->checkout->payment_hash->data->value,
+ ];
+
+ $payment = $this->checkout->createPayment($data, \App\Models\Payment::STATUS_PENDING);
+
+ SystemLogger::dispatch(
+ ['response' => $_payment, 'data' => $data],
+ SystemLog::CATEGORY_GATEWAY_RESPONSE,
+ SystemLog::EVENT_GATEWAY_SUCCESS,
+ SystemLog::TYPE_CHECKOUT,
+ $this->checkout->client
+ );
+
+ try {
+ return redirect($_payment->_links['redirect']['href']);
+ } catch (\Exception $e) {
+ return $this->processInternallyFailedPayment($this->checkout, $e);
+ }
+ }
+
+ private function storePaymentMethod(\Checkout\Models\Payments\Payment $response)
+ {
+ try {
+ $payment_meta = new \stdClass;
+ $payment_meta->exp_month = (string) $response->source['expiry_month'];
+ $payment_meta->exp_year = (string) $response->source['expiry_year'];
+ $payment_meta->brand = (string) $response->source['scheme'];
+ $payment_meta->last4 = (string) $response->source['last4'];
+ $payment_meta->type = (int) GatewayType::CREDIT_CARD;
+
+ $data = [
+ 'payment_meta' => $payment_meta,
+ 'token' => $response->source['id'],
+ 'payment_method_id' => $this->checkout->payment_hash->data->payment_method_id,
+ ];
+
+ return $this->checkout->storePaymentMethod($data);
+ } catch (\Exception $e) {
+ session()->flash('message', ctrans('texts.payment_method_saving_failed'));
+ }
+ }
}
diff --git a/app/PaymentDrivers/CheckoutComPaymentDriver.php b/app/PaymentDrivers/CheckoutComPaymentDriver.php
index 2adce1459239..f479ab1db6a8 100644
--- a/app/PaymentDrivers/CheckoutComPaymentDriver.php
+++ b/app/PaymentDrivers/CheckoutComPaymentDriver.php
@@ -12,24 +12,16 @@
namespace App\PaymentDrivers;
-use App\Events\Payment\PaymentWasCreated;
-use App\Jobs\Mail\PaymentFailureMailer;
-use App\Jobs\Util\SystemLogger;
use App\Models\ClientGatewayToken;
use App\Models\GatewayType;
use App\Models\Payment;
use App\Models\PaymentHash;
-use App\Models\PaymentType;
use App\Models\SystemLog;
use App\PaymentDrivers\BaseDriver;
use App\PaymentDrivers\CheckoutCom\Utilities;
-use App\Utils\Ninja;
use App\Utils\Traits\SystemLogTrait;
use Checkout\CheckoutApi;
use Checkout\Library\Exceptions\CheckoutHttpException;
-use Checkout\Models\Payments\IdSource;
-use Checkout\Models\Payments\Payment as CheckoutPayment;
-use Checkout\Models\Payments\TokenSource;
class CheckoutComPaymentDriver extends BaseDriver
{
@@ -50,15 +42,19 @@ class CheckoutComPaymentDriver extends BaseDriver
/* Authorise payment methods */
public $can_authorise_credit_card = true;
- /** Instance of \Checkout\CheckoutApi */
+ /**
+ * @var \Checkout\CheckoutApi;
+ */
public $gateway;
public $payment_method; //the gateway type id
public static $methods = [
- GatewayType::CREDIT_CARD => '',
+ GatewayType::CREDIT_CARD => \App\PaymentDrivers\CheckoutCom\CreditCard::class,
];
+ const SYSTEM_LOG_TYPE = SystemLog::TYPE_CHECKOUT;
+
/**
* Returns the default gateway type.
*/
@@ -75,6 +71,13 @@ class CheckoutComPaymentDriver extends BaseDriver
*/
public function setPaymentMethod($payment_method = null)
{
+ // At the moment Checkout.com payment
+ // driver only supports payments using credit card.
+
+ $class = self::$methods[GatewayType::CREDIT_CARD];
+
+ $this->payment_method = new $class($this);
+
return $this;
}
@@ -82,7 +85,7 @@ class CheckoutComPaymentDriver extends BaseDriver
* Initialize the checkout payment driver
* @return $this
*/
- public function init()
+ public function init()
{
$config = [
'secret' => $this->company_gateway->getConfigField('secretApiKey'),
@@ -102,22 +105,20 @@ class CheckoutComPaymentDriver extends BaseDriver
*/
public function viewForType($gateway_type_id)
{
- //currently only ever token or creditcard so no need for switches
- $this->payment_method = $gateway_type_id;
+ // At the moment Checkout.com payment
+ // driver only supports payments using credit card.
- return 'gateways.checkout.credit_card';
-
+ return 'gateways.checkout.credit_card.pay';
}
- /**
- * Authorization view
- *
- * @param array $data Payment data array
- * @return view Authorization View
- */
public function authorizeView($data)
{
- return render('gateways.checkout.authorize');
+ return $this->payment_method->authorizeView($data);
+ }
+
+ public function authorizeResponse($data)
+ {
+ return $this->payment_method->authorizeResponse($data);
}
/**
@@ -128,15 +129,7 @@ class CheckoutComPaymentDriver extends BaseDriver
*/
public function processPaymentView(array $data)
{
- $data['gateway'] = $this;
- $data['company_gateway'] = $this->company_gateway;
- $data['client'] = $this->client;
- $data['currency'] = $this->client->getCurrencyCode();
- $data['value'] = $this->convertToCheckoutAmount($data['amount_with_fee'], $this->client->getCurrencyCode());
- $data['raw_value'] = $data['amount_with_fee'];
- $data['customer_email'] = $this->client->present()->email;
-
- return render($this->viewForType($data['payment_method_id']), $data);
+ return $this->payment_method->paymentView($data);
}
/**
@@ -147,262 +140,12 @@ class CheckoutComPaymentDriver extends BaseDriver
*/
public function processPaymentResponse($request)
{
- $this->init();
-
- $state = [
- 'server_response' => json_decode($request->gateway_response),
- 'value' => $request->value,
- 'raw_value' => $request->raw_value,
- 'currency' => $request->currency,
- 'payment_hash' =>$request->payment_hash,
- 'reference' => $request->payment_hash,
- ];
-
- $payment_hash = PaymentHash::whereRaw('BINARY `hash`= ?', [$request->payment_hash])->first();
-
- $state = array_merge($state, $request->all());
- $state['store_card'] = boolval($state['store_card']);
-
- if ($request->has('token') && !is_null($request->token)) {
- $method = new IdSource($state['token']);
- $payment = new CheckoutPayment($method, $state['currency']);
- $payment->amount = $state['value'];
- $payment->reference = $state['reference'];
- } else {
- $method = new TokenSource($state['server_response']->cardToken);
- $payment = new CheckoutPayment($method, $state['currency']);
- $payment->amount = $state['value'];
- $payment->reference = $state['reference'];
-
- if ($this->client->currency()->code === 'EUR') {
- $payment->{'3ds'} = ['enabled' => true];
- }
- }
-
- try {
- $response = $this->gateway->payments()->request($payment);
- $state['payment_response'] = $response;
-
- if ($response->status === 'Authorized') {
-
- $this->confirmGatewayFee($request);
-
- return $this->processSuccessfulPayment($state);
- }
-
- if ($response->status === 'Pending') {
-
- $this->confirmGatewayFee($request);
-
- return $this->processPendingPayment($state);
- }
-
- if ($response->status === 'Declined') {
- $this->unWindGatewayFees($payment_hash);
-
- return $this->processUnsuccessfulPayment($state);
- }
- } catch (CheckoutHttpException $e) {
-
- $this->unWindGatewayFees($payment_hash);
-
- return $this->processInternallyFailedPayment($e, $state);
- }
+ return $this->payment_method->paymentResponse($request);
}
- /**
- * Process a successful payment response
- *
- * @param array $state The state array
- * @return view The response
- */
- public function processSuccessfulPayment($state)
+ public function storePaymentMethod(array $data)
{
- $state['charge_id'] = $state['payment_response']->id;
-
- if (isset($state['store_card']) && $state['store_card']) {
- $this->saveCard($state);
- }
-
- $data = [
- 'payment_method' => $state['charge_id'],
- 'payment_type' => PaymentType::parseCardType($state['payment_response']->source['scheme']),
- 'amount' => $state['raw_value'],
- ];
-
- $payment = $this->createPayment($data, Payment::STATUS_COMPLETED);
- $payment_hash = PaymentHash::whereRaw('BINARY `hash`= ?', [$state['payment_hash']])->firstOrFail();
- $payment_hash->payment_id = $payment->id;
- $payment_hash->save();
-
- $this->attachInvoices($payment, $payment_hash);
- $payment->service()->updateInvoicePayment($payment_hash);
-
- event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
-
- $logger_message = [
- 'server_response' => $state['payment_response'],
- 'data' => $data,
- ];
-
- SystemLogger::dispatch($logger_message, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_SUCCESS, SystemLog::TYPE_CHECKOUT, $this->client);
-
- return redirect()->route('client.payments.show', ['payment' => $this->encodePrimaryKey($payment->id)]);
- }
-
- public function processPendingPayment($state)
- {
- $state['charge_id'] = $state['payment_response']->id;
-
- if (isset($state['store_card']) && $state['store_card']) {
- $this->saveCard($state);
- }
-
- $data = [
- 'payment_method' => $state['charge_id'],
- 'payment_type' => PaymentType::parseCardType($state['payment_response']->source['scheme']),
- 'amount' => $state['raw_value'],
- ];
-
- $payment = $this->createPayment($data, Payment::STATUS_PENDING);
-
- $this->attachInvoices($payment, $state['payment_hash']);
-
- $payment->service()->updateInvoicePayment($state['payment_hash']);
-
- event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
-
- $logger_message = [
- 'server_response' => $state['payment_response'],
- 'data' => $data,
- ];
-
- SystemLogger::dispatch($logger_message, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_SUCCESS, SystemLog::TYPE_CHECKOUT, $this->client);
-
- try {
- return redirect($state['payment_response']->_links['redirect']['href']);
- } catch (\Exception $e) {
-
- SystemLogger::dispatch($logger_message, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_CHECKOUT, $this->client);
-
- $this->unWindGatewayFees($state['payment_hash']);
-
- return render('gateways.unsuccessful', [
- 'code' => $state['payment_response']->response_code,
- 'message' => ctrans('texts.payment_error'),
- ]);
-
- }
- }
-
- public function processUnsuccessfulPayment($state)
- {
- PaymentFailureMailer::dispatch($this->client, $state['payment_response']->response_summary, $this->client->company, $state['payment_response']->amount);
-
- $message = [
- 'server_response' => $state['server_response'],
- 'data' => $state,
- ];
-
- SystemLogger::dispatch($message, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_CHECKOUT, $this->client);
-
- // throw new \Exception('Failed to process the payment: ' . $state['payment_response']->response_summary, 1);
-
- return render('gateways.unsuccessful', [
- 'code' => $state['payment_response']->response_code,
- 'message' => ctrans('texts.payment_error'),
- ]);
- }
-
- public function processInternallyFailedPayment($e, $state)
- {
- $error_message = json_decode($e->getBody());
-
- PaymentFailureMailer::dispatch($this->client, optional($error_message)->message, $this->client->company, $state['value']);
-
- $message = [
- 'server_response' => $state['server_response'],
- 'data' => $e->getBody(),
- ];
-
- SystemLogger::dispatch($message, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_CHECKOUT, $this->client);
-
- //todo push to a error page with the exception message.
-
- //throw new \Exception('Failed to process the payment.', 1);
-
- return render('gateways.unsuccessful', [
- 'code' => '500',
- 'message' => ctrans('texts.payment_error'),
- ]);
- }
-
- public function createPayment($data, $status = Payment::STATUS_COMPLETED): Payment
- {
- $payment = parent::createPayment($data, $status);
-
- $client_contact = $this->getContact();
- $client_contact_id = $client_contact ? $client_contact->id : null;
-
- $payment->amount = $data['amount'];
- $payment->type_id = $data['payment_type'];
- $payment->transaction_reference = $data['payment_method'];
- $payment->client_contact_id = $client_contact_id;
- $payment->save();
-
- return $payment;
- }
-
- public function saveCard($state)
- {
- // TODO: @wip Fix card tokenization.
- return;
-
- //some cards just can't be tokenized....
- if(!$state['payment_response']->source['id'])
- return;
-
- // [id] => src_hck5nsv3fljehbam2cvdm7fioa
- // [type] => card
- // [expiry_month] => 10
- // [expiry_year] => 2022
- // [scheme] => Visa
- // [last4] => 4242
- // [fingerprint] => 688192847DB9AE8A26C53776D036D5B8AD2CEAF1D5A8F5475F542B021041EFA1
- // [bin] => 424242
- // [card_type] => Credit
- // [card_category] => Consumer
- // [issuer] => JPMORGAN CHASE BANK NA
- // [issuer_country] => US
- // [product_id] => A
- // [product_type] => Visa Traditional
- // [avs_check] => S
- // [cvv_check] => Y
- // [payouts] => 1
- // [fast_funds] => d
-
- $payment_meta = new \stdClass;
- $payment_meta->exp_month = (string)$state['payment_response']->source['expiry_month'];
- $payment_meta->exp_year = (string)$state['payment_response']->source['expiry_year'];
- $payment_meta->brand = (string)$state['payment_response']->source['scheme'];
- $payment_meta->last4 = (string)$state['payment_response']->source['last4'];
- $payment_meta->type = $this->payment_method;
-
- $company_gateway_token = new ClientGatewayToken();
- $company_gateway_token->company_id = $this->client->company->id;
- $company_gateway_token->client_id = $this->client->id;
- $company_gateway_token->token = $state['payment_response']->source['id'];
- $company_gateway_token->company_gateway_id = $this->company_gateway->id;
- $company_gateway_token->gateway_type_id = $state['payment_method_id'];
- $company_gateway_token->meta = $payment_meta;
- $company_gateway_token->save();
-
- if ($this->client->gateway_tokens->count() == 1) {
- $this->client->gateway_tokens()->update(['is_default' => 0]);
-
- $company_gateway_token->is_default = 1;
- $company_gateway_token->save();
- }
+ return $this->storeGatewayToken($data);
}
public function refund(Payment $payment, $amount, $return_client_response = false)
diff --git a/app/PaymentDrivers/Stripe/CreditCard.php b/app/PaymentDrivers/Stripe/CreditCard.php
index d89a3c0e81d6..d07fd3f49131 100644
--- a/app/PaymentDrivers/Stripe/CreditCard.php
+++ b/app/PaymentDrivers/Stripe/CreditCard.php
@@ -44,45 +44,17 @@ class CreditCard
public function authorizeResponse($request)
{
- $server_response = json_decode($request->input('gateway_response'));
-
- $gateway_id = $request->input('gateway_id');
- $gateway_type_id = $request->input('payment_method_id');
- $is_default = $request->input('is_default');
-
- $payment_method = $server_response->payment_method;
-
- $customer = $this->stripe->findOrCreateCustomer();
-
$this->stripe->init();
- $stripe_payment_method = \Stripe\PaymentMethod::retrieve($payment_method);
- $stripe_payment_method_obj = $stripe_payment_method->jsonSerialize();
- $stripe_payment_method->attach(['customer' => $customer->id]);
+ $stripe_response = json_decode($request->input('gateway_response'));
- $payment_meta = new \stdClass;
- $payment_meta->exp_month = (string)$stripe_payment_method_obj['card']['exp_month'];
- $payment_meta->exp_year = (string)$stripe_payment_method_obj['card']['exp_year'];
- $payment_meta->brand = (string)$stripe_payment_method_obj['card']['brand'];
- $payment_meta->last4 = (string)$stripe_payment_method_obj['card']['last4'];
- $payment_meta->type = GatewayType::CREDIT_CARD;
+ $customer = $this->stripe->findOrCreateCustomer();
+
+ $this->stripe->attach($stripe_response->payment_method, $customer);
- $client_gateway_token = new ClientGatewayToken();
- $client_gateway_token->company_id = $this->stripe->client->company->id;
- $client_gateway_token->client_id = $this->stripe->client->id;
- $client_gateway_token->token = $payment_method;
- $client_gateway_token->company_gateway_id = $this->stripe->company_gateway->id;
- $client_gateway_token->gateway_type_id = $gateway_type_id;
- $client_gateway_token->gateway_customer_reference = $customer->id;
- $client_gateway_token->meta = $payment_meta;
- $client_gateway_token->save();
+ $stripe_method = $this->stripe->getStripePaymentMethod($stripe_response->payment_method);
- if ($is_default == 'true' || $this->stripe->client->gateway_tokens->count() == 1) {
- $this->stripe->client->gateway_tokens()->update(['is_default' => 0]);
-
- $client_gateway_token->is_default = 1;
- $client_gateway_token->save();
- }
+ $this->storePaymentMethod($stripe_method, $request->payment_method_id, $customer);
return redirect()->route('client.payment_methods.index');
}
@@ -233,6 +205,28 @@ class CreditCard
throw new \Exception('Failed to process the payment.', 1);
}
+ private function storePaymentMethod(\Stripe\PaymentMethod $method, $payment_method_id, $customer)
+ {
+ try {
+ $payment_meta = new \stdClass;
+ $payment_meta->exp_month = (string) $method->card->exp_month;
+ $payment_meta->exp_year = (string) $method->card->exp_year;
+ $payment_meta->brand = (string) $method->card->brand;
+ $payment_meta->last4 = (string) $method->card->last4;
+ $payment_meta->type = GatewayType::CREDIT_CARD;
+
+ $data = [
+ 'payment_meta' => $payment_meta,
+ 'token' => $method->id,
+ 'payment_method_id' => $payment_method_id,
+ ];
+
+ $this->stripe->storeGatewayToken($data, ['gateway_customer_reference' => $customer->id]);
+ } catch (\Exception $e) {
+ return $this->stripe->processInternallyFailedPayment($this->stripe, $e);
+ }
+ }
+
private function saveCard($state)
{
$state['payment_method']->attach(['customer' => $state['customer']]);
diff --git a/app/PaymentDrivers/StripePaymentDriver.php b/app/PaymentDrivers/StripePaymentDriver.php
index 272170a8a657..2a17e76bb891 100644
--- a/app/PaymentDrivers/StripePaymentDriver.php
+++ b/app/PaymentDrivers/StripePaymentDriver.php
@@ -56,29 +56,15 @@ class StripePaymentDriver extends BaseDriver
public $payment_method;
-
public static $methods = [
GatewayType::CREDIT_CARD => CreditCard::class,
GatewayType::BANK_TRANSFER => ACH::class,
GatewayType::ALIPAY => Alipay::class,
GatewayType::SOFORT => SOFORT::class,
- GatewayType::APPLE_PAY => 1,
- GatewayType::SEPA => 1,
+ GatewayType::APPLE_PAY => 1, // TODO
+ GatewayType::SEPA => 1, // TODO
];
- /**
- * Methods in this class are divided into
- * two separate streams.
- *
- * 1. Omnipay Specific
- * 2. Stripe Specific
- *
- * Our Stripe integration is deeper than
- * other gateways and therefore
- * relies on direct calls to the API
- */
- /************************************** Stripe API methods **********************************************************/
-
/**
* Initializes the Stripe API.
* @return void
@@ -404,6 +390,25 @@ class StripePaymentDriver extends BaseDriver
return $payment->service()->applyNumber()->save();
}
+ /**
+ * Attach Stripe payment method to Stripe client.
+ *
+ * @param string $payment_method
+ * @param mixed $customer
+ *
+ * @return void
+ */
+ public function attach(string $payment_method, $customer): void
+ {
+ try {
+ $stripe_payment_method = $this->getStripePaymentMethod($payment_method);
+ $stripe_payment_method->attach(['customer' => $customer->id]);
+ }
+ catch(\Stripe\Exception\ApiErrorException | \Exception $e) {
+ $this->processInternallyFailedPayment($this, $e);
+ }
+ }
+
/**
* Detach payment method from the Stripe.
* https://stripe.com/docs/api/payment_methods/detach
@@ -425,11 +430,25 @@ class StripePaymentDriver extends BaseDriver
], SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_STRIPE, $this->client);
}
}
-
public function getCompanyGatewayId(): int
{
return $this->company_gateway->id;
}
+ /**
+ * Retrieve payment method from Stripe.
+ *
+ * @param string $source
+ *
+ * @return \Stripe\PaymentMethod|void
+ */
+ public function getStripePaymentMethod(string $source)
+ {
+ try {
+ return \Stripe\PaymentMethod::retrieve($source);
+ } catch (\Stripe\Exception\ApiErrorException | \Exception $e) {
+ return $this->processInternallyFailedPayment($this, $e);
+ }
+ }
}
diff --git a/app/Policies/TaskStatusPolicy.php b/app/Policies/TaskStatusPolicy.php
new file mode 100644
index 000000000000..7678e8f4c50a
--- /dev/null
+++ b/app/Policies/TaskStatusPolicy.php
@@ -0,0 +1,32 @@
+isAdmin() || $user->hasPermission('create_all');
+ }
+}
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index d0c8d2978134..f8517417a310 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -31,6 +31,7 @@ use App\Models\Quote;
use App\Models\RecurringInvoice;
use App\Models\RecurringQuote;
use App\Models\Task;
+use App\Models\TaskStatus;
use App\Models\TaxRate;
use App\Models\User;
use App\Models\Vendor;
@@ -55,6 +56,7 @@ use App\Policies\QuotePolicy;
use App\Policies\RecurringInvoicePolicy;
use App\Policies\RecurringQuotePolicy;
use App\Policies\TaskPolicy;
+use App\Policies\TaskStatusPolicy;
use App\Policies\TaxRatePolicy;
use App\Policies\UserPolicy;
use App\Policies\VendorPolicy;
@@ -92,6 +94,7 @@ class AuthServiceProvider extends ServiceProvider
RecurringQuote::class => RecurringQuotePolicy::class,
Webhook::class => WebhookPolicy::class,
Task::class => TaskPolicy::class,
+ TaskStatus::class => TaskStatusPolicy::class,
TaxRate::class => TaxRatePolicy::class,
User::class => UserPolicy::class,
Vendor::class => VendorPolicy::class,
diff --git a/app/Repositories/ActivityRepository.php b/app/Repositories/ActivityRepository.php
index 6e0173f793e4..ec1de4df14e8 100644
--- a/app/Repositories/ActivityRepository.php
+++ b/app/Repositories/ActivityRepository.php
@@ -17,11 +17,18 @@ use App\Models\Backup;
use App\Models\Client;
use App\Models\CompanyToken;
use App\Models\Credit;
+use App\Models\Design;
use App\Models\Invoice;
use App\Models\Quote;
+use App\Models\RecurringInvoice;
use App\Models\User;
+use App\Utils\HtmlEngine;
+use App\Utils\Traits\MakesHash;
use App\Utils\Traits\MakesInvoiceHtml;
use Illuminate\Support\Facades\Log;
+use App\Services\PdfMaker\Design as PdfDesignModel;
+use App\Services\PdfMaker\Design as PdfMakerDesign;
+use App\Services\PdfMaker\PdfMaker as PdfMakerService;
/**
* Class for activity repository.
@@ -29,7 +36,7 @@ use Illuminate\Support\Facades\Log;
class ActivityRepository extends BaseRepository
{
use MakesInvoiceHtml;
-
+ use MakesHash;
/**
* Save the Activity.
*
@@ -68,7 +75,7 @@ class ActivityRepository extends BaseRepository
if (get_class($entity) == Invoice::class || get_class($entity) == Quote::class || get_class($entity) == Credit::class) {
$contact = $entity->client->primary_contact()->first();
- $backup->html_backup = $this->generateEntityHtml($entity->getEntityDesigner(), $entity, $contact);
+ $backup->html_backup = $this->generateHtml($entity);
$backup->amount = $entity->amount;
}
@@ -90,4 +97,55 @@ class ActivityRepository extends BaseRepository
return false;
}
+
+ private function generateHtml($entity)
+ {
+ $entity_design_id = '';
+
+ if($entity instanceof Invoice || $entity instanceof RecurringInvoice){
+ $entity_design_id = 'invoice_design_id';
+ }
+ elseif($entity instanceof Quote){
+ $entity_design_id = 'quote_design_id';
+ }
+ elseif($entity instanceof Credit){
+ $entity_design_id = 'credit_design_id';
+ }
+
+ $entity_design_id = $entity->design_id ? $entity->design_id : $this->decodePrimaryKey($entity->client->getSetting($entity_design_id));
+
+ $design = Design::find($entity_design_id);
+ $html = new HtmlEngine($entity->invitations->first());
+
+ if ($design->is_custom) {
+ $options = [
+ 'custom_partials' => json_decode(json_encode($design->design), true)
+ ];
+ $template = new PdfMakerDesign(PdfDesignModel::CUSTOM, $options);
+ } else {
+ $template = new PdfMakerDesign(strtolower($design->name));
+ }
+
+ $state = [
+ 'template' => $template->elements([
+ 'client' => $entity->client,
+ 'entity' => $entity,
+ 'pdf_variables' => (array) $entity->company->settings->pdf_variables,
+ 'products' => $design->design->product,
+ ]),
+ 'variables' => $html->generateLabelsAndValues(),
+ 'options' => [
+ 'all_pages_header' => $entity->client->getSetting('all_pages_header'),
+ 'all_pages_footer' => $entity->client->getSetting('all_pages_footer'),
+ ],
+ ];
+
+ $maker = new PdfMakerService($state);
+
+ return $maker->design($template)
+ ->build()
+ ->getCompiledHTML(true);
+
+ }
+
}
diff --git a/app/Repositories/ClientContactRepository.php b/app/Repositories/ClientContactRepository.php
index 79f0ce397dcd..fe14030a5b19 100644
--- a/app/Repositories/ClientContactRepository.php
+++ b/app/Repositories/ClientContactRepository.php
@@ -22,6 +22,8 @@ use Illuminate\Support\Str;
*/
class ClientContactRepository extends BaseRepository
{
+ public $is_primary;
+
public function save(array $data, Client $client) : void
{
if (isset($data['contacts'])) {
diff --git a/app/Repositories/PaymentRepository.php b/app/Repositories/PaymentRepository.php
index 366610d906ea..376060ebb487 100644
--- a/app/Repositories/PaymentRepository.php
+++ b/app/Repositories/PaymentRepository.php
@@ -70,21 +70,36 @@ class PaymentRepository extends BaseRepository
*/
private function applyPayment(array $data, Payment $payment): ?Payment
{
+ $is_existing_payment = true;
//check currencies here and fill the exchange rate data if necessary
if (! $payment->id) {
$this->processExchangeRates($data, $payment);
+ $is_existing_payment = false;
+ $client = Client::find($data['client_id']);
+
/*We only update the paid to date ONCE per payment*/
if (array_key_exists('invoices', $data) && is_array($data['invoices']) && count($data['invoices']) > 0) {
if ($data['amount'] == '') {
$data['amount'] = array_sum(array_column($data['invoices'], 'amount'));
}
- $client = Client::find($data['client_id']);
-
$client->service()->updatePaidToDate($data['amount'])->save();
+
}
+
+ if (array_key_exists('credits', $data) && is_array($data['credits']) && count($data['credits']) > 0) {
+
+ $_credit_totals = array_sum(array_column($data['credits'], 'amount'));
+
+ if($data['amount'] == $_credit_totals)
+ $data['amount'] = 0;
+ else
+ $client->service()->updatePaidToDate($_credit_totals)->save();
+
+ }
+
}
/*Fill the payment*/
@@ -144,25 +159,13 @@ class PaymentRepository extends BaseRepository
}
}
- event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
+ if(!$is_existing_payment)
+ event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
- /*info("invoice totals = {$invoice_totals}");
- info("credit totals = {$credit_totals}");
- info("applied totals = " . array_sum(array_column($data['invoices'], 'amount')));
- */
- //$invoice_totals -= $credit_totals;
- ////$payment->amount = $invoice_totals; //creates problems when setting amount like this.
- // if($credit_totals == $payment->amount){
- // $payment->applied += $credit_totals;
- // } elseif ($invoice_totals == $payment->amount) {
- // $payment->applied += $payment->amount;
- // } elseif ($invoice_totals < $payment->amount) {
- // $payment->applied += $invoice_totals;
- // }
-
- $payment->applied = $invoice_totals; //wont work because - check tests
+ $payment->applied += ($invoice_totals - $credit_totals); //wont work because - check tests
+ // $payment->applied += $invoice_totals; //wont work because - check tests
$payment->save();
diff --git a/app/Repositories/RecurringInvoiceRepository.php b/app/Repositories/RecurringInvoiceRepository.php
index b88aca5e8317..117c8dc5a1e3 100644
--- a/app/Repositories/RecurringInvoiceRepository.php
+++ b/app/Repositories/RecurringInvoiceRepository.php
@@ -38,7 +38,7 @@ class RecurringInvoiceRepository extends BaseRepository
->createInvitations()
->save();
- $invoice = $invoice_calc->build()->getInvoice();
+ $invoice = $invoice_calc->build()->getRecurringInvoice();
return $invoice;
}
diff --git a/app/Repositories/TaskStatusRepository.php b/app/Repositories/TaskStatusRepository.php
new file mode 100644
index 000000000000..7b71ea14af2a
--- /dev/null
+++ b/app/Repositories/TaskStatusRepository.php
@@ -0,0 +1,19 @@
+applyPaymentToCredit();
-
+ $this->credit->balance -= $this->amount_applied;
+
+ if((int)$this->credit->balance == 0)
+ $this->credit->status_id = Credit::STATUS_APPLIED;
+ else
+ $this->credit->status_id = Credit::STATUS_PARTIAL;
+
+ $this->credit->save();
+
$this->addPaymentToLedger();
return $this->credit;
diff --git a/app/Services/Credit/CreditService.php b/app/Services/Credit/CreditService.php
index 8b8dca70ae9d..4db7a15ae816 100644
--- a/app/Services/Credit/CreditService.php
+++ b/app/Services/Credit/CreditService.php
@@ -15,6 +15,7 @@ use App\Models\Credit;
use App\Services\Credit\ApplyPayment;
use App\Services\Credit\CreateInvitations;
use App\Services\Credit\MarkSent;
+use App\Services\Credit\SendEmail;
class CreditService
{
@@ -55,6 +56,27 @@ class CreditService
return $this;
}
+ public function sendEmail($contact = null)
+ {
+ $send_email = new SendEmail($this->credit, null, $contact);
+
+ return $send_email->run();
+ }
+
+
+ public function setCalculatedStatus()
+ {
+
+ if((int)$this->credit->balance == 0)
+ $this->credit->status_id = Credit::STATUS_APPLIED;
+ elseif((string)$this->credit->amount == (string)$this->credit->balance)
+ $this->credit->status_id = Credit::STATUS_SENT;
+ elseif($this->credit->balance > 0)
+ $this->credit->status_id = Credit::STATUS_PARTIAL;
+
+ return $this;
+ }
+
public function markSent()
{
$this->credit = (new MarkSent($this->credit->client, $this->credit))->run();
@@ -69,6 +91,13 @@ class CreditService
return $this;
}
+ public function adjustBalance($adjustment)
+ {
+ $this->credit->balance += $adjustment;
+
+ return $this;
+ }
+
/**
* Saves the credit.
* @return Credit object
diff --git a/app/Services/Credit/GetCreditPdf.php b/app/Services/Credit/GetCreditPdf.php
index 32657e07afe2..302a8dfca739 100644
--- a/app/Services/Credit/GetCreditPdf.php
+++ b/app/Services/Credit/GetCreditPdf.php
@@ -11,8 +11,7 @@
namespace App\Services\Credit;
-use App\Jobs\Credit\CreateCreditPdf;
-use App\Jobs\Invoice\CreateInvoicePdf;
+use App\Jobs\Entity\CreateEntityPdf;
use App\Models\ClientContact;
use App\Models\Credit;
use App\Services\AbstractService;
@@ -45,7 +44,7 @@ class GetCreditPdf extends AbstractService
$file = Storage::disk($disk)->exists($file_path);
if (! $file) {
- $file_path = CreateCreditPdf::dispatchNow($this->credit, $this->credit->company, $this->contact);
+ $file_path = CreateEntityPdf::dispatchNow($this->credit, $this->credit->company, $this->contact);
}
return Storage::disk($disk)->path($file_path);
diff --git a/app/Services/Credit/SendEmail.php b/app/Services/Credit/SendEmail.php
new file mode 100644
index 000000000000..31e12ac6b371
--- /dev/null
+++ b/app/Services/Credit/SendEmail.php
@@ -0,0 +1,60 @@
+credit = $credit;
+
+ $this->reminder_template = $reminder_template;
+
+ $this->contact = $contact;
+ }
+
+ /**
+ * Builds the correct template to send.
+ * @param string $this->reminder_template The template name ie reminder1
+ * @return array
+ */
+ public function run()
+ {
+ if (! $this->reminder_template) {
+ $this->reminder_template = $this->credit->calculateTemplate('credit');
+ }
+
+ $this->credit->invitations->each(function ($invitation) {
+ if ($invitation->contact->send_email && $invitation->contact->email) {
+ $email_builder = (new CreditEmail())->build($invitation, $this->reminder_template);
+
+ // EmailCredit::dispatchNow($email_builder, $invitation, $invitation->company);
+ EmailEntity::dispatchNow($invitation, $invitation->company);
+
+ }
+ });
+
+ $this->credit->service()->markSent();
+ }
+}
diff --git a/app/Services/Invoice/AutoBillInvoice.php b/app/Services/Invoice/AutoBillInvoice.php
index 860f49073e7a..784a3cdd453e 100644
--- a/app/Services/Invoice/AutoBillInvoice.php
+++ b/app/Services/Invoice/AutoBillInvoice.php
@@ -19,6 +19,7 @@ use App\Models\Credit;
use App\Models\Invoice;
use App\Models\Payment;
use App\Models\PaymentHash;
+use App\Models\PaymentType;
use App\Services\AbstractService;
use App\Services\Client\ClientService;
use App\Services\Payment\PaymentService;
@@ -56,7 +57,7 @@ class AutoBillInvoice extends AbstractService
//if the credits cover the payments, we stop here, build the payment with credits and exit early
- if($this->invoice->company->use_credits_payment == 'always' || $this->invoice->company->use_credits_payment == 'option')
+ if($this->client->getSetting('use_credits_payment') != 'off')
$this->applyCreditPayment();
info("partial = {$this->invoice->partial}");
@@ -68,7 +69,7 @@ class AutoBillInvoice extends AbstractService
elseif($this->invoice->balance > 0)
$amount = $this->invoice->balance;
else
- return $this->finalizePaymentUsingCredits();
+ return $this->invoice;
info("balance remains to be paid!!");
@@ -116,6 +117,7 @@ class AutoBillInvoice extends AbstractService
$payment->currency_id = $this->invoice->client->getSetting('currency_id');
$payment->date = now();
$payment->status_id = Payment::STATUS_COMPLETED;
+ $payment->type_id = PaymentType::CREDIT;
$payment->service()->applyNumber()->save();
$payment->invoices()->attach($this->invoice->id, ['amount' => $amount]);
@@ -126,7 +128,13 @@ class AutoBillInvoice extends AbstractService
{
$current_credit = Credit::find($credit['credit_id']);
$payment->credits()->attach($current_credit->id, ['amount' => $credit['amount']]);
- $this->applyPaymentToCredit($current_credit, $credit['amount']);
+
+ info("adjusting credit balance {$current_credit->balance} by this amount ". $credit['amount']);
+
+ $current_credit->balance -= $credit['amount'];
+
+ $current_credit->service()->setCalculatedStatus()->save();
+ // $this->applyPaymentToCredit($current_credit, $credit['amount']);
}
$payment->ledger()
@@ -144,9 +152,9 @@ class AutoBillInvoice extends AbstractService
->updateCreditBalance($amount * -1, 'Credits used to pay down Invoice ' . $this->invoice->number)
->save();
- event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
+ event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
- return $this->invoice->service()->setStatus(Invoice::STATUS_PAID)->save();
+ return $this->invoice->service()->setCalculatedStatus()->save();
}
/**
@@ -166,6 +174,8 @@ class AutoBillInvoice extends AbstractService
$available_credit_balance = $available_credits->sum('balance');
+ info("available credit balance = {$available_credit_balance}");
+
if((int)$available_credit_balance == 0)
return;
@@ -214,7 +224,7 @@ class AutoBillInvoice extends AbstractService
}
}
-
+ $this->finalizePaymentUsingCredits();
return $this;
}
diff --git a/app/Services/Invoice/GetInvoicePdf.php b/app/Services/Invoice/GetInvoicePdf.php
index 6dba525fb1f1..3fcb1a8a46d5 100644
--- a/app/Services/Invoice/GetInvoicePdf.php
+++ b/app/Services/Invoice/GetInvoicePdf.php
@@ -11,7 +11,7 @@
namespace App\Services\Invoice;
-use App\Jobs\Invoice\CreateInvoicePdf;
+use App\Jobs\Entity\CreateEntityPdf;
use App\Models\ClientContact;
use App\Models\Invoice;
use App\Services\AbstractService;
@@ -43,7 +43,7 @@ class GetInvoicePdf extends AbstractService
$file = Storage::disk($disk)->exists($file_path);
if (! $file) {
- $file_path = CreateInvoicePdf::dispatchNow($invitation);
+ $file_path = CreateEntityPdf::dispatchNow($invitation);
}
return Storage::disk($disk)->path($file_path);
diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php
index 325b8328ccea..73ec742d1709 100644
--- a/app/Services/Invoice/InvoiceService.php
+++ b/app/Services/Invoice/InvoiceService.php
@@ -11,7 +11,7 @@
namespace App\Services\Invoice;
-use App\Jobs\Invoice\CreateInvoicePdf;
+use App\Jobs\Entity\CreateEntityPdf;
use App\Jobs\Util\UnlinkFile;
use App\Models\CompanyGateway;
use App\Models\Invoice;
@@ -210,9 +210,18 @@ class InvoiceService
return $this;
}
+ public function setCalculatedStatus()
+ {
+ if((int)$this->invoice->balance == 0)
+ $this->setStatus(Invoice::STATUS_PAID);
+ elseif($this->invoice->balance > 0 && $this->invoice->balance < $this->invoice->amount)
+ $this->setStatus(Invoice::STATUS_PARTIAL);
+
+ return $this;
+ }
+
public function updateStatus()
{
- info("invoice balance = {$this->invoice->balance}");
if((int)$this->invoice->balance == 0)
$this->setStatus(Invoice::STATUS_PAID);
@@ -285,7 +294,7 @@ class InvoiceService
public function touchPdf()
{
$this->invoice->invitations->each(function ($invitation){
- CreateInvoicePdf::dispatch($invitation);
+ CreateEntityPdf::dispatch($invitation);
});
return $this;
diff --git a/app/Services/Invoice/SendEmail.php b/app/Services/Invoice/SendEmail.php
index ca523cbb7d61..911aea4411e9 100644
--- a/app/Services/Invoice/SendEmail.php
+++ b/app/Services/Invoice/SendEmail.php
@@ -12,7 +12,7 @@
namespace App\Services\Invoice;
use App\Helpers\Email\InvoiceEmail;
-use App\Jobs\Invoice\EmailInvoice;
+use App\Jobs\Entity\EmailEntity;
use App\Models\ClientContact;
use App\Models\Invoice;
use App\Services\AbstractService;
@@ -43,14 +43,15 @@ class SendEmail extends AbstractService
public function run()
{
if (! $this->reminder_template) {
- $this->reminder_template = $this->invoice->calculateTemplate();
+ $this->reminder_template = $this->invoice->calculateTemplate('invoice');
}
$this->invoice->invitations->each(function ($invitation) {
$email_builder = (new InvoiceEmail())->build($invitation, $this->reminder_template);
if ($invitation->contact->send_email && $invitation->contact->email) {
- EmailInvoice::dispatch($email_builder, $invitation, $invitation->company);
+ EmailEntity::dispatchNow($invitation, $invitation->company);
+
}
});
}
diff --git a/app/Services/Invoice/TriggeredActions.php b/app/Services/Invoice/TriggeredActions.php
index cde6974e022c..ad4ba23074eb 100644
--- a/app/Services/Invoice/TriggeredActions.php
+++ b/app/Services/Invoice/TriggeredActions.php
@@ -15,7 +15,7 @@ use App\Events\Invoice\InvoiceWasEmailed;
use App\Events\Payment\PaymentWasCreated;
use App\Factory\PaymentFactory;
use App\Helpers\Email\InvoiceEmail;
-use App\Jobs\Invoice\EmailInvoice;
+use App\Jobs\Invoice\EmailEntity;
use App\Models\Client;
use App\Models\Invoice;
use App\Models\Payment;
@@ -65,13 +65,12 @@ class TriggeredActions extends AbstractService
private function sendEmail()
{
- //$reminder_template = $this->invoice->calculateTemplate();
+ //$reminder_template = $this->invoice->calculateTemplate('invoice');
$reminder_template = 'payment';
$this->invoice->invitations->load('contact.client.country', 'invoice.client.country', 'invoice.company')->each(function ($invitation) use ($reminder_template) {
- $email_builder = (new InvoiceEmail())->build($invitation, $reminder_template);
- EmailInvoice::dispatch($email_builder, $invitation, $this->invoice->company);
+ EmailEntity::dispatch($invitation, $this->invoice->company);
});
if ($this->invoice->invitations->count() > 0) {
diff --git a/app/Services/Payment/RefundPayment.php b/app/Services/Payment/RefundPayment.php
index 250b4229518b..1826f7297460 100644
--- a/app/Services/Payment/RefundPayment.php
+++ b/app/Services/Payment/RefundPayment.php
@@ -241,6 +241,7 @@ class RefundPayment
$adjustment_amount += $refunded_invoice['amount'];
$client->balance += $refunded_invoice['amount'];
+ //$client->paid_to_date -= $refunded_invoice['amount'];//todo refund balancing
$client->save();
//todo adjust ledger balance here? or after and reference the credit and its total
@@ -251,7 +252,8 @@ class RefundPayment
// $this->credit_note->ledger()->updateCreditBalance($adjustment_amount, $ledger_string);
$client = $this->payment->client->fresh();
- $client->service()->updatePaidToDate(-1 * $this->total_refund)->save();
+ //$client->service()->updatePaidToDate(-1 * $this->total_refund)->save();
+ $client->service()->updatePaidToDate(-1 * $refunded_invoice['amount'])->save();
}
return $this;
diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php
index 267c3555e75f..93c695bfe5ed 100644
--- a/app/Services/PdfMaker/Design.php
+++ b/app/Services/PdfMaker/Design.php
@@ -125,7 +125,7 @@ class Design extends BaseDesign
$elements = [];
foreach ($variables as $variable) {
- $elements[] = ['element' => 'p', 'content' => $variable];
+ $elements[] = ['element' => 'p', 'content' => $variable, 'show_empty' => false];
}
return $elements;
@@ -138,7 +138,7 @@ class Design extends BaseDesign
$elements = [];
foreach ($variables as $variable) {
- $elements[] = ['element' => 'p', 'content' => $variable];
+ $elements[] = ['element' => 'p', 'content' => $variable, 'show_empty' => false];
}
return $elements;
@@ -151,7 +151,7 @@ class Design extends BaseDesign
$elements = [];
foreach ($variables as $variable) {
- $elements[] = ['element' => 'p', 'content' => $variable];
+ $elements[] = ['element' => 'p', 'content' => $variable, 'show_empty' => false];
}
return $elements;
@@ -168,10 +168,20 @@ class Design extends BaseDesign
$elements = [];
foreach ($variables as $variable) {
- $elements[] = ['element' => 'tr', 'properties' => ['hidden' => $this->entityVariableCheck($variable)], 'elements' => [
- ['element' => 'th', 'content' => $variable . '_label'],
- ['element' => 'th', 'content' => $variable],
- ]];
+ $_variable = explode('.', $variable)[1];
+ $_customs = ['custom1', 'custom2', 'custom3', 'custom4'];
+
+ if (in_array($_variable, $_customs)) {
+ $elements[] = ['element' => 'tr', 'elements' => [
+ ['element' => 'th', 'content' => $variable . '_label'],
+ ['element' => 'th', 'content' => $variable],
+ ]];
+ } else {
+ $elements[] = ['element' => 'tr', 'properties' => ['hidden' => $this->entityVariableCheck($variable)], 'elements' => [
+ ['element' => 'th', 'content' => $variable . '_label'],
+ ['element' => 'th', 'content' => $variable],
+ ]];
+ }
}
return $elements;
diff --git a/app/Services/PdfMaker/PdfMaker.php b/app/Services/PdfMaker/PdfMaker.php
index df9c97eb57d0..cd288766f65f 100644
--- a/app/Services/PdfMaker/PdfMaker.php
+++ b/app/Services/PdfMaker/PdfMaker.php
@@ -56,6 +56,10 @@ class PdfMaker
public function build()
{
+ if (isset($this->data['template']) && isset($this->data['variables'])) {
+ $this->getEmptyElements($this->data['template'], $this->data['variables']);
+ }
+
if (isset($this->data['template'])) {
$this->updateElementProperties($this->data['template']);
}
@@ -72,7 +76,7 @@ class PdfMaker
public function getCompiledHTML($final = false)
{
$html = $this->document->saveHTML();
-
+
return str_replace('%24', '$', $html);
}
}
diff --git a/app/Services/PdfMaker/PdfMakerUtilities.php b/app/Services/PdfMaker/PdfMakerUtilities.php
index 8ffe05594295..02664812d1ed 100644
--- a/app/Services/PdfMaker/PdfMakerUtilities.php
+++ b/app/Services/PdfMaker/PdfMakerUtilities.php
@@ -117,8 +117,12 @@ trait PdfMakerUtilities
//
=> true
//
=> false
- if (isset($child['content'])) {
- $contains_html = preg_match("/\/[a-z]*>/i", $child['content'],$m) != 0;
+ if (isset($child['content'])) {
+ if (isset($child['is_empty']) && $child['is_empty'] === true) {
+ continue;
+ }
+
+ $contains_html = preg_match("/\/[a-z]*>/i", $child['content'], $m) != 0;
}
if ($contains_html) {
@@ -293,7 +297,7 @@ trait PdfMakerUtilities
$this->document->getElementById('repeat-content')->appendChild($clone);
}
- info($this->data['options']);
+ // info($this->data['options']);
if (
$header = $this->document->getElementById('header') &&
@@ -319,4 +323,27 @@ trait PdfMakerUtilities
$this->document->getElementById('repeat-footer')->appendChild($clone);
}
}
+
+ public function getEmptyElements(array &$elements, array $variables) {
+ foreach ($elements as &$element) {
+ if (isset($element['elements'])) {
+ $this->getEmptyChildrens($element['elements'], $variables);
+ }
+ }
+ }
+
+ public function getEmptyChildrens(array &$children, array $variables) {
+ foreach ($children as $key => &$child) {
+ if (isset($child['content']) && isset($child['show_empty']) && $child['show_empty'] === false) {
+ $value = strtr($child['content'], $variables['values']);
+ if ($value === '' || $value === ' ') {
+ $child['is_empty'] = true;
+ }
+ }
+
+ if (isset($child['elements'])) {
+ $this->getEmptyChildrens($child['elements'], $variables);
+ }
+ }
+ }
}
diff --git a/app/Services/Quote/GetQuotePdf.php b/app/Services/Quote/GetQuotePdf.php
index 2625679c5b38..879593892af9 100644
--- a/app/Services/Quote/GetQuotePdf.php
+++ b/app/Services/Quote/GetQuotePdf.php
@@ -11,7 +11,7 @@
namespace App\Services\Quote;
-use App\Jobs\Quote\CreateQuotePdf;
+use App\Jobs\Entity\CreateEntityPdf;
use App\Models\ClientContact;
use App\Models\Quote;
use App\Services\AbstractService;
@@ -43,7 +43,7 @@ class GetQuotePdf extends AbstractService
$file = Storage::disk($disk)->exists($file_path);
if (! $file) {
- $file_path = CreateQuotePdf::dispatchNow($invitation);
+ $file_path = CreateEntityPdf::dispatchNow($invitation);
}
return Storage::disk($disk)->path($file_path);
diff --git a/app/Services/Quote/SendEmail.php b/app/Services/Quote/SendEmail.php
index bf7ff3307603..23d900c4b141 100644
--- a/app/Services/Quote/SendEmail.php
+++ b/app/Services/Quote/SendEmail.php
@@ -12,6 +12,7 @@
namespace App\Services\Quote;
use App\Helpers\Email\QuoteEmail;
+use App\Jobs\Entity\EmailEntity;
use App\Jobs\Quote\EmailQuote;
use App\Models\ClientContact;
use App\Models\Quote;
@@ -41,14 +42,16 @@ class SendEmail
public function run()
{
if (! $this->reminder_template) {
- $this->reminder_template = $this->quote->calculateTemplate();
+ $this->reminder_template = $this->quote->calculateTemplate('quote');
}
$this->quote->invitations->each(function ($invitation) {
if ($invitation->contact->send_email && $invitation->contact->email) {
$email_builder = (new QuoteEmail())->build($invitation, $this->reminder_template);
- EmailQuote::dispatchNow($email_builder, $invitation, $invitation->company);
+ // EmailQuote::dispatchNow($email_builder, $invitation, $invitation->company);
+ EmailEntity::dispatchNow($invitation, $invitation->company);
+
}
});
diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php
index 51315c0e7b57..cb3df61e8317 100644
--- a/app/Transformers/CompanyTransformer.php
+++ b/app/Transformers/CompanyTransformer.php
@@ -23,6 +23,7 @@ use App\Models\Credit;
use App\Models\Design;
use App\Models\Document;
use App\Models\Expense;
+use App\Models\ExpenseCategory;
use App\Models\GroupSetting;
use App\Models\Payment;
use App\Models\PaymentTerm;
@@ -32,6 +33,7 @@ use App\Models\Quote;
use App\Models\RecurringInvoice;
use App\Models\SystemLog;
use App\Models\Task;
+use App\Models\TaskStatus;
use App\Models\TaxRate;
use App\Models\User;
use App\Models\Webhook;
@@ -40,9 +42,11 @@ use App\Transformers\CompanyTokenHashedTransformer;
use App\Transformers\CompanyTokenTransformer;
use App\Transformers\CreditTransformer;
use App\Transformers\DocumentTransformer;
+use App\Transformers\ExpenseCategoryTransformer;
use App\Transformers\PaymentTermTransformer;
use App\Transformers\RecurringInvoiceTransformer;
use App\Transformers\SystemLogTransformer;
+use App\Transformers\TaskStatusTransformer;
use App\Transformers\TaskTransformer;
use App\Transformers\WebhookTransformer;
use App\Utils\Traits\MakesHash;
@@ -95,6 +99,8 @@ class CompanyTransformer extends EntityTransformer
'tokens',
'tokens_hashed',
'system_logs',
+ 'expense_categories',
+ 'task_statuses',
];
/**
@@ -144,10 +150,28 @@ class CompanyTransformer extends EntityTransformer
'enable_shop_api' => (bool) $company->enable_shop_api,
'mark_expenses_invoiceable'=> (bool) $company->mark_expenses_invoiceable,
'mark_expenses_paid' => (bool) $company->mark_expenses_paid,
- 'use_credits_payment' => (string) $company->use_credits_payment,
+ 'invoice_expense_documents' => (bool) $company->invoice_expense_documents,
+ 'invoice_task_timelog' => (bool) $company->invoice_task_timelog,
+ 'auto_start_tasks' => (bool) $company->auto_start_tasks,
+ 'invoice_task_documents' => (bool) $company->invoice_task_documents,
+ 'use_credits_payment' => 'always', //todo remove
];
}
+ public function includeExpenseCategories(Company $company)
+ {
+ $transformer = new ExpenseCategoryTransformer($this->serializer);
+
+ return $this->includeCollection($company->expense_categories, $transformer, ExpenseCategory::class);
+ }
+
+ public function includeTaskStatuses(Company $company)
+ {
+ $transformer = new TaskStatusTransformer($this->serializer);
+
+ return $this->includeCollection($company->task_statuses, $transformer, TaskStatus::class);
+ }
+
public function includeDocuments(Company $company)
{
$transformer = new DocumentTransformer($this->serializer);
diff --git a/app/Transformers/CompanyUserTransformer.php b/app/Transformers/CompanyUserTransformer.php
index 7e0afe76b65c..2d60dbca4bd3 100644
--- a/app/Transformers/CompanyUserTransformer.php
+++ b/app/Transformers/CompanyUserTransformer.php
@@ -29,7 +29,7 @@ class CompanyUserTransformer extends EntityTransformer
protected $defaultIncludes = [
// 'account',
// 'company',
- // 'user',
+ 'user',
// 'token'
];
diff --git a/app/Transformers/ExpenseTransformer.php b/app/Transformers/ExpenseTransformer.php
index 6795ebb52832..e3278bd2b8ca 100644
--- a/app/Transformers/ExpenseTransformer.php
+++ b/app/Transformers/ExpenseTransformer.php
@@ -23,6 +23,7 @@ class ExpenseTransformer extends EntityTransformer
{
use MakesHash;
use SoftDeletes;
+
protected $defaultIncludes = [
'documents',
];
@@ -58,7 +59,7 @@ class ExpenseTransformer extends EntityTransformer
'bank_id' => (string) $expense->bank_id ?: '',
'invoice_currency_id' => (string) $expense->invoice_currency_id ?: '',
'expense_currency_id' => (string) $expense->expense_currency_id ?: '',
- 'category_id' => (string) $expense->category_id ?: '',
+ 'category_id' => $this->encodePrimaryKey($expense->category_id),
'payment_type_id' => (string) $expense->payment_type_id ?: '',
'recurring_expense_id' => (string) $expense->recurring_expense_id ?: '',
'is_deleted' => (bool) $expense->is_deleted,
@@ -79,6 +80,7 @@ class ExpenseTransformer extends EntityTransformer
'transaction_id' => (string) $expense->transaction_id ?: '',
//'date' => $expense->date ?: '',
'expense_date' => $expense->date ?: '',
+ 'number' => (string)$expense->number ?: '',
'payment_date' => $expense->payment_date ?: '',
'custom_value1' => $expense->custom_value1 ?: '',
'custom_value2' => $expense->custom_value2 ?: '',
diff --git a/app/Transformers/ProjectTransformer.php b/app/Transformers/ProjectTransformer.php
index 6ba7d0749b97..76ac59224a10 100644
--- a/app/Transformers/ProjectTransformer.php
+++ b/app/Transformers/ProjectTransformer.php
@@ -48,6 +48,7 @@ class ProjectTransformer extends EntityTransformer
'assigned_user_id' => (string) $this->encodePrimaryKey($project->assigned_user_id),
'client_id' => (string) $this->encodePrimaryKey($project->client_id),
'name' => $project->name ?: '',
+ 'number' => $project->number,
'created_at' => (int) $project->created_at,
'updated_at' => (int) $project->updated_at,
'archived_at' => (int) $project->deleted_at,
diff --git a/app/Transformers/TaskStatusTransformer.php b/app/Transformers/TaskStatusTransformer.php
new file mode 100644
index 000000000000..f31255951554
--- /dev/null
+++ b/app/Transformers/TaskStatusTransformer.php
@@ -0,0 +1,33 @@
+ (string) $this->encodePrimaryKey($task_status->id),
+ 'name' => (string) $task_status->name,
+ 'sort_order' => (int) $task_status->sort_order,
+ 'is_deleted' => (bool) $task_status->is_deleted,
+ 'created_at' => (int) $task_status->created_at,
+ 'updated_at' => (int) $task_status->updated_at,
+ 'archived_at' => (int) $task_status->deleted_at,
+ ];
+ }
+}
diff --git a/app/Transformers/TaskTransformer.php b/app/Transformers/TaskTransformer.php
index fd2cc483ae01..427c7a86b222 100644
--- a/app/Transformers/TaskTransformer.php
+++ b/app/Transformers/TaskTransformer.php
@@ -48,14 +48,15 @@ class TaskTransformer extends EntityTransformer
'assigned_user_id' => (string) $this->encodePrimaryKey($task->assigned_user_id),
'number' => (string) $task->number ?: '',
'start_time' => (int) $task->start_time,
- 'description' => $task->description ?: '',
- 'duration' => 0,
+ 'description' => (string) $task->description ?: '',
+ 'duration' => (int) $task->duration ?: 0,
+ 'rate' => (float) $task->rate ?: 0,
'created_at' => (int) $task->created_at,
'updated_at' => (int) $task->updated_at,
'archived_at' => (int) $task->deleted_at,
- 'invoice_id' => $this->encodePrimaryKey($task->invoice_id),
- 'client_id' => $this->encodePrimaryKey($task->client_id),
- 'project_id' => $this->encodePrimaryKey($task->project_id),
+ 'invoice_id' => $this->encodePrimaryKey($task->invoice_id) ?: '',
+ 'client_id' => $this->encodePrimaryKey($task->client_id) ?: '',
+ 'project_id' => $this->encodePrimaryKey($task->project_id) ?: '',
'is_deleted' => (bool) $task->is_deleted,
'time_log' => $task->time_log ?: '',
'is_running' => (bool) $task->is_running,
@@ -63,8 +64,8 @@ class TaskTransformer extends EntityTransformer
'custom_value2' => $task->custom_value2 ?: '',
'custom_value3' => $task->custom_value3 ?: '',
'custom_value4' => $task->custom_value4 ?: '',
- 'task_status_id' => $this->encodePrimaryKey($task->task_status_id),
- 'task_status_sort_order' => (int) $task->task_status_sort_order,
+ 'status_id' => $this->encodePrimaryKey($task->status_id) ?: '',
+ 'status_sort_order' => (int) $task->status_sort_order,
];
}
}
diff --git a/app/Transformers/VendorTransformer.php b/app/Transformers/VendorTransformer.php
index e6a4c7799c03..5f5da73700fa 100644
--- a/app/Transformers/VendorTransformer.php
+++ b/app/Transformers/VendorTransformer.php
@@ -106,6 +106,7 @@ class VendorTransformer extends EntityTransformer
'updated_at' => (int) $vendor->updated_at,
'archived_at' => (int) $vendor->deleted_at,
'created_at' => (int) $vendor->created_at,
+ 'number' => (string)$vendor->number ?: '',
];
}
}
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 42700c8a6b79..aabbe2e2754b 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -12,13 +12,19 @@
namespace App\Utils;
-use App\Designs\Designer;
use App\Models\Country;
+use App\Models\CreditInvitation;
+use App\Models\InvoiceInvitation;
+use App\Models\QuoteInvitation;
+use App\Models\RecurringInvoiceInvitation;
use App\Utils\Number;
+use App\Utils\Traits\MakesDates;
use Illuminate\Support\Facades\App;
class HtmlEngine
{
+ use MakesDates;
+
public $entity;
public $invitation;
@@ -35,15 +41,14 @@ class HtmlEngine
public $entity_string;
- public $designer;
-
- public function __construct($designer, $invitation, $entity_string)
+ public function __construct($invitation)
{
- $this->designer = $designer;
$this->invitation = $invitation;
- $this->entity = $invitation->{$entity_string};
+ $this->entity_string = $this->resolveEntityString();
+
+ $this->entity = $invitation->{$this->entity_string};
$this->company = $invitation->company;
@@ -55,34 +60,32 @@ class HtmlEngine
$this->entity_calc = $this->entity->calc();
- $this->entity_string = $entity_string;
}
- public function build() :string
- {
- App::setLocale($this->client->preferredLocale());
-
- $values_and_labels = $this->generateLabelsAndValues();
-
- $this->designer->build();
-
- $data = [];
- $data['entity'] = $this->entity;
- $data['lang'] = $this->client->preferredLocale();
- $data['includes'] = $this->designer->getIncludes();
- $data['header'] = $this->designer->getHeader();
- $data['body'] = $this->designer->getBody();
- $data['footer'] = $this->designer->getFooter();
-
- $html = view('pdf.stub', $data)->render();
-
- $html = $this->parseLabelsAndValues($values_and_labels['labels'], $values_and_labels['values'], $html);
-
- return $html;
- }
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ private function resolveEntityString()
+ {
+ switch ($this->invitation) {
+ case ($this->invitation instanceof InvoiceInvitation):
+ return 'invoice';
+ break;
+ case ($this->invitation instanceof CreditInvitation):
+ return 'credit';
+ break;
+ case ($this->invitation instanceof QuoteInvitation):
+ return 'quote';
+ break;
+ case ($this->invitation instanceof RecurringInvoiceInvitation):
+ return 'recurring_invoice';
+ break;
+ default:
+ # code...
+ break;
+ }
+ }
+
public function buildEntityDataArray() :array
{
if (! $this->client->currency()) {
@@ -101,11 +104,11 @@ class HtmlEngine
$data['$total_tax_values'] = ['value' => $this->totalTaxValues(), 'label' => ctrans('texts.taxes')];
$data['$line_tax_labels'] = ['value' => $this->lineTaxLabels(), 'label' => ctrans('texts.taxes')];
$data['$line_tax_values'] = ['value' => $this->lineTaxValues(), 'label' => ctrans('texts.taxes')];
- $data['$date'] = ['value' => $this->entity->date ?: ' ', 'label' => ctrans('texts.date')];
+ $data['$date'] = ['value' => $this->formatDate($this->entity->date, $this->client->date_format()) ?: ' ', 'label' => ctrans('texts.date')];
//$data['$invoice_date'] = ['value' => $this->date ?: ' ', 'label' => ctrans('texts.invoice_date')];
$data['$invoice.date'] = &$data['$date'];
- $data['$due_date'] = ['value' => $this->entity->due_date ?: ' ', 'label' => ctrans('texts.'.$this->entity_string.'_due_date')];
- $data['$payment_due'] = ['value' => $this->entity->due_date ?: ' ', 'label' => ctrans('texts.payment_due')];
+ $data['$due_date'] = ['value' => $this->formatDate($this->entity->due_date, $this->client->date_format()) ?: ' ', 'label' => ctrans('texts.'.$this->entity_string.'_due_date')];
+ $data['$payment_due'] = ['value' => $this->formatDate($this->entity->due_date, $this->client->date_format()) ?: ' ', 'label' => ctrans('texts.payment_due')];
$data['$invoice.due_date'] = &$data['$due_date'];
$data['$invoice.number'] = ['value' => $this->entity->number ?: ' ', 'label' => ctrans('texts.invoice_number')];
$data['$invoice.po_number'] = ['value' => $this->entity->po_number ?: ' ', 'label' => ctrans('texts.po_number')];
@@ -130,7 +133,7 @@ class HtmlEngine
$data['$entity.terms'] = ['value' => $this->entity->terms ?: ' ', 'label' => ctrans('texts.quote_terms')];
$data['$terms'] = &$data['$entity.terms'];
$data['$view_link'] = ['value' => ''.ctrans('texts.view_quote').'', 'label' => ctrans('texts.view_quote')];
- // $data['$view_link'] = ['value' => $this->invitation->getLink(), 'label' => ctrans('texts.view_quote')];
+ $data['$view_url'] = ['value' => $this->invitation->getLink(), 'label' => ctrans('texts.view_quote')];
}
if ($this->entity_string == 'credit') {
@@ -139,6 +142,7 @@ class HtmlEngine
$data['$entity.terms'] = ['value' => $this->entity->terms ?: ' ', 'label' => ctrans('texts.credit_terms')];
$data['$terms'] = &$data['$entity.terms'];
$data['$view_link'] = ['value' => ''.ctrans('texts.view_credit').'', 'label' => ctrans('texts.view_credit')];
+ $data['$view_url'] = ['value' => $this->invitation->getLink(), 'label' => ctrans('texts.view_credit')];
// $data['$view_link'] = ['value' => $this->invitation->getLink(), 'label' => ctrans('texts.view_credit')];
}
@@ -164,7 +168,7 @@ class HtmlEngine
$data['$credit.number'] = ['value' => $this->entity->number ?: ' ', 'label' => ctrans('texts.credit_number')];
$data['$credit.total'] = &$data['$credit.total'];
$data['$credit.po_number'] = &$data['$invoice.po_number'];
- $data['$credit.date'] = ['value' => $this->entity->date, 'label' => ctrans('texts.credit_date')];
+ $data['$credit.date'] = ['value' => $this->formatDate($this->entity->date, $this->client->date_format()), 'label' => ctrans('texts.credit_date')];
$data['$balance'] = ['value' => Number::formatMoney($this->entity_calc->getBalance(), $this->client) ?: ' ', 'label' => ctrans('texts.balance')];
$data['$credit.balance'] = &$data['$balance'];
@@ -172,23 +176,23 @@ class HtmlEngine
$data['$taxes'] = ['value' => Number::formatMoney($this->entity_calc->getItemTotalTaxes(), $this->client) ?: ' ', 'label' => ctrans('texts.taxes')];
$data['$invoice.taxes'] = &$data['$taxes'];
- $data['$invoice.custom1'] = ['value' => $this->entity->custom_value1 ?: ' ', 'label' => $this->makeCustomField('invoice1')];
- $data['$invoice.custom2'] = ['value' => $this->entity->custom_value2 ?: ' ', 'label' => $this->makeCustomField('invoice2')];
- $data['$invoice.custom3'] = ['value' => $this->entity->custom_value3 ?: ' ', 'label' => $this->makeCustomField('invoice3')];
- $data['$invoice.custom4'] = ['value' => $this->entity->custom_value4 ?: ' ', 'label' => $this->makeCustomField('invoice4')];
+ $data['$invoice.custom1'] = ['value' => $this->formatCustomFieldValue('invoice1', $this->entity->custom_value1) ?: ' ', 'label' => $this->makeCustomField('invoice1')];
+ $data['$invoice.custom2'] = ['value' => $this->formatCustomFieldValue('invoice2', $this->entity->custom_value2) ?: ' ', 'label' => $this->makeCustomField('invoice2')];
+ $data['$invoice.custom3'] = ['value' => $this->formatCustomFieldValue('invoice3', $this->entity->custom_value3) ?: ' ', 'label' => $this->makeCustomField('invoice3')];
+ $data['$invoice.custom4'] = ['value' => $this->formatCustomFieldValue('invoice4', $this->entity->custom_value4) ?: ' ', 'label' => $this->makeCustomField('invoice4')];
$data['$invoice.public_notes'] = ['value' => $this->entity->public_notes ?: ' ', 'label' => ctrans('texts.public_notes')];
$data['$entity.public_notes'] = &$data['$invoice.public_notes'];
$data['$entity_issued_to'] = ['value' => '', 'label' => ctrans("texts.{$this->entity_string}_issued_to")];
$data['$your_entity'] = ['value' => '', 'label' => ctrans("texts.your_{$this->entity_string}")];
- $data['$quote.date'] = ['value' => $this->entity->date ?: ' ', 'label' => ctrans('texts.quote_date')];
+ $data['$quote.date'] = ['value' => $this->formatDate($this->entity->date, $this->client->date_format()) ?: ' ', 'label' => ctrans('texts.quote_date')];
$data['$quote.number'] = ['value' => $this->entity->number ?: ' ', 'label' => ctrans('texts.quote_number')];
$data['$quote.po_number'] = &$data['$invoice.po_number'];
$data['$quote.quote_number'] = &$data['$quote.number'];
$data['$quote_no'] = &$data['$quote.number'];
$data['$quote.quote_no'] = &$data['$quote.number'];
- $data['$quote.valid_until'] = ['value' => $this->entity->due_date, 'label' => ctrans('texts.valid_until')];
+ $data['$quote.valid_until'] = ['value' => $this->formatDate($this->entity->due_date, $this->client->date_format()), 'label' => ctrans('texts.valid_until')];
$data['$credit_amount'] = ['value' => Number::formatMoney($this->entity_calc->getTotal(), $this->client) ?: ' ', 'label' => ctrans('texts.credit_amount')];
$data['$credit_balance'] = ['value' => Number::formatMoney($this->entity->balance, $this->client) ?: ' ', 'label' => ctrans('texts.credit_balance')];
@@ -207,10 +211,10 @@ class HtmlEngine
// $data['$details'] = ;
$data['$invoice_no'] = &$data['$number'];
$data['$invoice.invoice_no'] = &$data['$number'];
- $data['$client1'] = ['value' => $this->client->custom_value1 ?: ' ', 'label' => $this->makeCustomField('client1')];
- $data['$client2'] = ['value' => $this->client->custom_value2 ?: ' ', 'label' => $this->makeCustomField('client2')];
- $data['$client3'] = ['value' => $this->client->custom_value3 ?: ' ', 'label' => $this->makeCustomField('client3')];
- $data['$client4'] = ['value' => $this->client->custom_value4 ?: ' ', 'label' => $this->makeCustomField('client4')];
+ $data['$client1'] = ['value' => $this->formatCustomFieldValue('client1', $this->client->custom_value1) ?: ' ', 'label' => $this->makeCustomField('client1')];
+ $data['$client2'] = ['value' => $this->formatCustomFieldValue('client2', $this->client->custom_value2) ?: ' ', 'label' => $this->makeCustomField('client2')];
+ $data['$client3'] = ['value' => $this->formatCustomFieldValue('client3', $this->client->custom_value3) ?: ' ', 'label' => $this->makeCustomField('client3')];
+ $data['$client4'] = ['value' => $this->formatCustomFieldValue('client4', $this->client->custom_value4) ?: ' ', 'label' => $this->makeCustomField('client4')];
$data['$address1'] = ['value' => $this->client->address1 ?: ' ', 'label' => ctrans('texts.address1')];
$data['$address2'] = ['value' => $this->client->address2 ?: ' ', 'label' => ctrans('texts.address2')];
$data['$id_number'] = ['value' => $this->client->id_number ?: ' ', 'label' => ctrans('texts.id_number')];
@@ -273,10 +277,10 @@ class HtmlEngine
$data['$company.logo'] = ['value' => $logo ?: ' ', 'label' => ctrans('texts.logo')];
$data['$company_logo'] = &$data['$company.logo'];
- $data['$company1'] = ['value' => $this->settings->custom_value1 ?: ' ', 'label' => $this->makeCustomField('company1')];
- $data['$company2'] = ['value' => $this->settings->custom_value2 ?: ' ', 'label' => $this->makeCustomField('company2')];
- $data['$company3'] = ['value' => $this->settings->custom_value3 ?: ' ', 'label' => $this->makeCustomField('company3')];
- $data['$company4'] = ['value' => $this->settings->custom_value4 ?: ' ', 'label' => $this->makeCustomField('company4')];
+ $data['$company1'] = ['value' => $this->formatCustomFieldValue('company1', $this->settings->custom_value1) ?: ' ', 'label' => $this->makeCustomField('company1')];
+ $data['$company2'] = ['value' => $this->formatCustomFieldValue('company2', $this->settings->custom_value2) ?: ' ', 'label' => $this->makeCustomField('company2')];
+ $data['$company3'] = ['value' => $this->formatCustomFieldValue('company3', $this->settings->custom_value3) ?: ' ', 'label' => $this->makeCustomField('company3')];
+ $data['$company4'] = ['value' => $this->formatCustomFieldValue('company4', $this->settings->custom_value4) ?: ' ', 'label' => $this->makeCustomField('company4')];
$data['$custom_surcharge1'] = ['value' => $this->entity->custom_surcharge1 ?: ' ', 'label' => $this->makeCustomField('custom_surcharge1')];
$data['$custom_surcharge2'] = ['value' => $this->entity->custom_surcharge2 ?: ' ', 'label' => $this->makeCustomField('custom_surcharge2')];
@@ -365,6 +369,21 @@ class HtmlEngine
$arrKeysLength = array_map('strlen', array_keys($data));
array_multisort($arrKeysLength, SORT_DESC, $data);
+//info(print_r($data,1));
+
+ return $data;
+ }
+
+ public function makeValues() :array
+ {
+ $data = [];
+
+ $values = $this->buildEntityDataArray();
+
+ foreach ($values as $key => $value) {
+ $data[$key] = $value['value'];
+ }
+
return $data;
}
@@ -427,7 +446,7 @@ class HtmlEngine
private function getCountryName() :string
{
- $country = Country::find($this->settings->country_id)->first();
+ $country = Country::find($this->settings->country_id);
if ($country) {
return $country->name;
@@ -479,6 +498,7 @@ class HtmlEngine
if ($custom_fields && property_exists($custom_fields, $field)) {
$custom_field = $custom_fields->{$field};
+
$custom_field_parts = explode('|', $custom_field);
return $custom_field_parts[0];
@@ -487,6 +507,30 @@ class HtmlEngine
return '';
}
+ private function formatCustomFieldValue($field, $value) :string
+ {
+ $custom_fields = $this->company->custom_fields;
+ $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, $this->client->date_format());
+ break;
+
+ default:
+ return is_null($value) ? '' : $value;
+ break;
+ }
+ }
+
private function makeTotalTaxes() :string
{
$data = '';
diff --git a/app/Utils/PhantomJS/Phantom.php b/app/Utils/PhantomJS/Phantom.php
index 366e4c066afb..700e64dbea16 100644
--- a/app/Utils/PhantomJS/Phantom.php
+++ b/app/Utils/PhantomJS/Phantom.php
@@ -16,10 +16,14 @@ use App\Models\CreditInvitation;
use App\Models\Design;
use App\Models\InvoiceInvitation;
use App\Models\QuoteInvitation;
+use App\Services\PdfMaker\Design as PdfDesignModel;
+use App\Services\PdfMaker\Design as PdfMakerDesign;
+use App\Services\PdfMaker\PdfMaker as PdfMakerService;
use App\Utils\HtmlEngine;
use App\Utils\Traits\MakesHash;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
class Phantom
{
@@ -37,10 +41,13 @@ class Phantom
if ($invitation instanceof InvoiceInvitation) {
$entity = 'invoice';
+ $entity_design_id = 'invoice_design_id';
} elseif ($invitation instanceof CreditInvitation) {
$entity = 'credit';
+ $entity_design_id = 'credit_design_id';
} elseif ($invitation instanceof QuoteInvitation) {
$entity = 'quote';
+ $entity_design_id = 'quote_design_id';
}
$entity_obj = $invitation->{$entity};
@@ -76,25 +83,54 @@ class Phantom
public function displayInvitation(string $entity, string $invitation_key)
{
+
$key = $entity.'_id';
- $invitation_instance = 'App\Models\\'.ucfirst($entity).'Invitation';
+ $invitation_instance = 'App\Models\\'.Str::camel(ucfirst($entity)).'Invitation';
$invitation = $invitation_instance::whereRaw('BINARY `key`= ?', [$invitation_key])->first();
-
+
$entity_obj = $invitation->{$entity};
$entity_obj->load('client');
App::setLocale($invitation->contact->preferredLocale());
- $design_id = $entity_obj->design_id ? $entity_obj->design_id : $this->decodePrimaryKey($entity_obj->client->getSetting($entity.'_design_id'));
+ $entity_design_id = $entity . '_design_id';
+ $design_id = $entity_obj->design_id ? $entity_obj->design_id : $this->decodePrimaryKey($entity_obj->client->getSetting($entity_design_id));
$design = Design::find($design_id);
+ $html = new HtmlEngine($invitation);
- $designer = new Designer($entity_obj, $design, $entity_obj->client->getSetting('pdf_variables'), $entity);
+ if ($design->is_custom) {
+ $options = [
+ 'custom_partials' => json_decode(json_encode($design->design), true)
+ ];
+ $template = new PdfMakerDesign(PdfDesignModel::CUSTOM, $options);
+ } else {
+ $template = new PdfMakerDesign(strtolower($design->name));
+ }
+
+ $state = [
+ 'template' => $template->elements([
+ 'client' => $this->entity->client,
+ 'entity' => $this->entity,
+ 'pdf_variables' => (array) $this->entity->company->settings->pdf_variables,
+ 'products' => $design->design->product,
+ ]),
+ 'variables' => $html->generateLabelsAndValues(),
+ 'options' => [
+ 'all_pages_header' => $entity_obj->client->getSetting('all_pages_header'),
+ 'all_pages_footer' => $entity_obj->client->getSetting('all_pages_footer'),
+ ],
+ ];
+
+ $maker = new PdfMakerService($state);
+
+ $data['html'] = $maker->design($template)
+ ->build()
+ ->getCompiledHTML(true);
- $data['html'] = (new HtmlEngine($designer, $invitation, $entity))->build();
return view('pdf.html', $data);
}
diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php
index 1bf85b519cb1..f83e917fb0db 100644
--- a/app/Utils/TemplateEngine.php
+++ b/app/Utils/TemplateEngine.php
@@ -16,6 +16,7 @@ use App\Models\Client;
use App\Models\ClientContact;
use App\Models\Invoice;
use App\Models\InvoiceInvitation;
+use App\Utils\HtmlEngine;
use App\Utils\Traits\MakesHash;
use App\Utils\Traits\MakesInvoiceHtml;
use App\Utils\Traits\MakesTemplateData;
@@ -151,7 +152,9 @@ class TemplateEngine
private function entityValues($contact)
{
- $data = $this->entity_obj->buildLabelsAndValues($contact);
+ //$data = $this->entity_obj->buildLabelsAndValues($contact);
+
+ $data = (new HtmlEngine($this->entity_obj->invitations->first()))->generateLabelsAndValues();
// $arrKeysLength = array_map('strlen', array_keys($data));
// array_multisort($arrKeysLength, SORT_DESC, $data);
diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php
index ad1dc4d9898f..7cf5b771ed4e 100644
--- a/app/Utils/Traits/GeneratesCounter.php
+++ b/app/Utils/Traits/GeneratesCounter.php
@@ -16,6 +16,7 @@ use App\Models\Credit;
use App\Models\Expense;
use App\Models\Invoice;
use App\Models\Payment;
+use App\Models\Project;
use App\Models\Quote;
use App\Models\RecurringInvoice;
use App\Models\Timezone;
@@ -108,7 +109,7 @@ trait GeneratesCounter
$credit_number = $this->checkEntityNumber(Credit::class, $client, $counter, $padding, $pattern);
- $this->incrementCounter($client->company, 'credit_number_counter');
+ $this->incrementCounter($counter_entity, 'credit_number_counter');
return $credit_number;
}
@@ -225,6 +226,44 @@ trait GeneratesCounter
return (string) $payment_number;
}
+ /**
+ * Project Number Generator.
+ * @return string The project number
+ */
+ public function getNextProjectNumber(Client $client) :string
+ {
+
+ //Reset counters if enabled
+ $this->resetCounters($client);
+
+ $is_client_counter = false;
+
+ //todo handle if we have specific client patterns in the future
+ $pattern = $client->company->settings->project_number_pattern;
+
+ //Determine if we are using client_counters
+ if (strpos($pattern, 'client_counter') === false) {
+ $counter = $client->company->settings->project_number_counter;
+ } else {
+ $counter = $client->settings->project_number_counter;
+ $is_client_counter = true;
+ }
+
+ //Return a valid counter
+ $pattern = '';
+ $padding = $client->getSetting('counter_padding');
+ $project_number = $this->checkEntityNumber(Project::class, $client, $counter, $padding, $pattern);
+
+ //increment the correct invoice_number Counter (company vs client)
+ if ($is_client_counter) {
+ $this->incrementCounter($client, 'project_number_counter');
+ } else {
+ $this->incrementCounter($client->company, 'project_number_counter');
+ }
+
+ return (string) $project_number;
+ }
+
/**
* Gets the next client number.
*
@@ -479,6 +518,7 @@ trait GeneratesCounter
$settings->vendor_number_counter = 1;
$settings->ticket_number_counter = 1;
$settings->payment_number_counter = 1;
+ $settings->project_number_counter = 1;
$settings->task_number_counter = 1;
$settings->expense_number_counter = 1;
diff --git a/app/Utils/Traits/InvoiceEmailBuilder.php b/app/Utils/Traits/InvoiceEmailBuilder.php
deleted file mode 100644
index 147409b418b5..000000000000
--- a/app/Utils/Traits/InvoiceEmailBuilder.php
+++ /dev/null
@@ -1,136 +0,0 @@
-client;
-
- if (! $reminder_template) {
- $reminder_template = $this->calculateTemplate();
- }
-
- //Need to determine which email template we are producing
- return $this->generateTemplateData($reminder_template, $contact);
- }
-
- private function generateTemplateData(string $reminder_template, $contact) :array
- {
- $data = [];
-
- $client = $this->client;
-
- $body_template = $client->getSetting('email_template_'.$reminder_template);
-
- /* Use default translations if a custom message has not been set*/
- if (iconv_strlen($body_template) == 0) {
- $body_template = trans('texts.invoice_message', ['amount'=>$this->present()->amount(), 'account'=>$this->company->present()->name()], null, $this->client->locale());
- }
-
- $subject_template = $client->getSetting('email_subject_'.$reminder_template);
-
- if (iconv_strlen($subject_template) == 0) {
- if ($reminder_template == 'invoice') {
- $subject_template = trans('texts.invoice_subject', ['number'=>$this->present()->invoice_number(), 'account'=>$this->company->present()->name()], null, $this->client->locale());
- } else {
- $subject_template = trans('texts.reminder_subject', ['number'=>$this->present()->invoice_number(), 'account'=>$this->company->present()->name()], null, $this->client->locale());
- }
- }
-
- $data['body'] = $this->parseTemplate($body_template, true, $contact);
-
- $data['subject'] = $this->parseTemplate($subject_template, false, $contact);
-
- if ($client->getSetting('pdf_email_attachment') !== false) {
- $data['files'][] = $this->pdf_file_path();
- }
-
- return $data;
- }
-
- private function parseTemplate(string $template_data, bool $is_markdown = true, $contact = null) :string
- {
- $invoice_variables = $this->makeValues($contact);
-
- //process variables
-// $data = str_replace(array_keys($invoice_variables), array_values($invoice_variables), $template_data);
- $data = strtr($template_data, $invoice_variables);
-
- //process markdown
- if ($is_markdown) {
- $converter = new CommonMarkConverter([
- 'html_input' => 'allow',
- 'allow_unsafe_links' => true,
- ]);
-
- $data = $converter->convertToHtml($data);
- }
-
- return $data;
- }
-
- // private function calculateTemplate() :string
- // {
- // //if invoice is currently a draft, or being marked as sent, this will be the initial email
- // $client = $this->client;
-
- // //if the invoice
- // if ($this->status_id == Invoice::STATUS_DRAFT || Carbon::parse($this->due_date) > now()) {
- // return 'invoice';
- // } elseif ($client->getSetting('enable_reminder1') !== false && $this->inReminderWindow($client->getSetting('schedule_reminder1'), $client->getSetting('num_days_reminder1'))) {
- // return 'template1';
- // } elseif ($client->getSetting('enable_reminder2') !== false && $this->inReminderWindow($client->getSetting('schedule_reminder2'), $client->getSetting('num_days_reminder2'))) {
- // return 'template2';
- // } elseif ($client->getSetting('enable_reminder3') !== false && $this->inReminderWindow($client->getSetting('schedule_reminder3'), $client->getSetting('num_days_reminder3'))) {
- // return 'template3';
- // } else {
- // return 'invoice';
- // }
-
- // //also implement endless reminders here
- // }
-
- // private function inReminderWindow($schedule_reminder, $num_days_reminder)
- // {
- // switch ($schedule_reminder) {
- // case 'after_invoice_date':
- // return Carbon::parse($this->date)->addDays($num_days_reminder)->startOfDay()->eq(Carbon::now()->startOfDay());
- // break;
- // case 'before_due_date':
- // return Carbon::parse($this->due_date)->subDays($num_days_reminder)->startOfDay()->eq(Carbon::now()->startOfDay());
- // break;
- // case 'after_due_date':
- // return Carbon::parse($this->due_date)->addDays($num_days_reminder)->startOfDay()->eq(Carbon::now()->startOfDay());
- // break;
- // default:
- // # code...
- // break;
- // }
- // }
-}
diff --git a/app/Utils/Traits/MakesInvoiceHtml.php b/app/Utils/Traits/MakesInvoiceHtml.php
index 72dbca2f8dc1..3c747ebb21f1 100644
--- a/app/Utils/Traits/MakesInvoiceHtml.php
+++ b/app/Utils/Traits/MakesInvoiceHtml.php
@@ -33,45 +33,45 @@ trait MakesInvoiceHtml
*
* @return string The invoice string in HTML format
*/
- public function generateEntityHtml(Designer $designer, $entity, $contact = null) :string
- {
- $entity->load('client');
+ // public function generateEntityHtml(Designer $designer, $entity, $contact = null) :string
+ // {
+ // $entity->load('client');
- $client = $entity->client;
+ // $client = $entity->client;
- App::setLocale($client->preferredLocale());
+ // App::setLocale($client->preferredLocale());
- $values_and_labels = $entity->buildLabelsAndValues($contact);
+ // $values_and_labels = $entity->buildLabelsAndValues($contact);
- $designer->build();
+ // $designer->build();
- $data = [];
- $data['entity'] = $entity;
- $data['lang'] = $client->preferredLocale();
- $data['includes'] = $designer->getIncludes();
- $data['header'] = $designer->getHeader();
- $data['body'] = $designer->getBody();
- $data['footer'] = $designer->getFooter();
+ // $data = [];
+ // $data['entity'] = $entity;
+ // $data['lang'] = $client->preferredLocale();
+ // $data['includes'] = $designer->getIncludes();
+ // $data['header'] = $designer->getHeader();
+ // $data['body'] = $designer->getBody();
+ // $data['footer'] = $designer->getFooter();
- $html = view('pdf.stub', $data)->render();
+ // $html = view('pdf.stub', $data)->render();
- $html = $this->parseLabelsAndValues($values_and_labels['labels'], $values_and_labels['values'], $html);
+ // $html = $this->parseLabelsAndValues($values_and_labels['labels'], $values_and_labels['values'], $html);
- return $html;
- }
+ // return $html;
+ // }
- public function generateEmailEntityHtml($entity, $content, $contact = null) :string
- {
- $entity->load('client');
+ // public function generateEmailEntityHtml($entity, $content, $contact = null) :string
+ // {
+ // $entity->load('client');
- $client = $entity->client;
+ // $client = $entity->client;
- App::setLocale($client->preferredLocale());
+ // App::setLocale($client->preferredLocale());
- $data = $entity->buildLabelsAndValues($contact);
+ // $data = $entity->buildLabelsAndValues($contact);
- return $this->parseLabelsAndValues($data['labels'], $data['values'], $content);
- }
+ // return $this->parseLabelsAndValues($data['labels'], $data['values'], $content);
+ // }
private function parseLabelsAndValues($labels, $values, $section) :string
{
diff --git a/app/Utils/Traits/MakesInvoiceValues.php b/app/Utils/Traits/MakesInvoiceValues.php
index 6c518a981781..c4f02543c46a 100644
--- a/app/Utils/Traits/MakesInvoiceValues.php
+++ b/app/Utils/Traits/MakesInvoiceValues.php
@@ -157,300 +157,300 @@ trait MakesInvoiceValues
return $data;
}
- public function buildLabelsAndValues($contact)
- {
- $data = [];
+ // public function buildLabelsAndValues($contact)
+ // {
+ // $data = [];
- $values = $this->makeLabelsAndValues($contact);
+ // $values = $this->makeLabelsAndValues($contact);
- foreach ($values as $key => $value) {
- $data['values'][$key] = $value['value'];
- $data['labels'][$key.'_label'] = $value['label'];
- }
+ // foreach ($values as $key => $value) {
+ // $data['values'][$key] = $value['value'];
+ // $data['labels'][$key.'_label'] = $value['label'];
+ // }
- return $data;
- }
+ // return $data;
+ // }
- private function makeLabelsAndValues($contact = null) :array
- {
- if (! $this->client->currency() || ! $this->client) {
- throw new \Exception(debug_backtrace()[1]['function'], 1);
- exit;
- }
+ // private function makeLabelsAndValues($contact = null) :array
+ // {
+ // if (! $this->client->currency() || ! $this->client) {
+ // throw new \Exception(debug_backtrace()[1]['function'], 1);
+ // exit;
+ // }
- $settings = $this->client->getMergedSettings();
+ // $settings = $this->client->getMergedSettings();
- if (! $contact) {
- $contact = $this->client->primary_contact()->first();
- }
+ // if (! $contact) {
+ // $contact = $this->client->primary_contact()->first();
+ // }
- $calc = $this->calc();
- $invitation = $this->invitations->where('client_contact_id', $contact->id)->first();
+ // $calc = $this->calc();
+ // $invitation = $this->invitations->where('client_contact_id', $contact->id)->first();
- $data = [];
- $data['$tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
- $data['$app_url'] = ['value' => $this->generateAppUrl(), 'label' => ''];
- $data['$from'] = ['value' => '', 'label' => ctrans('texts.from')];
- $data['$to'] = ['value' => '', 'label' => ctrans('texts.to')];
- $data['$total_tax_labels'] = ['value' => $this->totalTaxLabels(), 'label' => ctrans('texts.taxes')];
- $data['$total_tax_values'] = ['value' => $this->totalTaxValues(), 'label' => ctrans('texts.taxes')];
- $data['$line_tax_labels'] = ['value' => $this->lineTaxLabels(), 'label' => ctrans('texts.taxes')];
- $data['$line_tax_values'] = ['value' => $this->lineTaxValues(), 'label' => ctrans('texts.taxes')];
- $data['$date'] = ['value' => $this->date ?: ' ', 'label' => ctrans('texts.date')];
- //$data['$invoice_date'] = ['value' => $this->date ?: ' ', 'label' => ctrans('texts.invoice_date')];
- $data['$invoice.date'] = &$data['$date'];
- $data['$invoice.due_date'] = ['value' => $this->due_date ?: ' ', 'label' => ctrans('texts.due_date')];
- $data['$due_date'] = &$data['$invoice.due_date'];
- $data['$invoice.number'] = ['value' => $this->number ?: ' ', 'label' => ctrans('texts.invoice_number')];
- $data['$invoice.po_number'] = ['value' => $this->po_number ?: ' ', 'label' => ctrans('texts.po_number')];
- $data['$line_taxes'] = ['value' => $this->makeLineTaxes() ?: ' ', 'label' => ctrans('texts.taxes')];
- $data['$invoice.line_taxes'] = &$data['$line_taxes'];
- $data['$total_taxes'] = ['value' => $this->makeTotalTaxes() ?: ' ', 'label' => ctrans('texts.taxes')];
- $data['$invoice.total_taxes'] = &$data['$total_taxes'];
+ // $data = [];
+ // $data['$tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
+ // $data['$app_url'] = ['value' => $this->generateAppUrl(), 'label' => ''];
+ // $data['$from'] = ['value' => '', 'label' => ctrans('texts.from')];
+ // $data['$to'] = ['value' => '', 'label' => ctrans('texts.to')];
+ // $data['$total_tax_labels'] = ['value' => $this->totalTaxLabels(), 'label' => ctrans('texts.taxes')];
+ // $data['$total_tax_values'] = ['value' => $this->totalTaxValues(), 'label' => ctrans('texts.taxes')];
+ // $data['$line_tax_labels'] = ['value' => $this->lineTaxLabels(), 'label' => ctrans('texts.taxes')];
+ // $data['$line_tax_values'] = ['value' => $this->lineTaxValues(), 'label' => ctrans('texts.taxes')];
+ // $data['$date'] = ['value' => $this->date ?: ' ', 'label' => ctrans('texts.date')];
+ // //$data['$invoice_date'] = ['value' => $this->date ?: ' ', 'label' => ctrans('texts.invoice_date')];
+ // $data['$invoice.date'] = &$data['$date'];
+ // $data['$invoice.due_date'] = ['value' => $this->due_date ?: ' ', 'label' => ctrans('texts.due_date')];
+ // $data['$due_date'] = &$data['$invoice.due_date'];
+ // $data['$invoice.number'] = ['value' => $this->number ?: ' ', 'label' => ctrans('texts.invoice_number')];
+ // $data['$invoice.po_number'] = ['value' => $this->po_number ?: ' ', 'label' => ctrans('texts.po_number')];
+ // $data['$line_taxes'] = ['value' => $this->makeLineTaxes() ?: ' ', 'label' => ctrans('texts.taxes')];
+ // $data['$invoice.line_taxes'] = &$data['$line_taxes'];
+ // $data['$total_taxes'] = ['value' => $this->makeTotalTaxes() ?: ' ', 'label' => ctrans('texts.taxes')];
+ // $data['$invoice.total_taxes'] = &$data['$total_taxes'];
- if ($this instanceof Invoice) {
- $data['$entity_label'] = ['value' => '', 'label' => ctrans('texts.invoice')];
- $data['$number'] = ['value' => $this->number ?: ' ', 'label' => ctrans('texts.invoice_number')];
- $data['$entity.terms'] = ['value' => $this->terms ?: ' ', 'label' => ctrans('texts.invoice_terms')];
- $data['$terms'] = &$data['$entity.terms'];
+ // if ($this instanceof Invoice) {
+ // $data['$entity_label'] = ['value' => '', 'label' => ctrans('texts.invoice')];
+ // $data['$number'] = ['value' => $this->number ?: ' ', 'label' => ctrans('texts.invoice_number')];
+ // $data['$entity.terms'] = ['value' => $this->terms ?: ' ', 'label' => ctrans('texts.invoice_terms')];
+ // $data['$terms'] = &$data['$entity.terms'];
- if($invitation)
- $data['$view_link'] = ['value' => ''.ctrans('texts.view_invoice').'', 'label' => ctrans('texts.view_invoice')];
- // $data['$view_link'] = ['value' => $invitation->getLink(), 'label' => ctrans('texts.view_invoice')];
- }
+ // if($invitation)
+ // $data['$view_link'] = ['value' => ''.ctrans('texts.view_invoice').'', 'label' => ctrans('texts.view_invoice')];
+ // // $data['$view_link'] = ['value' => $invitation->getLink(), 'label' => ctrans('texts.view_invoice')];
+ // }
- if ($this instanceof Quote) {
- $data['$entity_label'] = ['value' => '', 'label' => ctrans('texts.quote')];
- $data['$number'] = ['value' => $this->number ?: ' ', 'label' => ctrans('texts.quote_number')];
- $data['$entity.terms'] = ['value' => $this->terms ?: ' ', 'label' => ctrans('texts.quote_terms')];
- $data['$terms'] = &$data['$entity.terms'];
+ // if ($this instanceof Quote) {
+ // $data['$entity_label'] = ['value' => '', 'label' => ctrans('texts.quote')];
+ // $data['$number'] = ['value' => $this->number ?: ' ', 'label' => ctrans('texts.quote_number')];
+ // $data['$entity.terms'] = ['value' => $this->terms ?: ' ', 'label' => ctrans('texts.quote_terms')];
+ // $data['$terms'] = &$data['$entity.terms'];
- if($invitation)
- $data['$view_link'] = ['value' => ''.ctrans('texts.view_quote').'', 'label' => ctrans('texts.view_quote')];
- // $data['$view_link'] = ['value' => $invitation->getLink(), 'label' => ctrans('texts.view_quote')];
- }
+ // if($invitation)
+ // $data['$view_link'] = ['value' => ''.ctrans('texts.view_quote').'', 'label' => ctrans('texts.view_quote')];
+ // // $data['$view_link'] = ['value' => $invitation->getLink(), 'label' => ctrans('texts.view_quote')];
+ // }
- if ($this instanceof Credit) {
- $data['$entity_label'] = ['value' => '', 'label' => ctrans('texts.credit')];
- $data['$number'] = ['value' => $this->number ?: ' ', 'label' => ctrans('texts.credit_number')];
- $data['$entity.terms'] = ['value' => $this->terms ?: ' ', 'label' => ctrans('texts.credit_terms')];
- $data['$terms'] = &$data['$entity.terms'];
+ // if ($this instanceof Credit) {
+ // $data['$entity_label'] = ['value' => '', 'label' => ctrans('texts.credit')];
+ // $data['$number'] = ['value' => $this->number ?: ' ', 'label' => ctrans('texts.credit_number')];
+ // $data['$entity.terms'] = ['value' => $this->terms ?: ' ', 'label' => ctrans('texts.credit_terms')];
+ // $data['$terms'] = &$data['$entity.terms'];
- if($invitation)
- $data['$view_link'] = ['value' => ''.ctrans('texts.view_credit').'', 'label' => ctrans('texts.view_credit')];
- // $data['$view_link'] = ['value' => $invitation->getLink(), 'label' => ctrans('texts.view_credit')];
- }
+ // if($invitation)
+ // $data['$view_link'] = ['value' => ''.ctrans('texts.view_credit').'', 'label' => ctrans('texts.view_credit')];
+ // // $data['$view_link'] = ['value' => $invitation->getLink(), 'label' => ctrans('texts.view_credit')];
+ // }
- $data['$entity_number'] = &$data['$number'];
+ // $data['$entity_number'] = &$data['$number'];
- $data['$invoice.discount'] = ['value' => Number::formatMoney($calc->getTotalDiscount(), $this->client) ?: ' ', 'label' => ctrans('texts.discount')];
- $data['$discount'] = &$data['$invoice.discount'];
- $data['$subtotal'] = ['value' => Number::formatMoney($calc->getSubTotal(), $this->client) ?: ' ', 'label' => ctrans('texts.subtotal')];
- $data['$invoice.subtotal'] = &$data['$subtotal'];
- $data['$invoice.balance_due'] = ['value' => Number::formatMoney($this->balance, $this->client) ?: ' ', 'label' => ctrans('texts.balance_due')];
- $data['$quote.balance_due'] = &$data['$invoice.balance_due'];
- $data['$balance_due'] = &$data['$invoice.balance_due'];
- $data['$invoice.partial_due'] = ['value' => Number::formatMoney($this->partial, $this->client) ?: ' ', 'label' => ctrans('texts.partial_due')];
- $data['$total'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: ' ', 'label' => ctrans('texts.total')];
- $data['$amount'] = &$data['$total'];
- $data['$quote.total'] = &$data['$total'];
- $data['$invoice.total'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: ' ', 'label' => ctrans('texts.invoice_total')];
- $data['$invoice.amount'] = &$data['$total'];
- $data['$quote.amount'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: ' ', 'label' => ctrans('texts.quote_total')];
- $data['$credit.total'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: ' ', 'label' => ctrans('texts.credit_total')];
- $data['$credit.number'] = ['value' => $this->number ?: ' ', 'label' => ctrans('texts.credit_number')];
- $data['$credit.total'] = &$data['$credit.total'];
- $data['$credit.po_number'] = &$data['$invoice.po_number'];
- $data['$credit.date'] = ['value' => $this->date, 'label' => ctrans('texts.credit_date')];
- $data['$balance'] = ['value' => Number::formatMoney($calc->getBalance(), $this->client) ?: ' ', 'label' => ctrans('texts.balance')];
- $data['$credit.balance'] = &$data['$balance'];
+ // $data['$invoice.discount'] = ['value' => Number::formatMoney($calc->getTotalDiscount(), $this->client) ?: ' ', 'label' => ctrans('texts.discount')];
+ // $data['$discount'] = &$data['$invoice.discount'];
+ // $data['$subtotal'] = ['value' => Number::formatMoney($calc->getSubTotal(), $this->client) ?: ' ', 'label' => ctrans('texts.subtotal')];
+ // $data['$invoice.subtotal'] = &$data['$subtotal'];
+ // $data['$invoice.balance_due'] = ['value' => Number::formatMoney($this->balance, $this->client) ?: ' ', 'label' => ctrans('texts.balance_due')];
+ // $data['$quote.balance_due'] = &$data['$invoice.balance_due'];
+ // $data['$balance_due'] = &$data['$invoice.balance_due'];
+ // $data['$invoice.partial_due'] = ['value' => Number::formatMoney($this->partial, $this->client) ?: ' ', 'label' => ctrans('texts.partial_due')];
+ // $data['$total'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: ' ', 'label' => ctrans('texts.total')];
+ // $data['$amount'] = &$data['$total'];
+ // $data['$quote.total'] = &$data['$total'];
+ // $data['$invoice.total'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: ' ', 'label' => ctrans('texts.invoice_total')];
+ // $data['$invoice.amount'] = &$data['$total'];
+ // $data['$quote.amount'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: ' ', 'label' => ctrans('texts.quote_total')];
+ // $data['$credit.total'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: ' ', 'label' => ctrans('texts.credit_total')];
+ // $data['$credit.number'] = ['value' => $this->number ?: ' ', 'label' => ctrans('texts.credit_number')];
+ // $data['$credit.total'] = &$data['$credit.total'];
+ // $data['$credit.po_number'] = &$data['$invoice.po_number'];
+ // $data['$credit.date'] = ['value' => $this->date, 'label' => ctrans('texts.credit_date')];
+ // $data['$balance'] = ['value' => Number::formatMoney($calc->getBalance(), $this->client) ?: ' ', 'label' => ctrans('texts.balance')];
+ // $data['$credit.balance'] = &$data['$balance'];
- $data['$invoice.balance'] = &$data['$balance'];
- $data['$taxes'] = ['value' => Number::formatMoney($calc->getItemTotalTaxes(), $this->client) ?: ' ', 'label' => ctrans('texts.taxes')];
- $data['$invoice.taxes'] = &$data['$taxes'];
+ // $data['$invoice.balance'] = &$data['$balance'];
+ // $data['$taxes'] = ['value' => Number::formatMoney($calc->getItemTotalTaxes(), $this->client) ?: ' ', 'label' => ctrans('texts.taxes')];
+ // $data['$invoice.taxes'] = &$data['$taxes'];
- $data['$invoice.custom1'] = ['value' => $this->custom_value1 ?: ' ', 'label' => $this->makeCustomField('invoice1')];
- $data['$invoice.custom2'] = ['value' => $this->custom_value2 ?: ' ', 'label' => $this->makeCustomField('invoice2')];
- $data['$invoice.custom3'] = ['value' => $this->custom_value3 ?: ' ', 'label' => $this->makeCustomField('invoice3')];
- $data['$invoice.custom4'] = ['value' => $this->custom_value4 ?: ' ', 'label' => $this->makeCustomField('invoice4')];
- $data['$invoice.public_notes'] = ['value' => $this->public_notes ?: ' ', 'label' => ctrans('texts.public_notes')];
- $data['$entity.public_notes'] = &$data['$invoice.public_notes'];
+ // $data['$invoice.custom1'] = ['value' => $this->custom_value1 ?: ' ', 'label' => $this->makeCustomField('invoice1')];
+ // $data['$invoice.custom2'] = ['value' => $this->custom_value2 ?: ' ', 'label' => $this->makeCustomField('invoice2')];
+ // $data['$invoice.custom3'] = ['value' => $this->custom_value3 ?: ' ', 'label' => $this->makeCustomField('invoice3')];
+ // $data['$invoice.custom4'] = ['value' => $this->custom_value4 ?: ' ', 'label' => $this->makeCustomField('invoice4')];
+ // $data['$invoice.public_notes'] = ['value' => $this->public_notes ?: ' ', 'label' => ctrans('texts.public_notes')];
+ // $data['$entity.public_notes'] = &$data['$invoice.public_notes'];
- // $data['$your_invoice'] = ;
- // $data['$quote'] = ;
- // $data['$your_quote'] = ;
- //
- $data['$quote.date'] = ['value' => $this->date ?: ' ', 'label' => ctrans('texts.quote_date')];
- $data['$quote.number'] = ['value' => $this->number ?: ' ', 'label' => ctrans('texts.quote_number')];
- $data['$quote.po_number'] = &$data['$invoice.po_number'];
- $data['$quote.quote_number'] = &$data['$quote.number'];
- $data['$quote_no'] = &$data['$quote.number'];
- $data['$quote.quote_no'] = &$data['$quote.number'];
- $data['$quote.valid_until'] = ['value' => $this->due_date, 'label' => ctrans('texts.valid_until')];
- $data['$credit_amount'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: ' ', 'label' => ctrans('texts.credit_amount')];
- $data['$credit_balance'] = ['value' => Number::formatMoney($this->balance, $this->client) ?: ' ', 'label' => ctrans('texts.credit_balance')];
+ // // $data['$your_invoice'] = ;
+ // // $data['$quote'] = ;
+ // // $data['$your_quote'] = ;
+ // //
+ // $data['$quote.date'] = ['value' => $this->date ?: ' ', 'label' => ctrans('texts.quote_date')];
+ // $data['$quote.number'] = ['value' => $this->number ?: ' ', 'label' => ctrans('texts.quote_number')];
+ // $data['$quote.po_number'] = &$data['$invoice.po_number'];
+ // $data['$quote.quote_number'] = &$data['$quote.number'];
+ // $data['$quote_no'] = &$data['$quote.number'];
+ // $data['$quote.quote_no'] = &$data['$quote.number'];
+ // $data['$quote.valid_until'] = ['value' => $this->due_date, 'label' => ctrans('texts.valid_until')];
+ // $data['$credit_amount'] = ['value' => Number::formatMoney($calc->getTotal(), $this->client) ?: ' ', 'label' => ctrans('texts.credit_amount')];
+ // $data['$credit_balance'] = ['value' => Number::formatMoney($this->balance, $this->client) ?: ' ', 'label' => ctrans('texts.credit_balance')];
- $data['$credit_number'] = &$data['$number'];
- $data['$credit_no'] = &$data['$number'];
- $data['$credit.credit_no'] = &$data['$number'];
+ // $data['$credit_number'] = &$data['$number'];
+ // $data['$credit_no'] = &$data['$number'];
+ // $data['$credit.credit_no'] = &$data['$number'];
- // $data['$invoice_issued_to'] = ;
- // $data['$quote_issued_to'] = ;
- // $data['$rate'] = ;
- // $data['$hours'] = ;
- // $data['$from'] = ;
- // $data['$to'] = ;
- // $data['$invoice_to'] = ;
- // $data['$quote_to'] = ;
- // $data['$details'] = ;
- $data['$invoice_no'] = &$data['$number'];
- $data['$invoice.invoice_no'] = &$data['$number'];
- $data['$client1'] = ['value' => $this->client->custom_value1 ?: ' ', 'label' => $this->makeCustomField('client1')];
- $data['$client2'] = ['value' => $this->client->custom_value2 ?: ' ', 'label' => $this->makeCustomField('client2')];
- $data['$client3'] = ['value' => $this->client->custom_value3 ?: ' ', 'label' => $this->makeCustomField('client3')];
- $data['$client4'] = ['value' => $this->client->custom_value4 ?: ' ', 'label' => $this->makeCustomField('client4')];
- $data['$address1'] = ['value' => $this->client->address1 ?: ' ', 'label' => ctrans('texts.address1')];
- $data['$address2'] = ['value' => $this->client->address2 ?: ' ', 'label' => ctrans('texts.address2')];
- $data['$id_number'] = ['value' => $this->client->id_number ?: ' ', 'label' => ctrans('texts.id_number')];
- $data['$vat_number'] = ['value' => $this->client->vat_number ?: ' ', 'label' => ctrans('texts.vat_number')];
- $data['$website'] = ['value' => $this->client->present()->website() ?: ' ', 'label' => ctrans('texts.website')];
- $data['$phone'] = ['value' => $this->client->present()->phone() ?: ' ', 'label' => ctrans('texts.phone')];
- $data['$country'] = ['value' => isset($this->client->country->name) ? $this->client->country->name : 'No Country Set', 'label' => ctrans('texts.country')];
- $data['$email'] = ['value' => isset($contact) ? $contact->email : 'no contact email on record', 'label' => ctrans('texts.email')];
- $data['$client_name'] = ['value' => $this->present()->clientName() ?: ' ', 'label' => ctrans('texts.client_name')];
- $data['$client.name'] = &$data['$client_name'];
- $data['$client.balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
- $data['$outstanding'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
+ // // $data['$invoice_issued_to'] = ;
+ // // $data['$quote_issued_to'] = ;
+ // // $data['$rate'] = ;
+ // // $data['$hours'] = ;
+ // // $data['$from'] = ;
+ // // $data['$to'] = ;
+ // // $data['$invoice_to'] = ;
+ // // $data['$quote_to'] = ;
+ // // $data['$details'] = ;
+ // $data['$invoice_no'] = &$data['$number'];
+ // $data['$invoice.invoice_no'] = &$data['$number'];
+ // $data['$client1'] = ['value' => $this->client->custom_value1 ?: ' ', 'label' => $this->makeCustomField('client1')];
+ // $data['$client2'] = ['value' => $this->client->custom_value2 ?: ' ', 'label' => $this->makeCustomField('client2')];
+ // $data['$client3'] = ['value' => $this->client->custom_value3 ?: ' ', 'label' => $this->makeCustomField('client3')];
+ // $data['$client4'] = ['value' => $this->client->custom_value4 ?: ' ', 'label' => $this->makeCustomField('client4')];
+ // $data['$address1'] = ['value' => $this->client->address1 ?: ' ', 'label' => ctrans('texts.address1')];
+ // $data['$address2'] = ['value' => $this->client->address2 ?: ' ', 'label' => ctrans('texts.address2')];
+ // $data['$id_number'] = ['value' => $this->client->id_number ?: ' ', 'label' => ctrans('texts.id_number')];
+ // $data['$vat_number'] = ['value' => $this->client->vat_number ?: ' ', 'label' => ctrans('texts.vat_number')];
+ // $data['$website'] = ['value' => $this->client->present()->website() ?: ' ', 'label' => ctrans('texts.website')];
+ // $data['$phone'] = ['value' => $this->client->present()->phone() ?: ' ', 'label' => ctrans('texts.phone')];
+ // $data['$country'] = ['value' => isset($this->client->country->name) ? $this->client->country->name : 'No Country Set', 'label' => ctrans('texts.country')];
+ // $data['$email'] = ['value' => isset($contact) ? $contact->email : 'no contact email on record', 'label' => ctrans('texts.email')];
+ // $data['$client_name'] = ['value' => $this->present()->clientName() ?: ' ', 'label' => ctrans('texts.client_name')];
+ // $data['$client.name'] = &$data['$client_name'];
+ // $data['$client.balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
+ // $data['$outstanding'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
- $data['$client_balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
+ // $data['$client_balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
- $data['$paid_to_date'] = ['value' => Number::formatMoney($this->client->paid_to_date, $this->client), 'label' => ctrans('texts.paid_to_date')];
+ // $data['$paid_to_date'] = ['value' => Number::formatMoney($this->client->paid_to_date, $this->client), 'label' => ctrans('texts.paid_to_date')];
- $data['$client.address1'] = &$data['$address1'];
- $data['$client.address2'] = &$data['$address2'];
- $data['$client_address'] = ['value' => $this->present()->address() ?: ' ', 'label' => ctrans('texts.address')];
- $data['$client.address'] = &$data['$client_address'];
- $data['$client.id_number'] = &$data['$id_number'];
- $data['$client.vat_number'] = &$data['$vat_number'];
- $data['$client.website'] = &$data['$website'];
- $data['$client.phone'] = &$data['$phone'];
- $data['$city_state_postal'] = ['value' => $this->present()->cityStateZip($this->client->city, $this->client->state, $this->client->postal_code, false) ?: ' ', 'label' => ctrans('texts.city_state_postal')];
- $data['$client.city_state_postal'] = &$data['$city_state_postal'];
- $data['$postal_city_state'] = ['value' => $this->present()->cityStateZip($this->client->city, $this->client->state, $this->client->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city_state')];
- $data['$client.postal_city_state'] = &$data['$postal_city_state'];
- $data['$client.country'] = &$data['$country'];
- $data['$client.email'] = &$data['$email'];
+ // $data['$client.address1'] = &$data['$address1'];
+ // $data['$client.address2'] = &$data['$address2'];
+ // $data['$client_address'] = ['value' => $this->present()->address() ?: ' ', 'label' => ctrans('texts.address')];
+ // $data['$client.address'] = &$data['$client_address'];
+ // $data['$client.id_number'] = &$data['$id_number'];
+ // $data['$client.vat_number'] = &$data['$vat_number'];
+ // $data['$client.website'] = &$data['$website'];
+ // $data['$client.phone'] = &$data['$phone'];
+ // $data['$city_state_postal'] = ['value' => $this->present()->cityStateZip($this->client->city, $this->client->state, $this->client->postal_code, false) ?: ' ', 'label' => ctrans('texts.city_state_postal')];
+ // $data['$client.city_state_postal'] = &$data['$city_state_postal'];
+ // $data['$postal_city_state'] = ['value' => $this->present()->cityStateZip($this->client->city, $this->client->state, $this->client->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city_state')];
+ // $data['$client.postal_city_state'] = &$data['$postal_city_state'];
+ // $data['$client.country'] = &$data['$country'];
+ // $data['$client.email'] = &$data['$email'];
- $data['$contact.full_name'] = ['value' => $contact->present()->name(), 'label' => ctrans('texts.name')];
- $data['$contact.email'] = ['value' => $contact->email, 'label' => ctrans('texts.email')];
- $data['$contact.phone'] = ['value' => $contact->phone, 'label' => ctrans('texts.phone')];
+ // $data['$contact.full_name'] = ['value' => $contact->present()->name(), 'label' => ctrans('texts.name')];
+ // $data['$contact.email'] = ['value' => $contact->email, 'label' => ctrans('texts.email')];
+ // $data['$contact.phone'] = ['value' => $contact->phone, 'label' => ctrans('texts.phone')];
- $data['$contact.name'] = ['value' => isset($contact) ? $contact->present()->name() : 'no contact name on record', 'label' => ctrans('texts.contact_name')];
- $data['$contact.first_name'] = ['value' => isset($contact) ? $contact->first_name : '', 'label' => ctrans('texts.first_name')];
- $data['$contact.last_name'] = ['value' => isset($contact) ? $contact->last_name : '', 'label' => ctrans('texts.last_name')];
- $data['$contact.custom1'] = ['value' => isset($contact) ? $contact->custom_value1 : ' ', 'label' => $this->makeCustomField('contact1')];
- $data['$contact.custom2'] = ['value' => isset($contact) ? $contact->custom_value2 : ' ', 'label' => $this->makeCustomField('contact1')];
- $data['$contact.custom3'] = ['value' => isset($contact) ? $contact->custom_value3 : ' ', 'label' => $this->makeCustomField('contact1')];
- $data['$contact.custom4'] = ['value' => isset($contact) ? $contact->custom_value4 : ' ', 'label' => $this->makeCustomField('contact1')];
+ // $data['$contact.name'] = ['value' => isset($contact) ? $contact->present()->name() : 'no contact name on record', 'label' => ctrans('texts.contact_name')];
+ // $data['$contact.first_name'] = ['value' => isset($contact) ? $contact->first_name : '', 'label' => ctrans('texts.first_name')];
+ // $data['$contact.last_name'] = ['value' => isset($contact) ? $contact->last_name : '', 'label' => ctrans('texts.last_name')];
+ // $data['$contact.custom1'] = ['value' => isset($contact) ? $contact->custom_value1 : ' ', 'label' => $this->makeCustomField('contact1')];
+ // $data['$contact.custom2'] = ['value' => isset($contact) ? $contact->custom_value2 : ' ', 'label' => $this->makeCustomField('contact1')];
+ // $data['$contact.custom3'] = ['value' => isset($contact) ? $contact->custom_value3 : ' ', 'label' => $this->makeCustomField('contact1')];
+ // $data['$contact.custom4'] = ['value' => isset($contact) ? $contact->custom_value4 : ' ', 'label' => $this->makeCustomField('contact1')];
- $data['$company.city_state_postal'] = ['value' => $this->company->present()->cityStateZip($settings->city, $settings->state, $settings->postal_code, false) ?: ' ', 'label' => ctrans('texts.city_state_postal')];
- $data['$company.postal_city_state'] = ['value' => $this->company->present()->cityStateZip($settings->city, $settings->state, $settings->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city_state')];
- $data['$company.name'] = ['value' => $this->company->present()->name() ?: ' ', 'label' => ctrans('texts.company_name')];
- $data['$company.address1'] = ['value' => $settings->address1 ?: ' ', 'label' => ctrans('texts.address1')];
- $data['$company.address2'] = ['value' => $settings->address2 ?: ' ', 'label' => ctrans('texts.address2')];
- $data['$company.city'] = ['value' => $settings->city ?: ' ', 'label' => ctrans('texts.city')];
- $data['$company.state'] = ['value' => $settings->state ?: ' ', 'label' => ctrans('texts.state')];
- $data['$company.postal_code'] = ['value' => $settings->postal_code ?: ' ', 'label' => ctrans('texts.postal_code')];
- $data['$company.country'] = ['value' => Country::find($settings->country_id)->first()->name ?: ' ', 'label' => ctrans('texts.country')];
- $data['$company.phone'] = ['value' => $settings->phone ?: ' ', 'label' => ctrans('texts.phone')];
- $data['$company.email'] = ['value' => $settings->email ?: ' ', 'label' => ctrans('texts.email')];
- $data['$company.vat_number'] = ['value' => $settings->vat_number ?: ' ', 'label' => ctrans('texts.vat_number')];
- $data['$company.id_number'] = ['value' => $settings->id_number ?: ' ', 'label' => ctrans('texts.id_number')];
- $data['$company.website'] = ['value' => $settings->website ?: ' ', 'label' => ctrans('texts.website')];
- $data['$company.address'] = ['value' => $this->company->present()->address($settings) ?: ' ', 'label' => ctrans('texts.address')];
+ // $data['$company.city_state_postal'] = ['value' => $this->company->present()->cityStateZip($settings->city, $settings->state, $settings->postal_code, false) ?: ' ', 'label' => ctrans('texts.city_state_postal')];
+ // $data['$company.postal_city_state'] = ['value' => $this->company->present()->cityStateZip($settings->city, $settings->state, $settings->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city_state')];
+ // $data['$company.name'] = ['value' => $this->company->present()->name() ?: ' ', 'label' => ctrans('texts.company_name')];
+ // $data['$company.address1'] = ['value' => $settings->address1 ?: ' ', 'label' => ctrans('texts.address1')];
+ // $data['$company.address2'] = ['value' => $settings->address2 ?: ' ', 'label' => ctrans('texts.address2')];
+ // $data['$company.city'] = ['value' => $settings->city ?: ' ', 'label' => ctrans('texts.city')];
+ // $data['$company.state'] = ['value' => $settings->state ?: ' ', 'label' => ctrans('texts.state')];
+ // $data['$company.postal_code'] = ['value' => $settings->postal_code ?: ' ', 'label' => ctrans('texts.postal_code')];
+ // $data['$company.country'] = ['value' => Country::find($settings->country_id)->first()->name ?: ' ', 'label' => ctrans('texts.country')];
+ // $data['$company.phone'] = ['value' => $settings->phone ?: ' ', 'label' => ctrans('texts.phone')];
+ // $data['$company.email'] = ['value' => $settings->email ?: ' ', 'label' => ctrans('texts.email')];
+ // $data['$company.vat_number'] = ['value' => $settings->vat_number ?: ' ', 'label' => ctrans('texts.vat_number')];
+ // $data['$company.id_number'] = ['value' => $settings->id_number ?: ' ', 'label' => ctrans('texts.id_number')];
+ // $data['$company.website'] = ['value' => $settings->website ?: ' ', 'label' => ctrans('texts.website')];
+ // $data['$company.address'] = ['value' => $this->company->present()->address($settings) ?: ' ', 'label' => ctrans('texts.address')];
- $logo = $this->company->present()->logo($settings);
+ // $logo = $this->company->present()->logo($settings);
- $data['$company.logo'] = ['value' => "
" ?: ' ', 'label' => ctrans('texts.logo')];
- $data['$company_logo'] = &$data['$company.logo'];
- $data['$company1'] = ['value' => $settings->custom_value1 ?: ' ', 'label' => $this->makeCustomField('company1')];
- $data['$company2'] = ['value' => $settings->custom_value2 ?: ' ', 'label' => $this->makeCustomField('company2')];
- $data['$company3'] = ['value' => $settings->custom_value3 ?: ' ', 'label' => $this->makeCustomField('company3')];
- $data['$company4'] = ['value' => $settings->custom_value4 ?: ' ', 'label' => $this->makeCustomField('company4')];
+ // $data['$company.logo'] = ['value' => "" ?: ' ', 'label' => ctrans('texts.logo')];
+ // $data['$company_logo'] = &$data['$company.logo'];
+ // $data['$company1'] = ['value' => $settings->custom_value1 ?: ' ', 'label' => $this->makeCustomField('company1')];
+ // $data['$company2'] = ['value' => $settings->custom_value2 ?: ' ', 'label' => $this->makeCustomField('company2')];
+ // $data['$company3'] = ['value' => $settings->custom_value3 ?: ' ', 'label' => $this->makeCustomField('company3')];
+ // $data['$company4'] = ['value' => $settings->custom_value4 ?: ' ', 'label' => $this->makeCustomField('company4')];
- $data['$custom_surcharge1'] = ['value' => $this->custom_surcharge1, 'label' => $this->makeCustomField('custom_surcharge1')];
- $data['$custom_surcharge2'] = ['value' => $this->custom_surcharge2, 'label' => $this->makeCustomField('custom_surcharge2')];
- $data['$custom_surcharge3'] = ['value' => $this->custom_surcharge3, 'label' => $this->makeCustomField('custom_surcharge3')];
- $data['$custom_surcharge4'] = ['value' => $this->custom_surcharge4, 'label' => $this->makeCustomField('custom_surcharge4')];
+ // $data['$custom_surcharge1'] = ['value' => $this->custom_surcharge1, 'label' => $this->makeCustomField('custom_surcharge1')];
+ // $data['$custom_surcharge2'] = ['value' => $this->custom_surcharge2, 'label' => $this->makeCustomField('custom_surcharge2')];
+ // $data['$custom_surcharge3'] = ['value' => $this->custom_surcharge3, 'label' => $this->makeCustomField('custom_surcharge3')];
+ // $data['$custom_surcharge4'] = ['value' => $this->custom_surcharge4, 'label' => $this->makeCustomField('custom_surcharge4')];
- $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')];
- $data['$product.notes'] = ['value' => '', 'label' => ctrans('texts.notes')];
- $data['$product.cost'] = ['value' => '', 'label' => ctrans('texts.cost')];
- $data['$product.quantity'] = ['value' => '', 'label' => ctrans('texts.quantity')];
- $data['$product.tax_name1'] = ['value' => '', 'label' => ctrans('texts.tax')];
- $data['$product.tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
- $data['$product.tax_name2'] = ['value' => '', 'label' => ctrans('texts.tax')];
- $data['$product.tax_name3'] = ['value' => '', 'label' => ctrans('texts.tax')];
- $data['$product.line_total'] = ['value' => '', 'label' => ctrans('texts.line_total')];
+ // $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')];
+ // $data['$product.notes'] = ['value' => '', 'label' => ctrans('texts.notes')];
+ // $data['$product.cost'] = ['value' => '', 'label' => ctrans('texts.cost')];
+ // $data['$product.quantity'] = ['value' => '', 'label' => ctrans('texts.quantity')];
+ // $data['$product.tax_name1'] = ['value' => '', 'label' => ctrans('texts.tax')];
+ // $data['$product.tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
+ // $data['$product.tax_name2'] = ['value' => '', 'label' => ctrans('texts.tax')];
+ // $data['$product.tax_name3'] = ['value' => '', 'label' => ctrans('texts.tax')];
+ // $data['$product.line_total'] = ['value' => '', 'label' => ctrans('texts.line_total')];
- $data['$task.date'] = ['value' => '', 'label' => ctrans('texts.date')];
- $data['$task.discount'] = ['value' => '', 'label' => ctrans('texts.discount')];
- $data['$task.product_key'] = ['value' => '', 'label' => ctrans('texts.product_key')];
- $data['$task.notes'] = ['value' => '', 'label' => ctrans('texts.notes')];
- $data['$task.cost'] = ['value' => '', 'label' => ctrans('texts.cost')];
- $data['$task.quantity'] = ['value' => '', 'label' => ctrans('texts.quantity')];
- $data['$task.tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
- $data['$task.tax_name1'] = ['value' => '', 'label' => ctrans('texts.tax')];
- $data['$task.tax_name2'] = ['value' => '', 'label' => ctrans('texts.tax')];
- $data['$task.tax_name3'] = ['value' => '', 'label' => ctrans('texts.tax')];
- $data['$task.line_total'] = ['value' => '', 'label' => ctrans('texts.line_total')];
- //$data['$contact.signature']
+ // $data['$task.date'] = ['value' => '', 'label' => ctrans('texts.date')];
+ // $data['$task.discount'] = ['value' => '', 'label' => ctrans('texts.discount')];
+ // $data['$task.product_key'] = ['value' => '', 'label' => ctrans('texts.product_key')];
+ // $data['$task.notes'] = ['value' => '', 'label' => ctrans('texts.notes')];
+ // $data['$task.cost'] = ['value' => '', 'label' => ctrans('texts.cost')];
+ // $data['$task.quantity'] = ['value' => '', 'label' => ctrans('texts.quantity')];
+ // $data['$task.tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
+ // $data['$task.tax_name1'] = ['value' => '', 'label' => ctrans('texts.tax')];
+ // $data['$task.tax_name2'] = ['value' => '', 'label' => ctrans('texts.tax')];
+ // $data['$task.tax_name3'] = ['value' => '', 'label' => ctrans('texts.tax')];
+ // $data['$task.line_total'] = ['value' => '', 'label' => ctrans('texts.line_total')];
+ // //$data['$contact.signature']
- // $data['custom_label1'] = ['value' => '', 'label' => ctrans('texts.')];
- // $data['custom_label2'] = ['value' => '', 'label' => ctrans('texts.')];
- // $data['custom_label3'] = ['value' => '', 'label' => ctrans('texts.')];
- // $data['custom_label4'] = ['value' => '', 'label' => ctrans('texts.')];
- //$data['$blank'] = ;
- //$data['$surcharge'] = ;
- /*
- $data['$tax_invoice'] =
- $data['$tax_quote'] =
- $data['$statement'] = ;
- $data['$statement_date'] = ;
- $data['$your_statement'] = ;
- $data['$statement_issued_to'] = ;
- $data['$statement_to'] = ;
- $data['$credit_note'] = ;
- $data['$credit_date'] = ;
- $data['$credit_issued_to'] = ;
- $data['$credit_to'] = ;
- $data['$your_credit'] = ;
- $data['$phone'] = ;
+ // // $data['custom_label1'] = ['value' => '', 'label' => ctrans('texts.')];
+ // // $data['custom_label2'] = ['value' => '', 'label' => ctrans('texts.')];
+ // // $data['custom_label3'] = ['value' => '', 'label' => ctrans('texts.')];
+ // // $data['custom_label4'] = ['value' => '', 'label' => ctrans('texts.')];
+ // //$data['$blank'] = ;
+ // //$data['$surcharge'] = ;
+ // /*
+ // $data['$tax_invoice'] =
+ // $data['$tax_quote'] =
+ // $data['$statement'] = ;
+ // $data['$statement_date'] = ;
+ // $data['$your_statement'] = ;
+ // $data['$statement_issued_to'] = ;
+ // $data['$statement_to'] = ;
+ // $data['$credit_note'] = ;
+ // $data['$credit_date'] = ;
+ // $data['$credit_issued_to'] = ;
+ // $data['$credit_to'] = ;
+ // $data['$your_credit'] = ;
+ // $data['$phone'] = ;
- $data['$outstanding'] = ;
- $data['$invoice_due_date'] = ;
- $data['$quote_due_date'] = ;
- $data['$service'] = ;
- $data['$product_key'] = ;
- $data['$unit_cost'] = ;
- $data['$custom_value1'] = ;
- $data['$custom_value2'] = ;
- $data['$delivery_note'] = ;
- $data['$date'] = ;
- $data['$method'] = ;
- $data['$payment_date'] = ;
- $data['$reference'] = ;
- $data['$amount'] = ;
- $data['$amount_paid'] =;
- */
+ // $data['$outstanding'] = ;
+ // $data['$invoice_due_date'] = ;
+ // $data['$quote_due_date'] = ;
+ // $data['$service'] = ;
+ // $data['$product_key'] = ;
+ // $data['$unit_cost'] = ;
+ // $data['$custom_value1'] = ;
+ // $data['$custom_value2'] = ;
+ // $data['$delivery_note'] = ;
+ // $data['$date'] = ;
+ // $data['$method'] = ;
+ // $data['$payment_date'] = ;
+ // $data['$reference'] = ;
+ // $data['$amount'] = ;
+ // $data['$amount_paid'] =;
+ // */
- $arrKeysLength = array_map('strlen', array_keys($data));
- array_multisort($arrKeysLength, SORT_DESC, $data);
+ // $arrKeysLength = array_map('strlen', array_keys($data));
+ // array_multisort($arrKeysLength, SORT_DESC, $data);
- return $data;
- }
+ // return $data;
+ // }
/**
* V2 of building a table header for PDFs.
diff --git a/app/Utils/Traits/MakesReminders.php b/app/Utils/Traits/MakesReminders.php
index 262e5050813d..51aaeb5c399f 100644
--- a/app/Utils/Traits/MakesReminders.php
+++ b/app/Utils/Traits/MakesReminders.php
@@ -11,6 +11,7 @@
namespace App\Utils\Traits;
+use App\Models\RecurringInvoice;
use Illuminate\Support\Carbon;
/**
@@ -181,7 +182,7 @@ trait MakesReminders
}
}
- public function calculateTemplate(): string
+ public function calculateTemplate(string $entity_string): string
{
//if invoice is currently a draft, or being marked as sent, this will be the initial email
$client = $this->client;
@@ -202,10 +203,58 @@ trait MakesReminders
$client->getSetting('num_days_reminder3')
)) {
return 'reminder3';
- } else {
- return 'invoice';
+ } elseif($client->getSetting('enable_reminder_endless') !== false && $this->checkEndlessReminder(
+ $this->last_sent_date,
+ $client->getSetting('endless_reminder_frequency_id')
+ )){
+ return 'endless_reminder';
+ }
+ else {
+ return $entity_string;
}
//also implement endless reminders here
}
+
+ private function checkEndlessReminder($last_sent_date, $endless_reminder_frequency_id) :bool
+ {
+ if(Carbon::now()->startOfDay()->eq($this->addTimeInterval($endless_reminder_frequency_id)))
+ return true;
+
+ return false;
+ }
+
+ private function addTimeInterval($endless_reminder_frequency_id) :?Carbon
+ {
+ if(!$this->next_send_date){
+ return null;
+ }
+
+ switch ($endless_reminder_frequency_id) {
+ case RecurringInvoice::FREQUENCY_WEEKLY:
+ return Carbon::parse($this->next_send_date)->addWeek()->startOfDay();
+ case RecurringInvoice::FREQUENCY_TWO_WEEKS:
+ return Carbon::parse($this->next_send_date)->addWeeks(2)->startOfDay();
+ case RecurringInvoice::FREQUENCY_FOUR_WEEKS:
+ return Carbon::parse($this->next_send_date)->addWeeks(4)->startOfDay();
+ case RecurringInvoice::FREQUENCY_MONTHLY:
+ return Carbon::parse($this->next_send_date)->addMonthNoOverflow()->startOfDay();
+ case RecurringInvoice::FREQUENCY_TWO_MONTHS:
+ return Carbon::parse($this->next_send_date)->addMonthsNoOverflow(2)->startOfDay();
+ case RecurringInvoice::FREQUENCY_THREE_MONTHS:
+ return Carbon::parse($this->next_send_date)->addMonthsNoOverflow(3)->startOfDay();
+ case RecurringInvoice::FREQUENCY_FOUR_MONTHS:
+ return Carbon::parse($this->next_send_date)->addMonthsNoOverflow(4)->startOfDay();
+ case RecurringInvoice::FREQUENCY_SIX_MONTHS:
+ return Carbon::parse($this->next_send_date)->addMonthsNoOverflow(6)->startOfDay();
+ case RecurringInvoice::FREQUENCY_ANNUALLY:
+ return Carbon::parse($this->next_send_date)->addYear()->startOfDay();
+ case RecurringInvoice::FREQUENCY_TWO_YEARS:
+ return Carbon::parse($this->next_send_date)->addYears(2)->startOfDay();
+ case RecurringInvoice::FREQUENCY_THREE_YEARS:
+ return Carbon::parse($this->next_send_date)->addYears(3)->startOfDay();
+ default:
+ return null;
+ }
+ }
}
diff --git a/app/Utils/Traits/PaymentEmailBuilder.php b/app/Utils/Traits/PaymentEmailBuilder.php
index 825dbcf956b0..d739aea896ec 100644
--- a/app/Utils/Traits/PaymentEmailBuilder.php
+++ b/app/Utils/Traits/PaymentEmailBuilder.php
@@ -67,7 +67,7 @@ trait PaymentEmailBuilder
private function parseTemplate(string $template_data, bool $is_markdown, $contact) :string
{
- $invoice_variables = $this->makeValues($contact);
+ //$invoice_variables = $this->makeValues($contact);
//process variables
//$data = str_replace(array_keys($invoice_variables), array_values($invoice_variables), $template_data);
diff --git a/app/Utils/Traits/QuoteEmailBuilder.php b/app/Utils/Traits/QuoteEmailBuilder.php
index 851c6544e65a..b31f7a3c771c 100644
--- a/app/Utils/Traits/QuoteEmailBuilder.php
+++ b/app/Utils/Traits/QuoteEmailBuilder.php
@@ -33,7 +33,7 @@ trait QuoteEmailBuilder
//$client = $this->client;
if (! $reminder_template) {
- $reminder_template = $this->calculateTemplate();
+ $reminder_template = $this->calculateTemplate('quote');
}
//Need to determine which email template we are producing
@@ -75,7 +75,7 @@ trait QuoteEmailBuilder
private function parseTemplate(string $template_data, bool $is_markdown, $contact) :string
{
- $quote_variables = $this->makeValues($contact);
+ // $quote_variables = $this->makeValues($contact);
//process variables
// $data = str_replace(array_keys($quote_variables), array_values($quote_variables), $template_data);
diff --git a/composer.json b/composer.json
index 9fc290fc3d51..1508529e0b2d 100644
--- a/composer.json
+++ b/composer.json
@@ -27,12 +27,11 @@
"php": ">=7.3",
"ext-json": "*",
"asgrim/ofxparser": "^1.2",
- "checkout/checkout-sdk-php": "^1.0",
"authorizenet/authorizenet": "^2.0",
+ "checkout/checkout-sdk-php": "^1.0",
"cleverit/ubl_invoice": "^1.3",
"composer/composer": "^1.10",
"czproject/git-php": "^3.17",
- "turbo124/laravel-gmail": "^5.0",
"doctrine/dbal": "^2.10",
"fedeisas/laravel-mail-css-inliner": "^3",
"fideloper/proxy": "^4.2",
@@ -46,6 +45,7 @@
"laravel/slack-notification-channel": "^2.2",
"laravel/socialite": "^5",
"laravel/tinker": "^2.0",
+ "laravel/ui": "^3.0",
"league/flysystem-aws-s3-v3": "~1.0",
"league/flysystem-cached-adapter": "^1.1",
"league/fractal": "^0.17.0",
@@ -60,8 +60,8 @@
"staudenmeir/eloquent-has-many-deep": "^1.11",
"stripe/stripe-php": "^7.50",
"turbo124/beacon": "^1",
- "webpatser/laravel-countries": "dev-master#75992ad",
- "laravel/ui": "^3.0"
+ "turbo124/laravel-gmail": "^5.0",
+ "webpatser/laravel-countries": "dev-master#75992ad"
},
"require-dev": {
"anahkiasen/former": "^4.2",
@@ -74,6 +74,7 @@
"mockery/mockery": "^1.3.1",
"nunomaduro/collision": "^5.0",
"phpunit/phpunit": "^9.0",
+ "vimeo/psalm": "^4.0",
"wildbit/postmark-php": "^4.0"
},
"autoload": {
diff --git a/composer.lock b/composer.lock
index 0a02725a325c..b13bd824bad7 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": "4e8c7362624672e8b578e7eb18fc9287",
+ "content-hash": "5055049d1f5fa8418925b54a94265526",
"packages": [
{
"name": "asgrim/ofxparser",
@@ -60,6 +60,10 @@
"open financial exchange",
"parser"
],
+ "support": {
+ "issues": "https://github.com/asgrim/ofxparser/issues",
+ "source": "https://github.com/asgrim/ofxparser/tree/master"
+ },
"abandoned": true,
"time": "2018-10-29T10:10:13+00:00"
},
@@ -104,20 +108,24 @@
"ecommerce",
"payment"
],
+ "support": {
+ "issues": "https://github.com/AuthorizeNet/sdk-php/issues",
+ "source": "https://github.com/AuthorizeNet/sdk-php/tree/master"
+ },
"time": "2019-01-14T13:32:41+00:00"
},
{
"name": "aws/aws-sdk-php",
- "version": "3.158.4",
+ "version": "3.158.14",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
- "reference": "c0c0df79edc0a646a7ccd6b2e8d1723ff4ba88e2"
+ "reference": "8eb1bfc65424c40e4d66d6ec71f5add6d91993b4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c0c0df79edc0a646a7ccd6b2e8d1723ff4ba88e2",
- "reference": "c0c0df79edc0a646a7ccd6b2e8d1723ff4ba88e2",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/8eb1bfc65424c40e4d66d6ec71f5add6d91993b4",
+ "reference": "8eb1bfc65424c40e4d66d6ec71f5add6d91993b4",
"shasum": ""
},
"require": {
@@ -189,7 +197,12 @@
"s3",
"sdk"
],
- "time": "2020-10-07T18:12:22+00:00"
+ "support": {
+ "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
+ "issues": "https://github.com/aws/aws-sdk-php/issues",
+ "source": "https://github.com/aws/aws-sdk-php/tree/3.158.14"
+ },
+ "time": "2020-10-26T18:18:44+00:00"
},
{
"name": "brick/math",
@@ -235,6 +248,10 @@
"brick",
"math"
],
+ "support": {
+ "issues": "https://github.com/brick/math/issues",
+ "source": "https://github.com/brick/math/tree/master"
+ },
"funding": [
{
"url": "https://tidelift.com/funding/github/packagist/brick/math",
@@ -245,16 +262,16 @@
},
{
"name": "checkout/checkout-sdk-php",
- "version": "1.0.12",
+ "version": "1.0.13",
"source": {
"type": "git",
"url": "https://github.com/checkout/checkout-sdk-php.git",
- "reference": "980b10922979380293251627a11b991f36fd646a"
+ "reference": "298dd700cbdffb0f66a81628737136be44c3c53c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/checkout/checkout-sdk-php/zipball/980b10922979380293251627a11b991f36fd646a",
- "reference": "980b10922979380293251627a11b991f36fd646a",
+ "url": "https://api.github.com/repos/checkout/checkout-sdk-php/zipball/298dd700cbdffb0f66a81628737136be44c3c53c",
+ "reference": "298dd700cbdffb0f66a81628737136be44c3c53c",
"shasum": ""
},
"require": {
@@ -296,7 +313,11 @@
"php",
"sdk"
],
- "time": "2020-09-24T17:26:52+00:00"
+ "support": {
+ "issues": "https://github.com/checkout/checkout-sdk-php/issues",
+ "source": "https://github.com/checkout/checkout-sdk-php/tree/1.0.13"
+ },
+ "time": "2020-10-12T13:00:31+00:00"
},
{
"name": "cleverit/ubl_invoice",
@@ -351,6 +372,10 @@
"xml",
"xml invoice"
],
+ "support": {
+ "issues": "https://github.com/CleverIT/UBL_invoice/issues",
+ "source": "https://github.com/CleverIT/UBL_invoice/tree/v1.3.0"
+ },
"time": "2019-02-05T13:34:30+00:00"
},
{
@@ -403,6 +428,10 @@
"stream_filter_append",
"stream_filter_register"
],
+ "support": {
+ "issues": "https://github.com/clue/php-stream-filter/issues",
+ "source": "https://github.com/clue/php-stream-filter/tree/v1.5.0"
+ },
"funding": [
{
"url": "https://clue.engineering/support",
@@ -469,6 +498,11 @@
"ssl",
"tls"
],
+ "support": {
+ "irc": "irc://irc.freenode.org/composer",
+ "issues": "https://github.com/composer/ca-bundle/issues",
+ "source": "https://github.com/composer/ca-bundle/tree/1.2.8"
+ },
"funding": [
{
"url": "https://packagist.com",
@@ -487,16 +521,16 @@
},
{
"name": "composer/composer",
- "version": "1.10.13",
+ "version": "1.10.16",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
- "reference": "47c841ba3b2d3fc0b4b13282cf029ea18b66d78b"
+ "reference": "217f0272673c72087862c40cf91ac07eb438d778"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/composer/zipball/47c841ba3b2d3fc0b4b13282cf029ea18b66d78b",
- "reference": "47c841ba3b2d3fc0b4b13282cf029ea18b66d78b",
+ "url": "https://api.github.com/repos/composer/composer/zipball/217f0272673c72087862c40cf91ac07eb438d778",
+ "reference": "217f0272673c72087862c40cf91ac07eb438d778",
"shasum": ""
},
"require": {
@@ -563,6 +597,11 @@
"dependency",
"package"
],
+ "support": {
+ "irc": "irc://irc.freenode.org/composer",
+ "issues": "https://github.com/composer/composer/issues",
+ "source": "https://github.com/composer/composer/tree/1.10.16"
+ },
"funding": [
{
"url": "https://packagist.com",
@@ -577,7 +616,7 @@
"type": "tidelift"
}
],
- "time": "2020-09-09T09:46:34+00:00"
+ "time": "2020-10-24T07:55:59+00:00"
},
{
"name": "composer/package-versions-deprecated",
@@ -632,6 +671,10 @@
}
],
"description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
+ "support": {
+ "issues": "https://github.com/composer/package-versions-deprecated/issues",
+ "source": "https://github.com/composer/package-versions-deprecated/tree/master"
+ },
"funding": [
{
"url": "https://packagist.com",
@@ -707,6 +750,11 @@
"validation",
"versioning"
],
+ "support": {
+ "irc": "irc://irc.freenode.org/composer",
+ "issues": "https://github.com/composer/semver/issues",
+ "source": "https://github.com/composer/semver/tree/1.7.1"
+ },
"funding": [
{
"url": "https://packagist.com",
@@ -781,6 +829,11 @@
"spdx",
"validator"
],
+ "support": {
+ "irc": "irc://irc.freenode.org/composer",
+ "issues": "https://github.com/composer/spdx-licenses/issues",
+ "source": "https://github.com/composer/spdx-licenses/tree/1.5.4"
+ },
"funding": [
{
"url": "https://packagist.com",
@@ -799,16 +852,16 @@
},
{
"name": "composer/xdebug-handler",
- "version": "1.4.3",
+ "version": "1.4.4",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
- "reference": "ebd27a9866ae8254e873866f795491f02418c5a5"
+ "reference": "6e076a124f7ee146f2487554a94b6a19a74887ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ebd27a9866ae8254e873866f795491f02418c5a5",
- "reference": "ebd27a9866ae8254e873866f795491f02418c5a5",
+ "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6e076a124f7ee146f2487554a94b6a19a74887ba",
+ "reference": "6e076a124f7ee146f2487554a94b6a19a74887ba",
"shasum": ""
},
"require": {
@@ -839,6 +892,11 @@
"Xdebug",
"performance"
],
+ "support": {
+ "irc": "irc://irc.freenode.org/composer",
+ "issues": "https://github.com/composer/xdebug-handler/issues",
+ "source": "https://github.com/composer/xdebug-handler/tree/1.4.4"
+ },
"funding": [
{
"url": "https://packagist.com",
@@ -853,7 +911,7 @@
"type": "tidelift"
}
],
- "time": "2020-08-19T10:27:58+00:00"
+ "time": "2020-10-24T12:39:10+00:00"
},
{
"name": "czproject/git-php",
@@ -895,6 +953,10 @@
"keywords": [
"git"
],
+ "support": {
+ "issues": "https://github.com/czproject/git-php/issues",
+ "source": "https://github.com/czproject/git-php/tree/v3.18.1"
+ },
"time": "2020-07-03T08:02:12+00:00"
},
{
@@ -928,6 +990,10 @@
"MIT"
],
"description": "implementation of xdg base directory specification for php",
+ "support": {
+ "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues",
+ "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1"
+ },
"time": "2019-12-04T15:06:13+00:00"
},
{
@@ -1010,6 +1076,10 @@
"redis",
"xcache"
],
+ "support": {
+ "issues": "https://github.com/doctrine/cache/issues",
+ "source": "https://github.com/doctrine/cache/tree/1.10.x"
+ },
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
@@ -1028,33 +1098,32 @@
},
{
"name": "doctrine/dbal",
- "version": "2.11.1",
+ "version": "2.12.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "6e6903cd5e3a5be60a79439e3ee8fe126f78fe86"
+ "reference": "c6d37b4c42aaa3c3ee175f05eca68056f4185646"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/6e6903cd5e3a5be60a79439e3ee8fe126f78fe86",
- "reference": "6e6903cd5e3a5be60a79439e3ee8fe126f78fe86",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/c6d37b4c42aaa3c3ee175f05eca68056f4185646",
+ "reference": "c6d37b4c42aaa3c3ee175f05eca68056f4185646",
"shasum": ""
},
"require": {
"doctrine/cache": "^1.0",
"doctrine/event-manager": "^1.0",
"ext-pdo": "*",
- "php": "^7.3"
+ "php": "^7.3 || ^8"
},
"require-dev": {
"doctrine/coding-standard": "^8.1",
"jetbrains/phpstorm-stubs": "^2019.1",
- "nikic/php-parser": "^4.4",
"phpstan/phpstan": "^0.12.40",
- "phpunit/phpunit": "^9.3",
+ "phpunit/phpunit": "^9.4",
"psalm/plugin-phpunit": "^0.10.0",
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
- "vimeo/psalm": "^3.14.2"
+ "vimeo/psalm": "^3.17.2"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -1118,6 +1187,10 @@
"sqlserver",
"sqlsrv"
],
+ "support": {
+ "issues": "https://github.com/doctrine/dbal/issues",
+ "source": "https://github.com/doctrine/dbal/tree/2.12.0"
+ },
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
@@ -1132,7 +1205,7 @@
"type": "tidelift"
}
],
- "time": "2020-09-27T04:09:41+00:00"
+ "time": "2020-10-22T17:26:24+00:00"
},
{
"name": "doctrine/event-manager",
@@ -1208,6 +1281,10 @@
"event system",
"events"
],
+ "support": {
+ "issues": "https://github.com/doctrine/event-manager/issues",
+ "source": "https://github.com/doctrine/event-manager/tree/1.1.x"
+ },
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
@@ -1299,6 +1376,10 @@
"uppercase",
"words"
],
+ "support": {
+ "issues": "https://github.com/doctrine/inflector/issues",
+ "source": "https://github.com/doctrine/inflector/tree/2.0.x"
+ },
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
@@ -1375,6 +1456,10 @@
"parser",
"php"
],
+ "support": {
+ "issues": "https://github.com/doctrine/lexer/issues",
+ "source": "https://github.com/doctrine/lexer/tree/1.2.1"
+ },
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
@@ -1393,27 +1478,27 @@
},
{
"name": "dragonmantank/cron-expression",
- "version": "3.0.1",
+ "version": "v3.0.2",
"source": {
"type": "git",
"url": "https://github.com/dragonmantank/cron-expression.git",
- "reference": "fa4e95ff5a7f1d62c3fbc05c32729b7f3ca14b52"
+ "reference": "48212cdc0a79051d50d7fc2f0645c5a321caf926"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/fa4e95ff5a7f1d62c3fbc05c32729b7f3ca14b52",
- "reference": "fa4e95ff5a7f1d62c3fbc05c32729b7f3ca14b52",
+ "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/48212cdc0a79051d50d7fc2f0645c5a321caf926",
+ "reference": "48212cdc0a79051d50d7fc2f0645c5a321caf926",
"shasum": ""
},
"require": {
- "php": "^7.1"
+ "php": "^7.1|^8.0"
},
"replace": {
"mtdowling/cron-expression": "^1.0"
},
"require-dev": {
- "phpstan/phpstan": "^0.11",
- "phpunit/phpunit": "^6.4|^7.0"
+ "phpstan/phpstan": "^0.11|^0.12",
+ "phpunit/phpunit": "^7.0|^8.0|^9.0"
},
"type": "library",
"autoload": {
@@ -1437,13 +1522,17 @@
"cron",
"schedule"
],
+ "support": {
+ "issues": "https://github.com/dragonmantank/cron-expression/issues",
+ "source": "https://github.com/dragonmantank/cron-expression/tree/v3.0.2"
+ },
"funding": [
{
"url": "https://github.com/dragonmantank",
"type": "github"
}
],
- "time": "2020-08-21T02:30:13+00:00"
+ "time": "2020-10-13T01:26:01+00:00"
},
{
"name": "egulias/email-validator",
@@ -1501,6 +1590,10 @@
"validation",
"validator"
],
+ "support": {
+ "issues": "https://github.com/egulias/EmailValidator/issues",
+ "source": "https://github.com/egulias/EmailValidator/tree/2.1.22"
+ },
"time": "2020-09-26T15:48:38+00:00"
},
{
@@ -1557,28 +1650,32 @@
"laravel",
"mailer"
],
+ "support": {
+ "issues": "https://github.com/fedeisas/laravel-mail-css-inliner/issues",
+ "source": "https://github.com/fedeisas/laravel-mail-css-inliner/tree/3.1"
+ },
"time": "2020-09-12T05:00:14+00:00"
},
{
"name": "fideloper/proxy",
- "version": "4.4.0",
+ "version": "4.4.1",
"source": {
"type": "git",
"url": "https://github.com/fideloper/TrustedProxy.git",
- "reference": "9beebf48a1c344ed67c1d36bb1b8709db7c3c1a8"
+ "reference": "c073b2bd04d1c90e04dc1b787662b558dd65ade0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/9beebf48a1c344ed67c1d36bb1b8709db7c3c1a8",
- "reference": "9beebf48a1c344ed67c1d36bb1b8709db7c3c1a8",
+ "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/c073b2bd04d1c90e04dc1b787662b558dd65ade0",
+ "reference": "c073b2bd04d1c90e04dc1b787662b558dd65ade0",
"shasum": ""
},
"require": {
- "illuminate/contracts": "^5.0|^6.0|^7.0|^8.0",
+ "illuminate/contracts": "^5.0|^6.0|^7.0|^8.0|^9.0",
"php": ">=5.4.0"
},
"require-dev": {
- "illuminate/http": "^5.0|^6.0|^7.0|^8.0",
+ "illuminate/http": "^5.0|^6.0|^7.0|^8.0|^9.0",
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^6.0"
},
@@ -1611,7 +1708,11 @@
"proxy",
"trusted proxy"
],
- "time": "2020-06-23T01:36:47+00:00"
+ "support": {
+ "issues": "https://github.com/fideloper/TrustedProxy/issues",
+ "source": "https://github.com/fideloper/TrustedProxy/tree/4.4.1"
+ },
+ "time": "2020-10-22T13:48:01+00:00"
},
{
"name": "firebase/php-jwt",
@@ -1661,6 +1762,10 @@
"jwt",
"php"
],
+ "support": {
+ "issues": "https://github.com/firebase/php-jwt/issues",
+ "source": "https://github.com/firebase/php-jwt/tree/master"
+ },
"time": "2020-03-25T18:49:23+00:00"
},
{
@@ -1711,20 +1816,24 @@
"faker",
"fixtures"
],
+ "support": {
+ "issues": "https://github.com/fzaninotto/Faker/issues",
+ "source": "https://github.com/fzaninotto/Faker/tree/v1.9.1"
+ },
"time": "2019-12-12T13:22:17+00:00"
},
{
"name": "google/apiclient",
- "version": "v2.7.2",
+ "version": "v2.8.0",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-api-php-client.git",
- "reference": "9df720d72c59456b5466e3f66e1e78cfe422a5ba"
+ "reference": "cf9a070f9da78cd207a69b2a94832d381c8c4163"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/9df720d72c59456b5466e3f66e1e78cfe422a5ba",
- "reference": "9df720d72c59456b5466e3f66e1e78cfe422a5ba",
+ "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/cf9a070f9da78cd207a69b2a94832d381c8c4163",
+ "reference": "cf9a070f9da78cd207a69b2a94832d381c8c4163",
"shasum": ""
},
"require": {
@@ -1748,7 +1857,7 @@
"symfony/dom-crawler": "~2.1"
},
"suggest": {
- "cache/filesystem-adapter": "For caching certs and tokens (using Google_Client::setCache)"
+ "cache/filesystem-adapter": "For caching certs and tokens (using Google\\Client::setCache)"
},
"type": "library",
"extra": {
@@ -1757,11 +1866,14 @@
}
},
"autoload": {
- "psr-0": {
- "Google_": "src/"
+ "psr-4": {
+ "Google\\": "src/"
},
+ "files": [
+ "src/aliases.php"
+ ],
"classmap": [
- "src/Google/Service/"
+ "src/aliases.php"
]
},
"notification-url": "https://packagist.org/downloads/",
@@ -1773,20 +1885,24 @@
"keywords": [
"google"
],
- "time": "2020-09-18T20:02:04+00:00"
+ "support": {
+ "issues": "https://github.com/googleapis/google-api-php-client/issues",
+ "source": "https://github.com/googleapis/google-api-php-client/tree/v2.8.0"
+ },
+ "time": "2020-10-23T20:29:29+00:00"
},
{
"name": "google/apiclient-services",
- "version": "v0.149",
+ "version": "v0.152",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-api-php-client-services.git",
- "reference": "6a44aa8dc22b181594ba93c2ffb5d731c318c810"
+ "reference": "e1cc05269e852d62677387f831271ad984b245f8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/6a44aa8dc22b181594ba93c2ffb5d731c318c810",
- "reference": "6a44aa8dc22b181594ba93c2ffb5d731c318c810",
+ "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/e1cc05269e852d62677387f831271ad984b245f8",
+ "reference": "e1cc05269e852d62677387f831271ad984b245f8",
"shasum": ""
},
"require": {
@@ -1810,20 +1926,24 @@
"keywords": [
"google"
],
- "time": "2020-10-05T00:26:25+00:00"
+ "support": {
+ "issues": "https://github.com/googleapis/google-api-php-client-services/issues",
+ "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.152"
+ },
+ "time": "2020-10-25T00:25:04+00:00"
},
{
"name": "google/auth",
- "version": "v1.14.1",
+ "version": "v1.14.3",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-auth-library-php.git",
- "reference": "2df57c61c2fd739a15a81f792b1ccedc3e06d2b6"
+ "reference": "c1503299c779af0cbc99b43788f75930988852cf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/2df57c61c2fd739a15a81f792b1ccedc3e06d2b6",
- "reference": "2df57c61c2fd739a15a81f792b1ccedc3e06d2b6",
+ "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/c1503299c779af0cbc99b43788f75930988852cf",
+ "reference": "c1503299c779af0cbc99b43788f75930988852cf",
"shasum": ""
},
"require": {
@@ -1862,7 +1982,12 @@
"google",
"oauth2"
],
- "time": "2020-10-06T18:10:43+00:00"
+ "support": {
+ "docs": "https://googleapis.github.io/google-auth-library-php/master/",
+ "issues": "https://github.com/googleapis/google-auth-library-php/issues",
+ "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.14.3"
+ },
+ "time": "2020-10-16T21:33:48+00:00"
},
{
"name": "graham-campbell/result-type",
@@ -1914,6 +2039,10 @@
"Result-Type",
"result"
],
+ "support": {
+ "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
+ "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.0.1"
+ },
"funding": [
{
"url": "https://github.com/GrahamCampbell",
@@ -1928,23 +2057,23 @@
},
{
"name": "guzzlehttp/guzzle",
- "version": "7.1.1",
+ "version": "7.2.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "7427d6f99df41cc01f33cd59832f721c150ffdf3"
+ "reference": "0aa74dfb41ae110835923ef10a9d803a22d50e79"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7427d6f99df41cc01f33cd59832f721c150ffdf3",
- "reference": "7427d6f99df41cc01f33cd59832f721c150ffdf3",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0aa74dfb41ae110835923ef10a9d803a22d50e79",
+ "reference": "0aa74dfb41ae110835923ef10a9d803a22d50e79",
"shasum": ""
},
"require": {
"ext-json": "*",
- "guzzlehttp/promises": "^1.0",
- "guzzlehttp/psr7": "^1.6.1",
- "php": "^7.2.5",
+ "guzzlehttp/promises": "^1.4",
+ "guzzlehttp/psr7": "^1.7",
+ "php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0"
},
"provide": {
@@ -1952,8 +2081,8 @@
},
"require-dev": {
"ext-curl": "*",
- "php-http/client-integration-tests": "dev-phpunit8",
- "phpunit/phpunit": "^8.5.5",
+ "php-http/client-integration-tests": "^3.0",
+ "phpunit/phpunit": "^8.5.5 || ^9.3.5",
"psr/log": "^1.1"
},
"suggest": {
@@ -2004,6 +2133,10 @@
"rest",
"web service"
],
+ "support": {
+ "issues": "https://github.com/guzzle/guzzle/issues",
+ "source": "https://github.com/guzzle/guzzle/tree/7.2.0"
+ },
"funding": [
{
"url": "https://github.com/GrahamCampbell",
@@ -2022,7 +2155,7 @@
"type": "github"
}
],
- "time": "2020-09-30T08:51:17+00:00"
+ "time": "2020-10-10T11:47:56+00:00"
},
{
"name": "guzzlehttp/promises",
@@ -2073,6 +2206,10 @@
"keywords": [
"promise"
],
+ "support": {
+ "issues": "https://github.com/guzzle/promises/issues",
+ "source": "https://github.com/guzzle/promises/tree/1.4.0"
+ },
"time": "2020-09-30T07:37:28+00:00"
},
{
@@ -2144,6 +2281,10 @@
"uri",
"url"
],
+ "support": {
+ "issues": "https://github.com/guzzle/psr7/issues",
+ "source": "https://github.com/guzzle/psr7/tree/1.7.0"
+ },
"time": "2020-09-30T07:37:11+00:00"
},
{
@@ -2210,6 +2351,10 @@
"obfuscate",
"youtube"
],
+ "support": {
+ "issues": "https://github.com/vinkla/hashids/issues",
+ "source": "https://github.com/vinkla/hashids/tree/3.0.0"
+ },
"time": "2018-03-12T16:30:09+00:00"
},
{
@@ -2260,6 +2405,10 @@
"psr-17",
"psr-7"
],
+ "support": {
+ "issues": "https://github.com/http-interop/http-factory-guzzle/issues",
+ "source": "https://github.com/http-interop/http-factory-guzzle/tree/master"
+ },
"time": "2018-07-31T19:32:56+00:00"
},
{
@@ -2330,6 +2479,10 @@
"thumbnail",
"watermark"
],
+ "support": {
+ "issues": "https://github.com/Intervention/image/issues",
+ "source": "https://github.com/Intervention/image/tree/master"
+ },
"time": "2019-11-02T09:15:47+00:00"
},
{
@@ -2381,6 +2534,10 @@
"release",
"versions"
],
+ "support": {
+ "issues": "https://github.com/Jean85/pretty-package-versions/issues",
+ "source": "https://github.com/Jean85/pretty-package-versions/tree/1.5.1"
+ },
"time": "2020-09-14T08:43:34+00:00"
},
{
@@ -2447,6 +2604,10 @@
"json",
"schema"
],
+ "support": {
+ "issues": "https://github.com/justinrainbow/json-schema/issues",
+ "source": "https://github.com/justinrainbow/json-schema/tree/5.2.10"
+ },
"time": "2020-05-27T16:41:55+00:00"
},
{
@@ -2493,34 +2654,38 @@
"presenter",
"view"
],
+ "support": {
+ "issues": "https://github.com/laracasts/Presenter/issues",
+ "source": "https://github.com/laracasts/Presenter/tree/master"
+ },
"time": "2020-09-07T13:30:46+00:00"
},
{
"name": "laravel/framework",
- "version": "v8.9.0",
+ "version": "v8.11.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "8a6bf870bcfa1597e514a9c7ee6df44db98abb54"
+ "reference": "8d1f25fb8d124d5a24df9714ed8d481c43f9efe6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/8a6bf870bcfa1597e514a9c7ee6df44db98abb54",
- "reference": "8a6bf870bcfa1597e514a9c7ee6df44db98abb54",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/8d1f25fb8d124d5a24df9714ed8d481c43f9efe6",
+ "reference": "8d1f25fb8d124d5a24df9714ed8d481c43f9efe6",
"shasum": ""
},
"require": {
"doctrine/inflector": "^1.4|^2.0",
- "dragonmantank/cron-expression": "^3.0",
+ "dragonmantank/cron-expression": "^3.0.2",
"egulias/email-validator": "^2.1.10",
"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
"league/commonmark": "^1.3",
- "league/flysystem": "^1.0.34",
+ "league/flysystem": "^1.1",
"monolog/monolog": "^2.0",
- "nesbot/carbon": "^2.17",
- "opis/closure": "^3.5.3",
+ "nesbot/carbon": "^2.31",
+ "opis/closure": "^3.6",
"php": "^7.3",
"psr/container": "^1.0",
"psr/simple-cache": "^1.0",
@@ -2581,13 +2746,13 @@
"require-dev": {
"aws/aws-sdk-php": "^3.0",
"doctrine/dbal": "^2.6",
- "filp/whoops": "^2.4",
+ "filp/whoops": "^2.8",
"guzzlehttp/guzzle": "^6.5.5|^7.0.1",
"league/flysystem-cached-adapter": "^1.0",
- "mockery/mockery": "^1.3.1",
+ "mockery/mockery": "^1.4.2",
"orchestra/testbench-core": "^6.0",
"pda/pheanstalk": "^4.0",
- "phpunit/phpunit": "^8.4|^9.0",
+ "phpunit/phpunit": "^8.5.8|^9.3.3",
"predis/predis": "^1.1.1",
"symfony/cache": "^5.1"
},
@@ -2600,17 +2765,17 @@
"ext-pcntl": "Required to use all features of the queue worker.",
"ext-posix": "Required to use all features of the queue worker.",
"ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).",
- "filp/whoops": "Required for friendly error pages in development (^2.4).",
+ "filp/whoops": "Required for friendly error pages in development (^2.8).",
"fzaninotto/faker": "Required to use the eloquent factory builder (^1.9.1).",
"guzzlehttp/guzzle": "Required to use the HTTP Client, Mailgun mail driver and the ping methods on schedules (^6.5.5|^7.0.1).",
"laravel/tinker": "Required to use the tinker console command (^2.0).",
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
"league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
"league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
- "mockery/mockery": "Required to use mocking (^1.3.1).",
+ "mockery/mockery": "Required to use mocking (^1.4.2).",
"nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
"pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
- "phpunit/phpunit": "Required to use assertions and run tests (^8.4|^9.0).",
+ "phpunit/phpunit": "Required to use assertions and run tests (^8.5.8|^9.3.3).",
"predis/predis": "Required to use the predis connector (^1.1.2).",
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).",
@@ -2656,7 +2821,11 @@
"framework",
"laravel"
],
- "time": "2020-10-06T14:22:36+00:00"
+ "support": {
+ "issues": "https://github.com/laravel/framework/issues",
+ "source": "https://github.com/laravel/framework"
+ },
+ "time": "2020-10-20T20:12:53+00:00"
},
{
"name": "laravel/slack-notification-channel",
@@ -2713,20 +2882,24 @@
"notifications",
"slack"
],
+ "support": {
+ "issues": "https://github.com/laravel/slack-notification-channel/issues",
+ "source": "https://github.com/laravel/slack-notification-channel/tree/v2.2.0"
+ },
"time": "2020-08-25T18:21:34+00:00"
},
{
"name": "laravel/socialite",
- "version": "v5.0.1",
+ "version": "v5.0.3",
"source": {
"type": "git",
"url": "https://github.com/laravel/socialite.git",
- "reference": "61ad2b5f98e28f8e4e479851f8744b43ebbb9b46"
+ "reference": "8197acf2fe5446a2800b95d250c1da72fd6051bc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/socialite/zipball/61ad2b5f98e28f8e4e479851f8744b43ebbb9b46",
- "reference": "61ad2b5f98e28f8e4e479851f8744b43ebbb9b46",
+ "url": "https://api.github.com/repos/laravel/socialite/zipball/8197acf2fe5446a2800b95d250c1da72fd6051bc",
+ "reference": "8197acf2fe5446a2800b95d250c1da72fd6051bc",
"shasum": ""
},
"require": {
@@ -2778,7 +2951,11 @@
"laravel",
"oauth"
],
- "time": "2020-09-12T14:40:16+00:00"
+ "support": {
+ "issues": "https://github.com/laravel/socialite/issues",
+ "source": "https://github.com/laravel/socialite"
+ },
+ "time": "2020-10-21T12:45:02+00:00"
},
{
"name": "laravel/tinker",
@@ -2842,6 +3019,10 @@
"laravel",
"psysh"
],
+ "support": {
+ "issues": "https://github.com/laravel/tinker/issues",
+ "source": "https://github.com/laravel/tinker/tree/2.x"
+ },
"time": "2020-08-11T19:28:08+00:00"
},
{
@@ -2896,20 +3077,24 @@
"laravel",
"ui"
],
+ "support": {
+ "issues": "https://github.com/laravel/ui/issues",
+ "source": "https://github.com/laravel/ui/tree/v3.0.0"
+ },
"time": "2020-09-11T15:34:08+00:00"
},
{
"name": "league/commonmark",
- "version": "1.5.5",
+ "version": "1.5.6",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/commonmark.git",
- "reference": "45832dfed6007b984c0d40addfac48d403dc6432"
+ "reference": "a56e91e0fa1f6d0049153a9c34f63488f6b7ce61"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/45832dfed6007b984c0d40addfac48d403dc6432",
- "reference": "45832dfed6007b984c0d40addfac48d403dc6432",
+ "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/a56e91e0fa1f6d0049153a9c34f63488f6b7ce61",
+ "reference": "a56e91e0fa1f6d0049153a9c34f63488f6b7ce61",
"shasum": ""
},
"require": {
@@ -2965,6 +3150,12 @@
"md",
"parser"
],
+ "support": {
+ "docs": "https://commonmark.thephpleague.com/",
+ "issues": "https://github.com/thephpleague/commonmark/issues",
+ "rss": "https://github.com/thephpleague/commonmark/releases.atom",
+ "source": "https://github.com/thephpleague/commonmark"
+ },
"funding": [
{
"url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark",
@@ -2991,7 +3182,7 @@
"type": "tidelift"
}
],
- "time": "2020-09-13T14:44:46+00:00"
+ "time": "2020-10-17T21:33:03+00:00"
},
{
"name": "league/flysystem",
@@ -3076,6 +3267,10 @@
"sftp",
"storage"
],
+ "support": {
+ "issues": "https://github.com/thephpleague/flysystem/issues",
+ "source": "https://github.com/thephpleague/flysystem/tree/1.x"
+ },
"funding": [
{
"url": "https://offset.earth/frankdejonge",
@@ -3086,16 +3281,16 @@
},
{
"name": "league/flysystem-aws-s3-v3",
- "version": "1.0.28",
+ "version": "1.0.29",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
- "reference": "af7384a12f7cd7d08183390d930c9d0ec629c990"
+ "reference": "4e25cc0582a36a786c31115e419c6e40498f6972"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/af7384a12f7cd7d08183390d930c9d0ec629c990",
- "reference": "af7384a12f7cd7d08183390d930c9d0ec629c990",
+ "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/4e25cc0582a36a786c31115e419c6e40498f6972",
+ "reference": "4e25cc0582a36a786c31115e419c6e40498f6972",
"shasum": ""
},
"require": {
@@ -3129,7 +3324,11 @@
}
],
"description": "Flysystem adapter for the AWS S3 SDK v3.x",
- "time": "2020-08-22T08:43:01+00:00"
+ "support": {
+ "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues",
+ "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/1.0.29"
+ },
+ "time": "2020-10-08T18:58:37+00:00"
},
{
"name": "league/flysystem-cached-adapter",
@@ -3176,6 +3375,10 @@
}
],
"description": "An adapter decorator to enable meta-data caching.",
+ "support": {
+ "issues": "https://github.com/thephpleague/flysystem-cached-adapter/issues",
+ "source": "https://github.com/thephpleague/flysystem-cached-adapter/tree/master"
+ },
"time": "2020-07-25T15:56:04+00:00"
},
{
@@ -3240,6 +3443,10 @@
"league",
"rest"
],
+ "support": {
+ "issues": "https://github.com/thephpleague/fractal/issues",
+ "source": "https://github.com/thephpleague/fractal/tree/master"
+ },
"time": "2017-06-12T11:04:56+00:00"
},
{
@@ -3301,20 +3508,24 @@
"manipulation",
"processing"
],
+ "support": {
+ "issues": "https://github.com/thephpleague/glide/issues",
+ "source": "https://github.com/thephpleague/glide/tree/1.6.0"
+ },
"time": "2020-07-07T12:23:45+00:00"
},
{
"name": "league/mime-type-detection",
- "version": "1.5.0",
+ "version": "1.5.1",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/mime-type-detection.git",
- "reference": "ea2fbfc988bade315acd5967e6d02274086d0f28"
+ "reference": "353f66d7555d8a90781f6f5e7091932f9a4250aa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ea2fbfc988bade315acd5967e6d02274086d0f28",
- "reference": "ea2fbfc988bade315acd5967e6d02274086d0f28",
+ "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/353f66d7555d8a90781f6f5e7091932f9a4250aa",
+ "reference": "353f66d7555d8a90781f6f5e7091932f9a4250aa",
"shasum": ""
},
"require": {
@@ -3342,6 +3553,10 @@
}
],
"description": "Mime-type detection for Flysystem",
+ "support": {
+ "issues": "https://github.com/thephpleague/mime-type-detection/issues",
+ "source": "https://github.com/thephpleague/mime-type-detection/tree/1.5.1"
+ },
"funding": [
{
"url": "https://github.com/frankdejonge",
@@ -3352,7 +3567,7 @@
"type": "tidelift"
}
],
- "time": "2020-09-21T18:10:53+00:00"
+ "time": "2020-10-18T11:50:25+00:00"
},
{
"name": "league/oauth1-client",
@@ -3423,6 +3638,10 @@
"tumblr",
"twitter"
],
+ "support": {
+ "issues": "https://github.com/thephpleague/oauth1-client/issues",
+ "source": "https://github.com/thephpleague/oauth1-client/tree/v1.8.2"
+ },
"time": "2020-09-28T09:39:08+00:00"
},
{
@@ -3448,6 +3667,7 @@
"require-dev": {
"omnipay/tests": "^3"
},
+ "default-branch": true,
"type": "metapackage",
"extra": {
"branch-alias": {
@@ -3476,6 +3696,10 @@
"omnipay",
"payment"
],
+ "support": {
+ "issues": "https://github.com/thephpleague/omnipay/issues",
+ "source": "https://github.com/thephpleague/omnipay/tree/master"
+ },
"time": "2020-09-22T14:02:17+00:00"
},
{
@@ -3533,6 +3757,10 @@
}
],
"description": "A front-end framework for Laravel.",
+ "support": {
+ "issues": "https://github.com/livewire/livewire/issues",
+ "source": "https://github.com/livewire/livewire/tree/v1.3.5"
+ },
"funding": [
{
"url": "https://github.com/calebporzio",
@@ -3600,6 +3828,10 @@
"stream",
"zip"
],
+ "support": {
+ "issues": "https://github.com/maennchen/ZipStream-PHP/issues",
+ "source": "https://github.com/maennchen/ZipStream-PHP/tree/master"
+ },
"time": "2019-07-17T11:01:58+00:00"
},
{
@@ -3682,6 +3914,10 @@
"money",
"vo"
],
+ "support": {
+ "issues": "https://github.com/moneyphp/money/issues",
+ "source": "https://github.com/moneyphp/money/tree/master"
+ },
"time": "2020-03-18T17:49:59+00:00"
},
{
@@ -3763,6 +3999,10 @@
"logging",
"psr-3"
],
+ "support": {
+ "issues": "https://github.com/Seldaek/monolog/issues",
+ "source": "https://github.com/Seldaek/monolog/tree/2.1.1"
+ },
"funding": [
{
"url": "https://github.com/Seldaek",
@@ -3830,6 +4070,10 @@
"json",
"jsonpath"
],
+ "support": {
+ "issues": "https://github.com/jmespath/jmespath.php/issues",
+ "source": "https://github.com/jmespath/jmespath.php/tree/2.6.0"
+ },
"time": "2020-07-31T21:01:56+00:00"
},
{
@@ -3876,20 +4120,24 @@
"keywords": [
"enum"
],
+ "support": {
+ "issues": "https://github.com/myclabs/php-enum/issues",
+ "source": "https://github.com/myclabs/php-enum/tree/master"
+ },
"time": "2020-02-14T08:15:52+00:00"
},
{
"name": "nesbot/carbon",
- "version": "2.41.0",
+ "version": "2.41.5",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "8690b13ad4da6d54d692afea15aab30b36fee52e"
+ "reference": "c4a9caf97cfc53adfc219043bcecf42bc663acee"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8690b13ad4da6d54d692afea15aab30b36fee52e",
- "reference": "8690b13ad4da6d54d692afea15aab30b36fee52e",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/c4a9caf97cfc53adfc219043bcecf42bc663acee",
+ "reference": "c4a9caf97cfc53adfc219043bcecf42bc663acee",
"shasum": ""
},
"require": {
@@ -3955,6 +4203,10 @@
"datetime",
"time"
],
+ "support": {
+ "issues": "https://github.com/briannesbitt/Carbon/issues",
+ "source": "https://github.com/briannesbitt/Carbon"
+ },
"funding": [
{
"url": "https://opencollective.com/Carbon",
@@ -3965,7 +4217,7 @@
"type": "tidelift"
}
],
- "time": "2020-10-04T09:11:05+00:00"
+ "time": "2020-10-23T06:02:30+00:00"
},
{
"name": "nikic/php-parser",
@@ -4017,6 +4269,10 @@
"parser",
"php"
],
+ "support": {
+ "issues": "https://github.com/nikic/PHP-Parser/issues",
+ "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.2"
+ },
"time": "2020-09-26T10:30:38+00:00"
},
{
@@ -4088,6 +4344,10 @@
"nwidart",
"rad"
],
+ "support": {
+ "issues": "https://github.com/nWidart/laravel-modules/issues",
+ "source": "https://github.com/nWidart/laravel-modules/tree/master"
+ },
"time": "2019-11-12T18:38:48+00:00"
},
{
@@ -4170,6 +4430,10 @@
"payment",
"purchase"
],
+ "support": {
+ "issues": "https://github.com/thephpleague/omnipay-common/issues",
+ "source": "https://github.com/thephpleague/omnipay-common/tree/master"
+ },
"time": "2020-06-02T05:57:19+00:00"
},
{
@@ -4230,33 +4494,37 @@
"paypal",
"purchase"
],
+ "support": {
+ "issues": "https://github.com/thephpleague/omnipay-paypal/issues",
+ "source": "https://github.com/thephpleague/omnipay-paypal/tree/v3.0.2"
+ },
"time": "2018-05-15T10:35:58+00:00"
},
{
"name": "opis/closure",
- "version": "3.5.7",
+ "version": "3.6.0",
"source": {
"type": "git",
"url": "https://github.com/opis/closure.git",
- "reference": "4531e53afe2fc660403e76fb7644e95998bff7bf"
+ "reference": "c547f8262a5fa9ff507bd06cc394067b83a75085"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/opis/closure/zipball/4531e53afe2fc660403e76fb7644e95998bff7bf",
- "reference": "4531e53afe2fc660403e76fb7644e95998bff7bf",
+ "url": "https://api.github.com/repos/opis/closure/zipball/c547f8262a5fa9ff507bd06cc394067b83a75085",
+ "reference": "c547f8262a5fa9ff507bd06cc394067b83a75085",
"shasum": ""
},
"require": {
- "php": "^5.4 || ^7.0"
+ "php": "^5.4 || ^7.0 || ^8.0"
},
"require-dev": {
"jeremeamia/superclosure": "^2.0",
- "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+ "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.5.x-dev"
+ "dev-master": "3.6.x-dev"
}
},
"autoload": {
@@ -4291,52 +4559,11 @@
"serialization",
"serialize"
],
- "time": "2020-09-06T17:02:15+00:00"
- },
- {
- "name": "paragonie/random_compat",
- "version": "v9.99.99",
- "source": {
- "type": "git",
- "url": "https://github.com/paragonie/random_compat.git",
- "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
+ "support": {
+ "issues": "https://github.com/opis/closure/issues",
+ "source": "https://github.com/opis/closure/tree/3.6.0"
},
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
- "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
- "shasum": ""
- },
- "require": {
- "php": "^7"
- },
- "require-dev": {
- "phpunit/phpunit": "4.*|5.*",
- "vimeo/psalm": "^1"
- },
- "suggest": {
- "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
- },
- "type": "library",
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Paragon Initiative Enterprises",
- "email": "security@paragonie.com",
- "homepage": "https://paragonie.com"
- }
- ],
- "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
- "keywords": [
- "csprng",
- "polyfill",
- "pseudorandom",
- "random"
- ],
- "time": "2018-07-02T15:55:56+00:00"
+ "time": "2020-10-11T21:42:15+00:00"
},
{
"name": "php-http/client-common",
@@ -4407,6 +4634,10 @@
"http",
"httplug"
],
+ "support": {
+ "issues": "https://github.com/php-http/client-common/issues",
+ "source": "https://github.com/php-http/client-common/tree/2.3.0"
+ },
"time": "2020-07-21T10:04:13+00:00"
},
{
@@ -4472,25 +4703,29 @@
"message",
"psr7"
],
+ "support": {
+ "issues": "https://github.com/php-http/discovery/issues",
+ "source": "https://github.com/php-http/discovery/tree/1.12.0"
+ },
"time": "2020-09-22T13:31:04+00:00"
},
{
"name": "php-http/guzzle7-adapter",
- "version": "0.1.0",
+ "version": "0.1.1",
"source": {
"type": "git",
"url": "https://github.com/php-http/guzzle7-adapter.git",
- "reference": "5b361e0dbd7d9d5e21f80400bcccf9fb8d5d1f1e"
+ "reference": "1967de656b9679a2a6a66d0e4e16fa99bbed1ad1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-http/guzzle7-adapter/zipball/5b361e0dbd7d9d5e21f80400bcccf9fb8d5d1f1e",
- "reference": "5b361e0dbd7d9d5e21f80400bcccf9fb8d5d1f1e",
+ "url": "https://api.github.com/repos/php-http/guzzle7-adapter/zipball/1967de656b9679a2a6a66d0e4e16fa99bbed1ad1",
+ "reference": "1967de656b9679a2a6a66d0e4e16fa99bbed1ad1",
"shasum": ""
},
"require": {
"guzzlehttp/guzzle": "^7.0",
- "php": "^7.2",
+ "php": "^7.2 | ^8.0",
"php-http/httplug": "^2.0",
"psr/http-client": "^1.0"
},
@@ -4500,8 +4735,8 @@
"psr/http-client-implementation": "1.0"
},
"require-dev": {
- "php-http/client-integration-tests": "^2.0",
- "phpunit/phpunit": "^7.4"
+ "php-http/client-integration-tests": "^3.0",
+ "phpunit/phpunit": "^8.0|^9.3"
},
"type": "library",
"extra": {
@@ -4530,7 +4765,11 @@
"Guzzle",
"http"
],
- "time": "2020-09-17T07:29:54+00:00"
+ "support": {
+ "issues": "https://github.com/php-http/guzzle7-adapter/issues",
+ "source": "https://github.com/php-http/guzzle7-adapter/tree/0.1.1"
+ },
+ "time": "2020-10-21T17:30:51+00:00"
},
{
"name": "php-http/httplug",
@@ -4588,20 +4827,24 @@
"client",
"http"
],
+ "support": {
+ "issues": "https://github.com/php-http/httplug/issues",
+ "source": "https://github.com/php-http/httplug/tree/master"
+ },
"time": "2020-07-13T15:43:23+00:00"
},
{
"name": "php-http/message",
- "version": "1.9.0",
+ "version": "1.9.1",
"source": {
"type": "git",
"url": "https://github.com/php-http/message.git",
- "reference": "2c7256e3c1aba0bfca70f099810f1c7712e00945"
+ "reference": "09f3f13af3a1a4273ecbf8e6b27248c002a3db29"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-http/message/zipball/2c7256e3c1aba0bfca70f099810f1c7712e00945",
- "reference": "2c7256e3c1aba0bfca70f099810f1c7712e00945",
+ "url": "https://api.github.com/repos/php-http/message/zipball/09f3f13af3a1a4273ecbf8e6b27248c002a3db29",
+ "reference": "09f3f13af3a1a4273ecbf8e6b27248c002a3db29",
"shasum": ""
},
"require": {
@@ -4661,7 +4904,11 @@
"message",
"psr-7"
],
- "time": "2020-08-17T06:33:14+00:00"
+ "support": {
+ "issues": "https://github.com/php-http/message/issues",
+ "source": "https://github.com/php-http/message/tree/1.9.1"
+ },
+ "time": "2020-10-13T06:21:08+00:00"
},
{
"name": "php-http/message-factory",
@@ -4711,6 +4958,10 @@
"stream",
"uri"
],
+ "support": {
+ "issues": "https://github.com/php-http/message-factory/issues",
+ "source": "https://github.com/php-http/message-factory/tree/master"
+ },
"time": "2015-12-19T14:08:53+00:00"
},
{
@@ -4764,6 +5015,10 @@
"keywords": [
"promise"
],
+ "support": {
+ "issues": "https://github.com/php-http/promise/issues",
+ "source": "https://github.com/php-http/promise/tree/1.1.0"
+ },
"time": "2020-07-07T09:29:14+00:00"
},
{
@@ -4819,6 +5074,10 @@
"php",
"type"
],
+ "support": {
+ "issues": "https://github.com/schmittjoh/php-option/issues",
+ "source": "https://github.com/schmittjoh/php-option/tree/1.7.5"
+ },
"funding": [
{
"url": "https://github.com/GrahamCampbell",
@@ -4920,6 +5179,10 @@
"x.509",
"x509"
],
+ "support": {
+ "issues": "https://github.com/phpseclib/phpseclib/issues",
+ "source": "https://github.com/phpseclib/phpseclib/tree/2.0"
+ },
"funding": [
{
"url": "https://github.com/terrafrost",
@@ -5003,6 +5266,10 @@
"predis",
"redis"
],
+ "support": {
+ "issues": "https://github.com/predis/predis/issues",
+ "source": "https://github.com/predis/predis/tree/v1.1.6"
+ },
"funding": [
{
"url": "https://github.com/sponsors/tillkruss",
@@ -5055,6 +5322,9 @@
"psr",
"psr-6"
],
+ "support": {
+ "source": "https://github.com/php-fig/cache/tree/master"
+ },
"time": "2016-08-06T20:24:11+00:00"
},
{
@@ -5104,6 +5374,10 @@
"container-interop",
"psr"
],
+ "support": {
+ "issues": "https://github.com/php-fig/container/issues",
+ "source": "https://github.com/php-fig/container/tree/master"
+ },
"time": "2017-02-14T16:28:37+00:00"
},
{
@@ -5150,6 +5424,10 @@
"psr",
"psr-14"
],
+ "support": {
+ "issues": "https://github.com/php-fig/event-dispatcher/issues",
+ "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+ },
"time": "2019-01-08T18:20:26+00:00"
},
{
@@ -5199,6 +5477,9 @@
"psr",
"psr-18"
],
+ "support": {
+ "source": "https://github.com/php-fig/http-client/tree/master"
+ },
"time": "2020-06-29T06:28:15+00:00"
},
{
@@ -5251,6 +5532,9 @@
"request",
"response"
],
+ "support": {
+ "source": "https://github.com/php-fig/http-factory/tree/master"
+ },
"time": "2019-04-30T12:38:16+00:00"
},
{
@@ -5301,6 +5585,9 @@
"request",
"response"
],
+ "support": {
+ "source": "https://github.com/php-fig/http-message/tree/master"
+ },
"time": "2016-08-06T14:39:51+00:00"
},
{
@@ -5348,6 +5635,9 @@
"psr",
"psr-3"
],
+ "support": {
+ "source": "https://github.com/php-fig/log/tree/1.1.3"
+ },
"time": "2020-03-23T09:12:05+00:00"
},
{
@@ -5396,6 +5686,9 @@
"psr-16",
"simple-cache"
],
+ "support": {
+ "source": "https://github.com/php-fig/simple-cache/tree/master"
+ },
"time": "2017-10-23T01:57:42+00:00"
},
{
@@ -5468,6 +5761,10 @@
"interactive",
"shell"
],
+ "support": {
+ "issues": "https://github.com/bobthecow/psysh/issues",
+ "source": "https://github.com/bobthecow/psysh/tree/master"
+ },
"time": "2020-05-03T19:32:03+00:00"
},
{
@@ -5508,6 +5805,10 @@
}
],
"description": "A polyfill for getallheaders.",
+ "support": {
+ "issues": "https://github.com/ralouphie/getallheaders/issues",
+ "source": "https://github.com/ralouphie/getallheaders/tree/develop"
+ },
"time": "2019-03-08T08:55:37+00:00"
},
{
@@ -5571,6 +5872,10 @@
"queue",
"set"
],
+ "support": {
+ "issues": "https://github.com/ramsey/collection/issues",
+ "source": "https://github.com/ramsey/collection/tree/1.1.1"
+ },
"funding": [
{
"url": "https://github.com/ramsey",
@@ -5658,6 +5963,11 @@
"identifier",
"uuid"
],
+ "support": {
+ "issues": "https://github.com/ramsey/uuid/issues",
+ "rss": "https://github.com/ramsey/uuid/releases.atom",
+ "source": "https://github.com/ramsey/uuid"
+ },
"funding": [
{
"url": "https://github.com/ramsey",
@@ -5716,6 +6026,11 @@
"uri",
"url"
],
+ "support": {
+ "forum": "https://groups.google.com/group/sabredav-discuss",
+ "issues": "https://github.com/sabre-io/uri/issues",
+ "source": "https://github.com/fruux/sabre-uri"
+ },
"time": "2020-10-03T10:33:23+00:00"
},
{
@@ -5779,6 +6094,11 @@
"dom",
"xml"
],
+ "support": {
+ "forum": "https://groups.google.com/group/sabredav-discuss",
+ "issues": "https://github.com/sabre-io/xml/issues",
+ "source": "https://github.com/fruux/sabre-xml"
+ },
"time": "2019-01-09T13:51:57+00:00"
},
{
@@ -5828,6 +6148,10 @@
"parser",
"validator"
],
+ "support": {
+ "issues": "https://github.com/Seldaek/jsonlint/issues",
+ "source": "https://github.com/Seldaek/jsonlint/tree/master"
+ },
"funding": [
{
"url": "https://github.com/Seldaek",
@@ -5882,6 +6206,10 @@
"keywords": [
"phar"
],
+ "support": {
+ "issues": "https://github.com/Seldaek/phar-utils/issues",
+ "source": "https://github.com/Seldaek/phar-utils/tree/master"
+ },
"time": "2020-07-07T18:42:57+00:00"
},
{
@@ -5925,6 +6253,9 @@
"logging",
"sentry"
],
+ "support": {
+ "source": "https://github.com/getsentry/sentry-php-sdk/tree/3.0.0"
+ },
"funding": [
{
"url": "https://sentry.io/",
@@ -5939,16 +6270,16 @@
},
{
"name": "sentry/sentry",
- "version": "3.0.2",
+ "version": "3.0.3",
"source": {
"type": "git",
"url": "https://github.com/getsentry/sentry-php.git",
- "reference": "a35c6c71693a72f2fedb9b6f9644ced52268771d"
+ "reference": "e9f9cc24150da81f54f80611c565778d957c0aa3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/a35c6c71693a72f2fedb9b6f9644ced52268771d",
- "reference": "a35c6c71693a72f2fedb9b6f9644ced52268771d",
+ "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/e9f9cc24150da81f54f80611c565778d957c0aa3",
+ "reference": "e9f9cc24150da81f54f80611c565778d957c0aa3",
"shasum": ""
},
"require": {
@@ -6025,6 +6356,10 @@
"logging",
"sentry"
],
+ "support": {
+ "issues": "https://github.com/getsentry/sentry-php/issues",
+ "source": "https://github.com/getsentry/sentry-php/tree/3.0.3"
+ },
"funding": [
{
"url": "https://sentry.io/",
@@ -6035,20 +6370,20 @@
"type": "custom"
}
],
- "time": "2020-10-02T14:16:36+00:00"
+ "time": "2020-10-12T08:11:29+00:00"
},
{
"name": "sentry/sentry-laravel",
- "version": "2.1.0",
+ "version": "2.1.1",
"source": {
"type": "git",
"url": "https://github.com/getsentry/sentry-laravel.git",
- "reference": "1815b6e7c037f9495768e906f978e1a15d7a2944"
+ "reference": "882d1cd98f41582afa3840a0c7c650d091d66898"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/1815b6e7c037f9495768e906f978e1a15d7a2944",
- "reference": "1815b6e7c037f9495768e906f978e1a15d7a2944",
+ "url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/882d1cd98f41582afa3840a0c7c650d091d66898",
+ "reference": "882d1cd98f41582afa3840a0c7c650d091d66898",
"shasum": ""
},
"require": {
@@ -6106,6 +6441,10 @@
"logging",
"sentry"
],
+ "support": {
+ "issues": "https://github.com/getsentry/sentry-laravel/issues",
+ "source": "https://github.com/getsentry/sentry-laravel/tree/2.1.1"
+ },
"funding": [
{
"url": "https://sentry.io/",
@@ -6116,20 +6455,20 @@
"type": "custom"
}
],
- "time": "2020-10-06T08:40:32+00:00"
+ "time": "2020-10-08T08:30:08+00:00"
},
{
"name": "spatie/browsershot",
- "version": "3.39.0",
+ "version": "3.40.0",
"source": {
"type": "git",
"url": "https://github.com/spatie/browsershot.git",
- "reference": "572968978e5e07513f44819b0e744403c13fa1a1"
+ "reference": "0aa3a683448efe9c7f2d34fee80dec62bafd6c90"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/browsershot/zipball/572968978e5e07513f44819b0e744403c13fa1a1",
- "reference": "572968978e5e07513f44819b0e744403c13fa1a1",
+ "url": "https://api.github.com/repos/spatie/browsershot/zipball/0aa3a683448efe9c7f2d34fee80dec62bafd6c90",
+ "reference": "0aa3a683448efe9c7f2d34fee80dec62bafd6c90",
"shasum": ""
},
"require": {
@@ -6172,13 +6511,17 @@
"screenshot",
"webpage"
],
+ "support": {
+ "issues": "https://github.com/spatie/browsershot/issues",
+ "source": "https://github.com/spatie/browsershot/tree/3.40.0"
+ },
"funding": [
{
"url": "https://github.com/spatie",
"type": "github"
}
],
- "time": "2020-09-24T08:59:01+00:00"
+ "time": "2020-10-07T20:56:21+00:00"
},
{
"name": "spatie/image",
@@ -6232,6 +6575,10 @@
"image",
"spatie"
],
+ "support": {
+ "issues": "https://github.com/spatie/image/issues",
+ "source": "https://github.com/spatie/image/tree/master"
+ },
"time": "2020-01-26T18:56:44+00:00"
},
{
@@ -6282,6 +6629,10 @@
"image-optimizer",
"spatie"
],
+ "support": {
+ "issues": "https://github.com/spatie/image-optimizer/issues",
+ "source": "https://github.com/spatie/image-optimizer/tree/master"
+ },
"time": "2019-11-25T12:29:24+00:00"
},
{
@@ -6328,6 +6679,10 @@
"spatie",
"temporary-directory"
],
+ "support": {
+ "issues": "https://github.com/spatie/temporary-directory/issues",
+ "source": "https://github.com/spatie/temporary-directory/tree/master"
+ },
"time": "2020-09-07T20:41:15+00:00"
},
{
@@ -6371,6 +6726,10 @@
}
],
"description": "Laravel Eloquent HasManyThrough relationships with unlimited levels",
+ "support": {
+ "issues": "https://github.com/staudenmeir/eloquent-has-many-deep/issues",
+ "source": "https://github.com/staudenmeir/eloquent-has-many-deep/tree/v1.13"
+ },
"funding": [
{
"url": "https://paypal.me/JonasStaudenmeir",
@@ -6381,16 +6740,16 @@
},
{
"name": "stripe/stripe-php",
- "version": "v7.57.0",
+ "version": "v7.61.0",
"source": {
"type": "git",
"url": "https://github.com/stripe/stripe-php.git",
- "reference": "e2475efff624c6b9b62e8ea14ba7ee4e417cbfe5"
+ "reference": "51c6cd18cb51740101c940a3fefc876ef7cd8cae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/stripe/stripe-php/zipball/e2475efff624c6b9b62e8ea14ba7ee4e417cbfe5",
- "reference": "e2475efff624c6b9b62e8ea14ba7ee4e417cbfe5",
+ "url": "https://api.github.com/repos/stripe/stripe-php/zipball/51c6cd18cb51740101c940a3fefc876ef7cd8cae",
+ "reference": "51c6cd18cb51740101c940a3fefc876ef7cd8cae",
"shasum": ""
},
"require": {
@@ -6434,7 +6793,11 @@
"payment processing",
"stripe"
],
- "time": "2020-09-30T05:53:53+00:00"
+ "support": {
+ "issues": "https://github.com/stripe/stripe-php/issues",
+ "source": "https://github.com/stripe/stripe-php/tree/v7.61.0"
+ },
+ "time": "2020-10-20T20:01:45+00:00"
},
{
"name": "swiftmailer/swiftmailer",
@@ -6496,6 +6859,10 @@
"mail",
"mailer"
],
+ "support": {
+ "issues": "https://github.com/swiftmailer/swiftmailer/issues",
+ "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.3"
+ },
"time": "2019-11-12T09:31:26+00:00"
},
{
@@ -6575,6 +6942,9 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/console/tree/v5.1.7"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -6642,6 +7012,9 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/css-selector/tree/v5.1.4"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -6706,6 +7079,9 @@
],
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/deprecation-contracts/tree/master"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -6777,6 +7153,9 @@
],
"description": "Symfony ErrorHandler Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/error-handler/tree/v5.1.7"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -6864,6 +7243,9 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/event-dispatcher/tree/v5.1.7"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -6940,6 +7322,9 @@
"interoperability",
"standards"
],
+ "support": {
+ "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.2.0"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -7004,6 +7389,9 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/filesystem/tree/v5.1.7"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -7067,6 +7455,9 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/finder/tree/v5.1.7"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -7153,6 +7544,9 @@
],
"description": "Symfony HttpClient component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/http-client/tree/v5.1.7"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -7171,16 +7565,16 @@
},
{
"name": "symfony/http-client-contracts",
- "version": "v2.2.0",
+ "version": "v2.3.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client-contracts.git",
- "reference": "3a5d0fe7908daaa23e3dbf4cee3ba4bfbb19fdd3"
+ "reference": "41db680a15018f9c1d4b23516059633ce280ca33"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/3a5d0fe7908daaa23e3dbf4cee3ba4bfbb19fdd3",
- "reference": "3a5d0fe7908daaa23e3dbf4cee3ba4bfbb19fdd3",
+ "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/41db680a15018f9c1d4b23516059633ce280ca33",
+ "reference": "41db680a15018f9c1d4b23516059633ce280ca33",
"shasum": ""
},
"require": {
@@ -7191,8 +7585,9 @@
},
"type": "library",
"extra": {
+ "branch-version": "2.3",
"branch-alias": {
- "dev-master": "2.2-dev"
+ "dev-main": "2.3-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -7228,6 +7623,9 @@
"interoperability",
"standards"
],
+ "support": {
+ "source": "https://github.com/symfony/http-client-contracts/tree/v2.3.1"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -7242,7 +7640,7 @@
"type": "tidelift"
}
],
- "time": "2020-09-07T11:33:47+00:00"
+ "time": "2020-10-14T17:08:19+00:00"
},
{
"name": "symfony/http-foundation",
@@ -7303,6 +7701,9 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/http-foundation/tree/v5.1.7"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -7417,6 +7818,9 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/http-kernel/tree/v5.1.7"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -7494,6 +7898,9 @@
"mime",
"mime-type"
],
+ "support": {
+ "source": "https://github.com/symfony/mime/tree/v5.1.7"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -7564,6 +7971,9 @@
"configuration",
"options"
],
+ "support": {
+ "source": "https://github.com/symfony/options-resolver/tree/v5.1.7"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -7582,20 +7992,20 @@
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.18.1",
+ "version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "1c302646f6efc070cd46856e600e5e0684d6b454"
+ "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454",
- "reference": "1c302646f6efc070cd46856e600e5e0684d6b454",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41",
+ "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"suggest": {
"ext-ctype": "For best performance"
@@ -7603,7 +8013,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-main": "1.20-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -7640,6 +8050,9 @@
"polyfill",
"portable"
],
+ "support": {
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.20.0"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -7654,24 +8067,24 @@
"type": "tidelift"
}
],
- "time": "2020-07-14T12:35:20+00:00"
+ "time": "2020-10-23T14:02:19+00:00"
},
{
"name": "symfony/polyfill-iconv",
- "version": "v1.18.1",
+ "version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git",
- "reference": "6c2f78eb8f5ab8eaea98f6d414a5915f2e0fce36"
+ "reference": "c536646fdb4f29104dd26effc2fdcb9a5b085024"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/6c2f78eb8f5ab8eaea98f6d414a5915f2e0fce36",
- "reference": "6c2f78eb8f5ab8eaea98f6d414a5915f2e0fce36",
+ "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c536646fdb4f29104dd26effc2fdcb9a5b085024",
+ "reference": "c536646fdb4f29104dd26effc2fdcb9a5b085024",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"suggest": {
"ext-iconv": "For best performance"
@@ -7679,7 +8092,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-main": "1.20-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -7717,6 +8130,9 @@
"portable",
"shim"
],
+ "support": {
+ "source": "https://github.com/symfony/polyfill-iconv/tree/v1.20.0"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -7731,24 +8147,24 @@
"type": "tidelift"
}
],
- "time": "2020-07-14T12:35:20+00:00"
+ "time": "2020-10-23T14:02:19+00:00"
},
{
"name": "symfony/polyfill-intl-grapheme",
- "version": "v1.18.1",
+ "version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
- "reference": "b740103edbdcc39602239ee8860f0f45a8eb9aa5"
+ "reference": "c7cf3f858ec7d70b89559d6e6eb1f7c2517d479c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b740103edbdcc39602239ee8860f0f45a8eb9aa5",
- "reference": "b740103edbdcc39602239ee8860f0f45a8eb9aa5",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/c7cf3f858ec7d70b89559d6e6eb1f7c2517d479c",
+ "reference": "c7cf3f858ec7d70b89559d6e6eb1f7c2517d479c",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"suggest": {
"ext-intl": "For best performance"
@@ -7756,7 +8172,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-main": "1.20-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -7795,6 +8211,9 @@
"portable",
"shim"
],
+ "support": {
+ "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.20.0"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -7809,26 +8228,25 @@
"type": "tidelift"
}
],
- "time": "2020-07-14T12:35:20+00:00"
+ "time": "2020-10-23T14:02:19+00:00"
},
{
"name": "symfony/polyfill-intl-idn",
- "version": "v1.18.1",
+ "version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
- "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251"
+ "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/5dcab1bc7146cf8c1beaa4502a3d9be344334251",
- "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3b75acd829741c768bc8b1f84eb33265e7cc5117",
+ "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
+ "php": ">=7.1",
"symfony/polyfill-intl-normalizer": "^1.10",
- "symfony/polyfill-php70": "^1.10",
"symfony/polyfill-php72": "^1.10"
},
"suggest": {
@@ -7837,7 +8255,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-main": "1.20-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -7880,6 +8298,9 @@
"portable",
"shim"
],
+ "support": {
+ "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.20.0"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -7894,24 +8315,24 @@
"type": "tidelift"
}
],
- "time": "2020-08-04T06:02:08+00:00"
+ "time": "2020-10-23T14:02:19+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.18.1",
+ "version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
- "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e"
+ "reference": "727d1096295d807c309fb01a851577302394c897"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
- "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/727d1096295d807c309fb01a851577302394c897",
+ "reference": "727d1096295d807c309fb01a851577302394c897",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"suggest": {
"ext-intl": "For best performance"
@@ -7919,7 +8340,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-main": "1.20-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -7961,6 +8382,9 @@
"portable",
"shim"
],
+ "support": {
+ "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.20.0"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -7975,24 +8399,24 @@
"type": "tidelift"
}
],
- "time": "2020-07-14T12:35:20+00:00"
+ "time": "2020-10-23T14:02:19+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.18.1",
+ "version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a"
+ "reference": "39d483bdf39be819deabf04ec872eb0b2410b531"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a",
- "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531",
+ "reference": "39d483bdf39be819deabf04ec872eb0b2410b531",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"suggest": {
"ext-mbstring": "For best performance"
@@ -8000,7 +8424,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-main": "1.20-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -8038,6 +8462,9 @@
"portable",
"shim"
],
+ "support": {
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.20.0"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -8052,106 +8479,29 @@
"type": "tidelift"
}
],
- "time": "2020-07-14T12:35:20+00:00"
- },
- {
- "name": "symfony/polyfill-php70",
- "version": "v1.18.1",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php70.git",
- "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
- "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
- "shasum": ""
- },
- "require": {
- "paragonie/random_compat": "~1.0|~2.0|~9.99",
- "php": ">=5.3.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.18-dev"
- },
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Php70\\": ""
- },
- "files": [
- "bootstrap.php"
- ],
- "classmap": [
- "Resources/stubs"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2020-07-14T12:35:20+00:00"
+ "time": "2020-10-23T14:02:19+00:00"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.18.1",
+ "version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "639447d008615574653fb3bc60d1986d7172eaae"
+ "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae",
- "reference": "639447d008615574653fb3bc60d1986d7172eaae",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cede45fcdfabdd6043b3592e83678e42ec69e930",
+ "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-main": "1.20-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -8188,6 +8538,9 @@
"portable",
"shim"
],
+ "support": {
+ "source": "https://github.com/symfony/polyfill-php72/tree/v1.20.0"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -8202,29 +8555,29 @@
"type": "tidelift"
}
],
- "time": "2020-07-14T12:35:20+00:00"
+ "time": "2020-10-23T14:02:19+00:00"
},
{
"name": "symfony/polyfill-php73",
- "version": "v1.18.1",
+ "version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
- "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca"
+ "reference": "8ff431c517be11c78c48a39a66d37431e26a6bed"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fffa1a52a023e782cdcc221d781fe1ec8f87fcca",
- "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca",
+ "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/8ff431c517be11c78c48a39a66d37431e26a6bed",
+ "reference": "8ff431c517be11c78c48a39a66d37431e26a6bed",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-main": "1.20-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -8264,6 +8617,9 @@
"portable",
"shim"
],
+ "support": {
+ "source": "https://github.com/symfony/polyfill-php73/tree/v1.20.0"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -8278,29 +8634,29 @@
"type": "tidelift"
}
],
- "time": "2020-07-14T12:35:20+00:00"
+ "time": "2020-10-23T14:02:19+00:00"
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.18.1",
+ "version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981"
+ "reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981",
- "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/e70aa8b064c5b72d3df2abd5ab1e90464ad009de",
+ "reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de",
"shasum": ""
},
"require": {
- "php": ">=7.0.8"
+ "php": ">=7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-main": "1.20-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -8344,6 +8700,9 @@
"portable",
"shim"
],
+ "support": {
+ "source": "https://github.com/symfony/polyfill-php80/tree/v1.20.0"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -8358,25 +8717,24 @@
"type": "tidelift"
}
],
- "time": "2020-07-14T12:35:20+00:00"
+ "time": "2020-10-23T14:02:19+00:00"
},
{
"name": "symfony/polyfill-uuid",
- "version": "v1.18.1",
+ "version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-uuid.git",
- "reference": "da48e2cccd323e48c16c26481bf5800f6ab1c49d"
+ "reference": "7095799250ff244f3015dc492480175a249e7b55"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/da48e2cccd323e48c16c26481bf5800f6ab1c49d",
- "reference": "da48e2cccd323e48c16c26481bf5800f6ab1c49d",
+ "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/7095799250ff244f3015dc492480175a249e7b55",
+ "reference": "7095799250ff244f3015dc492480175a249e7b55",
"shasum": ""
},
"require": {
- "paragonie/random_compat": "~1.0|~2.0|~9.99",
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"suggest": {
"ext-uuid": "For best performance"
@@ -8384,7 +8742,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-main": "1.20-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -8421,6 +8779,9 @@
"portable",
"uuid"
],
+ "support": {
+ "source": "https://github.com/symfony/polyfill-uuid/tree/v1.20.0"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -8435,7 +8796,7 @@
"type": "tidelift"
}
],
- "time": "2020-07-14T12:35:20+00:00"
+ "time": "2020-10-23T14:02:19+00:00"
},
{
"name": "symfony/process",
@@ -8485,6 +8846,9 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/process/tree/5.1"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -8577,6 +8941,9 @@
"uri",
"url"
],
+ "support": {
+ "source": "https://github.com/symfony/routing/tree/v5.1.7"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -8653,6 +9020,9 @@
"interoperability",
"standards"
],
+ "support": {
+ "source": "https://github.com/symfony/service-contracts/tree/master"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -8738,6 +9108,9 @@
"utf-8",
"utf8"
],
+ "support": {
+ "source": "https://github.com/symfony/string/tree/v5.1.7"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -8830,6 +9203,9 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/translation/tree/v5.1.7"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -8905,6 +9281,9 @@
"interoperability",
"standards"
],
+ "support": {
+ "source": "https://github.com/symfony/translation-contracts/tree/v2.3.0"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -8995,6 +9374,9 @@
"debug",
"dump"
],
+ "support": {
+ "source": "https://github.com/symfony/var-dumper/tree/v5.1.7"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -9058,6 +9440,10 @@
],
"description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
+ "support": {
+ "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues",
+ "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.3"
+ },
"time": "2020-07-13T06:12:54+00:00"
},
{
@@ -9118,6 +9504,9 @@
"lightlogs",
"turbo124"
],
+ "support": {
+ "source": "https://github.com/turbo124/beacon/tree/1.0.3"
+ },
"time": "2020-10-01T05:21:36+00:00"
},
{
@@ -9184,6 +9573,9 @@
"gmail",
"laravel"
],
+ "support": {
+ "source": "https://github.com/turbo124/laravel-gmail/tree/v5.0.0"
+ },
"time": "2020-10-01T03:04:41+00:00"
},
{
@@ -9250,6 +9642,10 @@
"env",
"environment"
],
+ "support": {
+ "issues": "https://github.com/vlucas/phpdotenv/issues",
+ "source": "https://github.com/vlucas/phpdotenv/tree/v5.2.0"
+ },
"funding": [
{
"url": "https://github.com/GrahamCampbell",
@@ -9308,6 +9704,10 @@
"clean",
"php"
],
+ "support": {
+ "issues": "https://github.com/voku/portable-ascii/issues",
+ "source": "https://github.com/voku/portable-ascii/tree/master"
+ },
"funding": [
{
"url": "https://www.paypal.me/moelleken",
@@ -9349,6 +9749,7 @@
"require": {
"php": ">=5.3.0"
},
+ "default-branch": true,
"type": "library",
"extra": {
"laravel": {
@@ -9392,10 +9793,174 @@
"iso_3166_3",
"laravel"
],
+ "support": {
+ "issues": "https://github.com/webpatser/laravel-countries/issues",
+ "source": "https://github.com/webpatser/laravel-countries"
+ },
"time": "2019-07-12T14:06:05+00:00"
}
],
"packages-dev": [
+ {
+ "name": "amphp/amp",
+ "version": "v2.5.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/amphp/amp.git",
+ "reference": "f220a51458bf4dd0dedebb171ac3457813c72bbc"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/amphp/amp/zipball/f220a51458bf4dd0dedebb171ac3457813c72bbc",
+ "reference": "f220a51458bf4dd0dedebb171ac3457813c72bbc",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7"
+ },
+ "require-dev": {
+ "amphp/php-cs-fixer-config": "dev-master",
+ "amphp/phpunit-util": "^1",
+ "ext-json": "*",
+ "jetbrains/phpstorm-stubs": "^2019.3",
+ "phpunit/phpunit": "^6.0.9 | ^7",
+ "psalm/phar": "^3.11@dev",
+ "react/promise": "^2"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Amp\\": "lib"
+ },
+ "files": [
+ "lib/functions.php",
+ "lib/Internal/functions.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Daniel Lowrey",
+ "email": "rdlowrey@php.net"
+ },
+ {
+ "name": "Aaron Piotrowski",
+ "email": "aaron@trowski.com"
+ },
+ {
+ "name": "Bob Weinand",
+ "email": "bobwei9@hotmail.com"
+ },
+ {
+ "name": "Niklas Keller",
+ "email": "me@kelunik.com"
+ }
+ ],
+ "description": "A non-blocking concurrency framework for PHP applications.",
+ "homepage": "http://amphp.org/amp",
+ "keywords": [
+ "async",
+ "asynchronous",
+ "awaitable",
+ "concurrency",
+ "event",
+ "event-loop",
+ "future",
+ "non-blocking",
+ "promise"
+ ],
+ "support": {
+ "irc": "irc://irc.freenode.org/amphp",
+ "issues": "https://github.com/amphp/amp/issues",
+ "source": "https://github.com/amphp/amp/tree/master"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/amphp",
+ "type": "github"
+ }
+ ],
+ "time": "2020-07-14T21:47:18+00:00"
+ },
+ {
+ "name": "amphp/byte-stream",
+ "version": "v1.8.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/amphp/byte-stream.git",
+ "reference": "f0c20cf598a958ba2aa8c6e5a71c697d652c7088"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/amphp/byte-stream/zipball/f0c20cf598a958ba2aa8c6e5a71c697d652c7088",
+ "reference": "f0c20cf598a958ba2aa8c6e5a71c697d652c7088",
+ "shasum": ""
+ },
+ "require": {
+ "amphp/amp": "^2",
+ "php": ">=7.1"
+ },
+ "require-dev": {
+ "amphp/php-cs-fixer-config": "dev-master",
+ "amphp/phpunit-util": "^1.4",
+ "friendsofphp/php-cs-fixer": "^2.3",
+ "jetbrains/phpstorm-stubs": "^2019.3",
+ "phpunit/phpunit": "^6 || ^7 || ^8",
+ "psalm/phar": "^3.11.4"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Amp\\ByteStream\\": "lib"
+ },
+ "files": [
+ "lib/functions.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Aaron Piotrowski",
+ "email": "aaron@trowski.com"
+ },
+ {
+ "name": "Niklas Keller",
+ "email": "me@kelunik.com"
+ }
+ ],
+ "description": "A stream abstraction to make working with non-blocking I/O simple.",
+ "homepage": "http://amphp.org/byte-stream",
+ "keywords": [
+ "amp",
+ "amphp",
+ "async",
+ "io",
+ "non-blocking",
+ "stream"
+ ],
+ "support": {
+ "irc": "irc://irc.freenode.org/amphp",
+ "issues": "https://github.com/amphp/byte-stream/issues",
+ "source": "https://github.com/amphp/byte-stream/tree/master"
+ },
+ "time": "2020-06-29T18:35:05+00:00"
+ },
{
"name": "anahkiasen/former",
"version": "4.5.0",
@@ -9467,6 +10032,10 @@
"foundation",
"laravel"
],
+ "support": {
+ "issues": "https://github.com/formers/former/issues",
+ "source": "https://github.com/formers/former/tree/4.5.0"
+ },
"time": "2020-09-23T18:18:13+00:00"
},
{
@@ -9509,6 +10078,10 @@
}
],
"description": "A set of classes to create and manipulate HTML objects abstractions",
+ "support": {
+ "issues": "https://github.com/Anahkiasen/html-object/issues",
+ "source": "https://github.com/Anahkiasen/html-object/tree/master"
+ },
"time": "2017-05-31T07:52:45+00:00"
},
{
@@ -9579,6 +10152,10 @@
"profiler",
"webprofiler"
],
+ "support": {
+ "issues": "https://github.com/barryvdh/laravel-debugbar/issues",
+ "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.5.1"
+ },
"funding": [
{
"url": "https://github.com/barryvdh",
@@ -9660,6 +10237,10 @@
"phpunit",
"testing"
],
+ "support": {
+ "issues": "https://github.com/paratestphp/paratest/issues",
+ "source": "https://github.com/paratestphp/paratest/tree/5.0.4"
+ },
"time": "2020-08-26T13:44:25+00:00"
},
{
@@ -9725,6 +10306,10 @@
"laravel",
"swagger"
],
+ "support": {
+ "issues": "https://github.com/DarkaOnLine/L5-Swagger/issues",
+ "source": "https://github.com/DarkaOnLine/L5-Swagger/tree/8.0.2"
+ },
"funding": [
{
"url": "https://github.com/DarkaOnLine",
@@ -9735,16 +10320,16 @@
},
{
"name": "doctrine/annotations",
- "version": "1.10.4",
+ "version": "1.11.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
- "reference": "bfe91e31984e2ba76df1c1339681770401ec262f"
+ "reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/bfe91e31984e2ba76df1c1339681770401ec262f",
- "reference": "bfe91e31984e2ba76df1c1339681770401ec262f",
+ "url": "https://api.github.com/repos/doctrine/annotations/zipball/ce77a7ba1770462cd705a91a151b6c3746f9c6ad",
+ "reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad",
"shasum": ""
},
"require": {
@@ -9754,13 +10339,14 @@
},
"require-dev": {
"doctrine/cache": "1.*",
+ "doctrine/coding-standard": "^6.0 || ^8.1",
"phpstan/phpstan": "^0.12.20",
"phpunit/phpunit": "^7.5 || ^9.1.5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.9.x-dev"
+ "dev-master": "1.11.x-dev"
}
},
"autoload": {
@@ -9795,13 +10381,17 @@
}
],
"description": "Docblock Annotations Parser",
- "homepage": "http://www.doctrine-project.org",
+ "homepage": "https://www.doctrine-project.org/projects/annotations.html",
"keywords": [
"annotations",
"docblock",
"parser"
],
- "time": "2020-08-10T19:35:50+00:00"
+ "support": {
+ "issues": "https://github.com/doctrine/annotations/issues",
+ "source": "https://github.com/doctrine/annotations/tree/1.11.1"
+ },
+ "time": "2020-10-26T10:28:16+00:00"
},
{
"name": "doctrine/instantiator",
@@ -9857,6 +10447,10 @@
"constructor",
"instantiate"
],
+ "support": {
+ "issues": "https://github.com/doctrine/instantiator/issues",
+ "source": "https://github.com/doctrine/instantiator/tree/1.3.x"
+ },
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
@@ -9875,22 +10469,22 @@
},
{
"name": "facade/flare-client-php",
- "version": "1.3.6",
+ "version": "1.3.7",
"source": {
"type": "git",
"url": "https://github.com/facade/flare-client-php.git",
- "reference": "451fadf38e9f635e7f8e1f5b3cf5c9eb82f11799"
+ "reference": "fd688d3c06658f2b3b5f7bb19f051ee4ddf02492"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facade/flare-client-php/zipball/451fadf38e9f635e7f8e1f5b3cf5c9eb82f11799",
- "reference": "451fadf38e9f635e7f8e1f5b3cf5c9eb82f11799",
+ "url": "https://api.github.com/repos/facade/flare-client-php/zipball/fd688d3c06658f2b3b5f7bb19f051ee4ddf02492",
+ "reference": "fd688d3c06658f2b3b5f7bb19f051ee4ddf02492",
"shasum": ""
},
"require": {
"facade/ignition-contracts": "~1.0",
"illuminate/pipeline": "^5.5|^6.0|^7.0|^8.0",
- "php": "^7.1",
+ "php": "^7.1|^8.0",
"symfony/http-foundation": "^3.3|^4.1|^5.0",
"symfony/mime": "^3.4|^4.0|^5.1",
"symfony/var-dumper": "^3.4|^4.0|^5.0"
@@ -9926,26 +10520,30 @@
"flare",
"reporting"
],
+ "support": {
+ "issues": "https://github.com/facade/flare-client-php/issues",
+ "source": "https://github.com/facade/flare-client-php/tree/1.3.7"
+ },
"funding": [
{
"url": "https://github.com/spatie",
"type": "github"
}
],
- "time": "2020-09-18T06:35:11+00:00"
+ "time": "2020-10-21T16:02:39+00:00"
},
{
"name": "facade/ignition",
- "version": "2.3.8",
+ "version": "2.4.1",
"source": {
"type": "git",
"url": "https://github.com/facade/ignition.git",
- "reference": "e8fed9c382cd1d02b5606688576a35619afdf82c"
+ "reference": "9fc6c3d3de5271a1b94cff19dce2c9295abf0ffa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facade/ignition/zipball/e8fed9c382cd1d02b5606688576a35619afdf82c",
- "reference": "e8fed9c382cd1d02b5606688576a35619afdf82c",
+ "url": "https://api.github.com/repos/facade/ignition/zipball/9fc6c3d3de5271a1b94cff19dce2c9295abf0ffa",
+ "reference": "9fc6c3d3de5271a1b94cff19dce2c9295abf0ffa",
"shasum": ""
},
"require": {
@@ -10004,29 +10602,35 @@
"laravel",
"page"
],
- "time": "2020-10-01T23:01:14+00:00"
+ "support": {
+ "docs": "https://flareapp.io/docs/ignition-for-laravel/introduction",
+ "forum": "https://twitter.com/flareappio",
+ "issues": "https://github.com/facade/ignition/issues",
+ "source": "https://github.com/facade/ignition"
+ },
+ "time": "2020-10-14T08:59:59+00:00"
},
{
"name": "facade/ignition-contracts",
- "version": "1.0.1",
+ "version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/facade/ignition-contracts.git",
- "reference": "aeab1ce8b68b188a43e81758e750151ad7da796b"
+ "reference": "3c921a1cdba35b68a7f0ccffc6dffc1995b18267"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/aeab1ce8b68b188a43e81758e750151ad7da796b",
- "reference": "aeab1ce8b68b188a43e81758e750151ad7da796b",
+ "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/3c921a1cdba35b68a7f0ccffc6dffc1995b18267",
+ "reference": "3c921a1cdba35b68a7f0ccffc6dffc1995b18267",
"shasum": ""
},
"require": {
- "php": "^7.1"
+ "php": "^7.3|^8.0"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "^2.14",
- "phpunit/phpunit": "^7.5|^8.0",
- "vimeo/psalm": "^3.12"
+ "friendsofphp/php-cs-fixer": "^v2.15.8",
+ "phpunit/phpunit": "^9.3.11",
+ "vimeo/psalm": "^3.17.1"
},
"type": "library",
"autoload": {
@@ -10053,29 +10657,134 @@
"flare",
"ignition"
],
- "time": "2020-07-14T10:10:28+00:00"
+ "support": {
+ "issues": "https://github.com/facade/ignition-contracts/issues",
+ "source": "https://github.com/facade/ignition-contracts/tree/1.0.2"
+ },
+ "time": "2020-10-16T08:27:54+00:00"
},
{
- "name": "filp/whoops",
- "version": "2.7.3",
+ "name": "felixfbecker/advanced-json-rpc",
+ "version": "v3.1.1",
"source": {
"type": "git",
- "url": "https://github.com/filp/whoops.git",
- "reference": "5d5fe9bb3d656b514d455645b3addc5f7ba7714d"
+ "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git",
+ "reference": "0ed363f8de17d284d479ec813c9ad3f6834b5c40"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/filp/whoops/zipball/5d5fe9bb3d656b514d455645b3addc5f7ba7714d",
- "reference": "5d5fe9bb3d656b514d455645b3addc5f7ba7714d",
+ "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/0ed363f8de17d284d479ec813c9ad3f6834b5c40",
+ "reference": "0ed363f8de17d284d479ec813c9ad3f6834b5c40",
"shasum": ""
},
"require": {
- "php": "^5.5.9 || ^7.0",
+ "netresearch/jsonmapper": "^1.0 || ^2.0",
+ "php": ">=7.0",
+ "phpdocumentor/reflection-docblock": "^4.0.0 || ^5.0.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^6.0.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "AdvancedJsonRpc\\": "lib/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "ISC"
+ ],
+ "authors": [
+ {
+ "name": "Felix Becker",
+ "email": "felix.b@outlook.com"
+ }
+ ],
+ "description": "A more advanced JSONRPC implementation",
+ "support": {
+ "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues",
+ "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/master"
+ },
+ "time": "2020-03-11T15:21:41+00:00"
+ },
+ {
+ "name": "felixfbecker/language-server-protocol",
+ "version": "v1.5.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/felixfbecker/php-language-server-protocol.git",
+ "reference": "85e83cacd2ed573238678c6875f8f0d7ec699541"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/85e83cacd2ed573238678c6875f8f0d7ec699541",
+ "reference": "85e83cacd2ed573238678c6875f8f0d7ec699541",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.1"
+ },
+ "require-dev": {
+ "phpstan/phpstan": "*",
+ "squizlabs/php_codesniffer": "^3.1",
+ "vimeo/psalm": "^4.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "LanguageServerProtocol\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "ISC"
+ ],
+ "authors": [
+ {
+ "name": "Felix Becker",
+ "email": "felix.b@outlook.com"
+ }
+ ],
+ "description": "PHP classes for the Language Server Protocol",
+ "keywords": [
+ "language",
+ "microsoft",
+ "php",
+ "server"
+ ],
+ "support": {
+ "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues",
+ "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.0"
+ },
+ "time": "2020-10-23T13:55:30+00:00"
+ },
+ {
+ "name": "filp/whoops",
+ "version": "2.9.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/filp/whoops.git",
+ "reference": "2ec31f3adc54c71a59c5e3c2143d7a0e2f8899f8"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/filp/whoops/zipball/2ec31f3adc54c71a59c5e3c2143d7a0e2f8899f8",
+ "reference": "2ec31f3adc54c71a59c5e3c2143d7a0e2f8899f8",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.5.9 || ^7.0 || ^8.0",
"psr/log": "^1.0.1"
},
"require-dev": {
"mockery/mockery": "^0.9 || ^1.0",
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0",
+ "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.3",
"symfony/var-dumper": "^2.6 || ^3.0 || ^4.0 || ^5.0"
},
"suggest": {
@@ -10085,7 +10794,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
@@ -10114,7 +10823,11 @@
"throwable",
"whoops"
],
- "time": "2020-06-14T09:00:00+00:00"
+ "support": {
+ "issues": "https://github.com/filp/whoops/issues",
+ "source": "https://github.com/filp/whoops/tree/2.9.0"
+ },
+ "time": "2020-10-20T12:00:00+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@@ -10161,6 +10874,10 @@
"keywords": [
"test"
],
+ "support": {
+ "issues": "https://github.com/hamcrest/hamcrest-php/issues",
+ "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.0.1"
+ },
"time": "2020-07-09T08:09:16+00:00"
},
{
@@ -10222,6 +10939,10 @@
"debug",
"debugbar"
],
+ "support": {
+ "issues": "https://github.com/maximebf/php-debugbar/issues",
+ "source": "https://github.com/maximebf/php-debugbar/tree/v1.16.3"
+ },
"time": "2020-05-06T07:06:27+00:00"
},
{
@@ -10290,6 +11011,10 @@
"test double",
"testing"
],
+ "support": {
+ "issues": "https://github.com/mockery/mockery/issues",
+ "source": "https://github.com/mockery/mockery/tree/master"
+ },
"time": "2020-08-11T18:10:13+00:00"
},
{
@@ -10338,6 +11063,10 @@
"object",
"object graph"
],
+ "support": {
+ "issues": "https://github.com/myclabs/DeepCopy/issues",
+ "source": "https://github.com/myclabs/DeepCopy/tree/1.x"
+ },
"funding": [
{
"url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
@@ -10346,6 +11075,57 @@
],
"time": "2020-06-29T13:22:24+00:00"
},
+ {
+ "name": "netresearch/jsonmapper",
+ "version": "v2.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/cweiske/jsonmapper.git",
+ "reference": "e0f1e33a71587aca81be5cffbb9746510e1fe04e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/e0f1e33a71587aca81be5cffbb9746510e1fe04e",
+ "reference": "e0f1e33a71587aca81be5cffbb9746510e1fe04e",
+ "shasum": ""
+ },
+ "require": {
+ "ext-json": "*",
+ "ext-pcre": "*",
+ "ext-reflection": "*",
+ "ext-spl": "*",
+ "php": ">=5.6"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4 || ~7.0",
+ "squizlabs/php_codesniffer": "~3.5"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "JsonMapper": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "OSL-3.0"
+ ],
+ "authors": [
+ {
+ "name": "Christian Weiske",
+ "email": "cweiske@cweiske.de",
+ "homepage": "http://github.com/cweiske/jsonmapper/",
+ "role": "Developer"
+ }
+ ],
+ "description": "Map nested JSON structures onto PHP classes",
+ "support": {
+ "email": "cweiske@cweiske.de",
+ "issues": "https://github.com/cweiske/jsonmapper/issues",
+ "source": "https://github.com/cweiske/jsonmapper/tree/master"
+ },
+ "time": "2020-04-16T18:48:43+00:00"
+ },
{
"name": "nunomaduro/collision",
"version": "v5.0.2",
@@ -10414,6 +11194,10 @@
"php",
"symfony"
],
+ "support": {
+ "issues": "https://github.com/nunomaduro/collision/issues",
+ "source": "https://github.com/nunomaduro/collision"
+ },
"funding": [
{
"url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L",
@@ -10430,6 +11214,59 @@
],
"time": "2020-08-27T18:58:22+00:00"
},
+ {
+ "name": "openlss/lib-array2xml",
+ "version": "1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/nullivex/lib-array2xml.git",
+ "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/nullivex/lib-array2xml/zipball/a91f18a8dfc69ffabe5f9b068bc39bb202c81d90",
+ "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.2"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "LSS": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "Apache-2.0"
+ ],
+ "authors": [
+ {
+ "name": "Bryan Tong",
+ "email": "bryan@nullivex.com",
+ "homepage": "https://www.nullivex.com"
+ },
+ {
+ "name": "Tony Butler",
+ "email": "spudz76@gmail.com",
+ "homepage": "https://www.nullivex.com"
+ }
+ ],
+ "description": "Array2XML conversion library credit to lalit.org",
+ "homepage": "https://www.nullivex.com",
+ "keywords": [
+ "array",
+ "array conversion",
+ "xml",
+ "xml conversion"
+ ],
+ "support": {
+ "issues": "https://github.com/nullivex/lib-array2xml/issues",
+ "source": "https://github.com/nullivex/lib-array2xml/tree/master"
+ },
+ "time": "2019-03-29T20:06:56+00:00"
+ },
{
"name": "phar-io/manifest",
"version": "2.0.1",
@@ -10484,6 +11321,10 @@
}
],
"description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+ "support": {
+ "issues": "https://github.com/phar-io/manifest/issues",
+ "source": "https://github.com/phar-io/manifest/tree/master"
+ },
"time": "2020-06-27T14:33:11+00:00"
},
{
@@ -10531,6 +11372,10 @@
}
],
"description": "Library for handling version information and constraints",
+ "support": {
+ "issues": "https://github.com/phar-io/version/issues",
+ "source": "https://github.com/phar-io/version/tree/master"
+ },
"time": "2020-06-27T14:39:04+00:00"
},
{
@@ -10580,6 +11425,10 @@
"reflection",
"static analysis"
],
+ "support": {
+ "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
+ "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
+ },
"time": "2020-06-27T09:03:43+00:00"
},
{
@@ -10632,6 +11481,10 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+ "support": {
+ "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
+ "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master"
+ },
"time": "2020-09-03T19:13:55+00:00"
},
{
@@ -10677,6 +11530,10 @@
}
],
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+ "support": {
+ "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
+ "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0"
+ },
"time": "2020-09-17T18:55:26+00:00"
},
{
@@ -10740,20 +11597,24 @@
"spy",
"stub"
],
+ "support": {
+ "issues": "https://github.com/phpspec/prophecy/issues",
+ "source": "https://github.com/phpspec/prophecy/tree/1.12.1"
+ },
"time": "2020-09-29T09:10:42+00:00"
},
{
"name": "phpunit/php-code-coverage",
- "version": "9.2.0",
+ "version": "9.2.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "53a4b737e83be724efd2bc4e7b929b9a30c48972"
+ "reference": "ed363c3ce393560a1c300dce0298bbf0f0528b13"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/53a4b737e83be724efd2bc4e7b929b9a30c48972",
- "reference": "53a4b737e83be724efd2bc4e7b929b9a30c48972",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ed363c3ce393560a1c300dce0298bbf0f0528b13",
+ "reference": "ed363c3ce393560a1c300dce0298bbf0f0528b13",
"shasum": ""
},
"require": {
@@ -10807,13 +11668,17 @@
"testing",
"xunit"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.1"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-10-02T03:37:32+00:00"
+ "time": "2020-10-26T15:46:21+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -10863,6 +11728,10 @@
"filesystem",
"iterator"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+ "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
@@ -10922,6 +11791,10 @@
"keywords": [
"process"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+ "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
@@ -10932,16 +11805,16 @@
},
{
"name": "phpunit/php-text-template",
- "version": "2.0.3",
+ "version": "2.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-text-template.git",
- "reference": "18c887016e60e52477e54534956d7b47bc52cd84"
+ "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/18c887016e60e52477e54534956d7b47bc52cd84",
- "reference": "18c887016e60e52477e54534956d7b47bc52cd84",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+ "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
"shasum": ""
},
"require": {
@@ -10977,26 +11850,30 @@
"keywords": [
"template"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+ "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-09-28T06:03:05+00:00"
+ "time": "2020-10-26T05:33:50+00:00"
},
{
"name": "phpunit/php-timer",
- "version": "5.0.2",
+ "version": "5.0.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git",
- "reference": "c9ff14f493699e2f6adee9fd06a0245b276643b7"
+ "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/c9ff14f493699e2f6adee9fd06a0245b276643b7",
- "reference": "c9ff14f493699e2f6adee9fd06a0245b276643b7",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+ "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
"shasum": ""
},
"require": {
@@ -11032,26 +11909,30 @@
"keywords": [
"timer"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+ "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-09-28T06:00:25+00:00"
+ "time": "2020-10-26T13:16:10+00:00"
},
{
"name": "phpunit/phpunit",
- "version": "9.4.0",
+ "version": "9.4.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "ef533467a7974c4b6c354f3eff42a115910bd4e5"
+ "reference": "3866b2eeeed21b1b099c4bc0b7a1690ac6fd5baa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ef533467a7974c4b6c354f3eff42a115910bd4e5",
- "reference": "ef533467a7974c4b6c354f3eff42a115910bd4e5",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3866b2eeeed21b1b099c4bc0b7a1690ac6fd5baa",
+ "reference": "3866b2eeeed21b1b099c4bc0b7a1690ac6fd5baa",
"shasum": ""
},
"require": {
@@ -11066,23 +11947,23 @@
"phar-io/manifest": "^2.0.1",
"phar-io/version": "^3.0.2",
"php": ">=7.3",
- "phpspec/prophecy": "^1.11.1",
+ "phpspec/prophecy": "^1.12.1",
"phpunit/php-code-coverage": "^9.2",
- "phpunit/php-file-iterator": "^3.0.4",
- "phpunit/php-invoker": "^3.1",
- "phpunit/php-text-template": "^2.0.2",
- "phpunit/php-timer": "^5.0.1",
- "sebastian/cli-parser": "^1.0",
- "sebastian/code-unit": "^1.0.5",
- "sebastian/comparator": "^4.0.3",
- "sebastian/diff": "^4.0.2",
- "sebastian/environment": "^5.1.2",
- "sebastian/exporter": "^4.0.2",
- "sebastian/global-state": "^5.0",
- "sebastian/object-enumerator": "^4.0.2",
- "sebastian/resource-operations": "^3.0.2",
- "sebastian/type": "^2.2.1",
- "sebastian/version": "^3.0.1"
+ "phpunit/php-file-iterator": "^3.0.5",
+ "phpunit/php-invoker": "^3.1.1",
+ "phpunit/php-text-template": "^2.0.3",
+ "phpunit/php-timer": "^5.0.2",
+ "sebastian/cli-parser": "^1.0.1",
+ "sebastian/code-unit": "^1.0.6",
+ "sebastian/comparator": "^4.0.5",
+ "sebastian/diff": "^4.0.3",
+ "sebastian/environment": "^5.1.3",
+ "sebastian/exporter": "^4.0.3",
+ "sebastian/global-state": "^5.0.1",
+ "sebastian/object-enumerator": "^4.0.3",
+ "sebastian/resource-operations": "^3.0.3",
+ "sebastian/type": "^2.3",
+ "sebastian/version": "^3.0.2"
},
"require-dev": {
"ext-pdo": "*",
@@ -11127,6 +12008,10 @@
"testing",
"xunit"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.4.2"
+ },
"funding": [
{
"url": "https://phpunit.de/donate.html",
@@ -11137,20 +12022,20 @@
"type": "github"
}
],
- "time": "2020-10-02T03:54:37+00:00"
+ "time": "2020-10-19T09:23:29+00:00"
},
{
"name": "scrivo/highlight.php",
- "version": "v9.18.1.2",
+ "version": "v9.18.1.3",
"source": {
"type": "git",
"url": "https://github.com/scrivo/highlight.php.git",
- "reference": "efb6e445494a9458aa59b0af5edfa4bdcc6809d9"
+ "reference": "6a1699707b099081f20a488ac1f92d682181018c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/efb6e445494a9458aa59b0af5edfa4bdcc6809d9",
- "reference": "efb6e445494a9458aa59b0af5edfa4bdcc6809d9",
+ "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/6a1699707b099081f20a488ac1f92d682181018c",
+ "reference": "6a1699707b099081f20a488ac1f92d682181018c",
"shasum": ""
},
"require": {
@@ -11206,13 +12091,17 @@
"highlight.php",
"syntax"
],
+ "support": {
+ "issues": "https://github.com/scrivo/highlight.php/issues",
+ "source": "https://github.com/scrivo/highlight.php"
+ },
"funding": [
{
"url": "https://github.com/allejo",
"type": "github"
}
],
- "time": "2020-08-27T03:24:44+00:00"
+ "time": "2020-10-16T07:43:22+00:00"
},
{
"name": "sebastian/cli-parser",
@@ -11258,6 +12147,10 @@
],
"description": "Library for parsing CLI options",
"homepage": "https://github.com/sebastianbergmann/cli-parser",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
+ "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
@@ -11268,16 +12161,16 @@
},
{
"name": "sebastian/code-unit",
- "version": "1.0.7",
+ "version": "1.0.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/code-unit.git",
- "reference": "59236be62b1bb9919e6d7f60b0b832dc05cef9ab"
+ "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/59236be62b1bb9919e6d7f60b0b832dc05cef9ab",
- "reference": "59236be62b1bb9919e6d7f60b0b832dc05cef9ab",
+ "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
+ "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
"shasum": ""
},
"require": {
@@ -11310,13 +12203,17 @@
],
"description": "Collection of value objects that represent the PHP code units",
"homepage": "https://github.com/sebastianbergmann/code-unit",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/code-unit/issues",
+ "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-10-02T14:47:54+00:00"
+ "time": "2020-10-26T13:08:54+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -11361,6 +12258,10 @@
],
"description": "Looks up which function or method a line of code belongs to",
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+ "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
@@ -11371,16 +12272,16 @@
},
{
"name": "sebastian/comparator",
- "version": "4.0.5",
+ "version": "4.0.6",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "7a8ff306445707539c1a6397372a982a1ec55120"
+ "reference": "55f4261989e546dc112258c7a75935a81a7ce382"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/7a8ff306445707539c1a6397372a982a1ec55120",
- "reference": "7a8ff306445707539c1a6397372a982a1ec55120",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382",
+ "reference": "55f4261989e546dc112258c7a75935a81a7ce382",
"shasum": ""
},
"require": {
@@ -11431,26 +12332,30 @@
"compare",
"equality"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/comparator/issues",
+ "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-09-30T06:47:25+00:00"
+ "time": "2020-10-26T15:49:45+00:00"
},
{
"name": "sebastian/complexity",
- "version": "2.0.1",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/complexity.git",
- "reference": "ba8cc2da0c0bfbc813d03b56406734030c7f1eff"
+ "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/ba8cc2da0c0bfbc813d03b56406734030c7f1eff",
- "reference": "ba8cc2da0c0bfbc813d03b56406734030c7f1eff",
+ "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
+ "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
"shasum": ""
},
"require": {
@@ -11484,26 +12389,30 @@
],
"description": "Library for calculating the complexity of PHP code units",
"homepage": "https://github.com/sebastianbergmann/complexity",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/complexity/issues",
+ "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-09-28T06:05:03+00:00"
+ "time": "2020-10-26T15:52:27+00:00"
},
{
"name": "sebastian/diff",
- "version": "4.0.3",
+ "version": "4.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "ffc949a1a2aae270ea064453d7535b82e4c32092"
+ "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ffc949a1a2aae270ea064453d7535b82e4c32092",
- "reference": "ffc949a1a2aae270ea064453d7535b82e4c32092",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+ "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
"shasum": ""
},
"require": {
@@ -11546,13 +12455,17 @@
"unidiff",
"unified diff"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/diff/issues",
+ "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-09-28T05:32:55+00:00"
+ "time": "2020-10-26T13:10:38+00:00"
},
{
"name": "sebastian/environment",
@@ -11605,6 +12518,10 @@
"environment",
"hhvm"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/environment/issues",
+ "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
@@ -11678,6 +12595,10 @@
"export",
"exporter"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/exporter/issues",
+ "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.3"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
@@ -11688,16 +12609,16 @@
},
{
"name": "sebastian/global-state",
- "version": "5.0.1",
+ "version": "5.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/global-state.git",
- "reference": "ea779cb749a478b22a2564ac41cd7bda79c78dc7"
+ "reference": "a90ccbddffa067b51f574dea6eb25d5680839455"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/ea779cb749a478b22a2564ac41cd7bda79c78dc7",
- "reference": "ea779cb749a478b22a2564ac41cd7bda79c78dc7",
+ "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/a90ccbddffa067b51f574dea6eb25d5680839455",
+ "reference": "a90ccbddffa067b51f574dea6eb25d5680839455",
"shasum": ""
},
"require": {
@@ -11738,26 +12659,30 @@
"keywords": [
"global state"
],
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/global-state/issues",
+ "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.2"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-09-28T05:54:06+00:00"
+ "time": "2020-10-26T15:55:19+00:00"
},
{
"name": "sebastian/lines-of-code",
- "version": "1.0.1",
+ "version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/lines-of-code.git",
- "reference": "6514b8f21906b8b46f520d1fbd17a4523fa59a54"
+ "reference": "acf76492a65401babcf5283296fa510782783a7a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/6514b8f21906b8b46f520d1fbd17a4523fa59a54",
- "reference": "6514b8f21906b8b46f520d1fbd17a4523fa59a54",
+ "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/acf76492a65401babcf5283296fa510782783a7a",
+ "reference": "acf76492a65401babcf5283296fa510782783a7a",
"shasum": ""
},
"require": {
@@ -11791,26 +12716,30 @@
],
"description": "Library for counting the lines of code in PHP source code",
"homepage": "https://github.com/sebastianbergmann/lines-of-code",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+ "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.2"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-09-28T06:07:27+00:00"
+ "time": "2020-10-26T17:03:56+00:00"
},
{
"name": "sebastian/object-enumerator",
- "version": "4.0.3",
+ "version": "4.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/object-enumerator.git",
- "reference": "f6f5957013d84725427d361507e13513702888a4"
+ "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/f6f5957013d84725427d361507e13513702888a4",
- "reference": "f6f5957013d84725427d361507e13513702888a4",
+ "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
+ "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
"shasum": ""
},
"require": {
@@ -11844,26 +12773,30 @@
],
"description": "Traverses array structures and object graphs to enumerate all referenced objects",
"homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+ "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-09-28T05:55:06+00:00"
+ "time": "2020-10-26T13:12:34+00:00"
},
{
"name": "sebastian/object-reflector",
- "version": "2.0.3",
+ "version": "2.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/object-reflector.git",
- "reference": "d9d0ab3b12acb1768bc1e0a89b23c90d2043cbe5"
+ "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/d9d0ab3b12acb1768bc1e0a89b23c90d2043cbe5",
- "reference": "d9d0ab3b12acb1768bc1e0a89b23c90d2043cbe5",
+ "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+ "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
"shasum": ""
},
"require": {
@@ -11895,26 +12828,30 @@
],
"description": "Allows reflection of object attributes, including inherited and non-public ones",
"homepage": "https://github.com/sebastianbergmann/object-reflector/",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+ "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-09-28T05:56:16+00:00"
+ "time": "2020-10-26T13:14:26+00:00"
},
{
"name": "sebastian/recursion-context",
- "version": "4.0.3",
+ "version": "4.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git",
- "reference": "ed8c9cd355089134bc9cba421b5cfdd58f0eaef7"
+ "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/ed8c9cd355089134bc9cba421b5cfdd58f0eaef7",
- "reference": "ed8c9cd355089134bc9cba421b5cfdd58f0eaef7",
+ "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
+ "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
"shasum": ""
},
"require": {
@@ -11954,13 +12891,17 @@
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+ "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-09-28T05:17:32+00:00"
+ "time": "2020-10-26T13:17:30+00:00"
},
{
"name": "sebastian/resource-operations",
@@ -12005,6 +12946,10 @@
],
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
+ "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
@@ -12015,16 +12960,16 @@
},
{
"name": "sebastian/type",
- "version": "2.3.0",
+ "version": "2.3.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/type.git",
- "reference": "fa592377f3923946cb90bf1f6a71ba2e5f229909"
+ "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fa592377f3923946cb90bf1f6a71ba2e5f229909",
- "reference": "fa592377f3923946cb90bf1f6a71ba2e5f229909",
+ "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/81cd61ab7bbf2de744aba0ea61fae32f721df3d2",
+ "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2",
"shasum": ""
},
"require": {
@@ -12057,13 +13002,17 @@
],
"description": "Collection of value objects that represent the types of the PHP type system",
"homepage": "https://github.com/sebastianbergmann/type",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/type/issues",
+ "source": "https://github.com/sebastianbergmann/type/tree/2.3.1"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
- "time": "2020-10-06T08:41:03+00:00"
+ "time": "2020-10-26T13:18:59+00:00"
},
{
"name": "sebastian/version",
@@ -12106,6 +13055,10 @@
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version",
+ "support": {
+ "issues": "https://github.com/sebastianbergmann/version/issues",
+ "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
+ },
"funding": [
{
"url": "https://github.com/sebastianbergmann",
@@ -12116,16 +13069,16 @@
},
{
"name": "swagger-api/swagger-ui",
- "version": "v3.35.0",
+ "version": "v3.36.0",
"source": {
"type": "git",
"url": "https://github.com/swagger-api/swagger-ui.git",
- "reference": "db2cca8e8691f48c1e27a543e1cee97e760c0742"
+ "reference": "b9915b112821eca7bd99926787fbe38b91204d5d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/db2cca8e8691f48c1e27a543e1cee97e760c0742",
- "reference": "db2cca8e8691f48c1e27a543e1cee97e760c0742",
+ "url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/b9915b112821eca7bd99926787fbe38b91204d5d",
+ "reference": "b9915b112821eca7bd99926787fbe38b91204d5d",
"shasum": ""
},
"type": "library",
@@ -12169,7 +13122,11 @@
"swagger",
"ui"
],
- "time": "2020-10-01T18:14:37+00:00"
+ "support": {
+ "issues": "https://github.com/swagger-api/swagger-ui/issues",
+ "source": "https://github.com/swagger-api/swagger-ui/tree/v3.36.0"
+ },
+ "time": "2020-10-22T17:41:54+00:00"
},
{
"name": "symfony/debug",
@@ -12226,6 +13183,9 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/debug/tree/4.4"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -12303,6 +13263,9 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/yaml/tree/v5.1.7"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -12357,6 +13320,10 @@
}
],
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+ "support": {
+ "issues": "https://github.com/theseer/tokenizer/issues",
+ "source": "https://github.com/theseer/tokenizer/tree/master"
+ },
"funding": [
{
"url": "https://github.com/theseer",
@@ -12365,6 +13332,111 @@
],
"time": "2020-07-12T23:59:07+00:00"
},
+ {
+ "name": "vimeo/psalm",
+ "version": "4.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/vimeo/psalm.git",
+ "reference": "b1e2e30026936ef8d5bf6a354d1c3959b6231f44"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/vimeo/psalm/zipball/b1e2e30026936ef8d5bf6a354d1c3959b6231f44",
+ "reference": "b1e2e30026936ef8d5bf6a354d1c3959b6231f44",
+ "shasum": ""
+ },
+ "require": {
+ "amphp/amp": "^2.1",
+ "amphp/byte-stream": "^1.5",
+ "composer/package-versions-deprecated": "^1.8.0",
+ "composer/semver": "^1.4 || ^2.0 || ^3.0",
+ "composer/xdebug-handler": "^1.1",
+ "dnoegel/php-xdg-base-dir": "^0.1.1",
+ "ext-dom": "*",
+ "ext-json": "*",
+ "ext-libxml": "*",
+ "ext-mbstring": "*",
+ "ext-simplexml": "*",
+ "ext-tokenizer": "*",
+ "felixfbecker/advanced-json-rpc": "^3.0.3",
+ "felixfbecker/language-server-protocol": "^1.4",
+ "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0",
+ "nikic/php-parser": "^4.10.1",
+ "openlss/lib-array2xml": "^1.0",
+ "php": "^7.3|^8",
+ "sebastian/diff": "^3.0 || ^4.0",
+ "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0",
+ "webmozart/glob": "^4.1",
+ "webmozart/path-util": "^2.3"
+ },
+ "provide": {
+ "psalm/psalm": "self.version"
+ },
+ "require-dev": {
+ "amphp/amp": "^2.4.2",
+ "bamarni/composer-bin-plugin": "^1.2",
+ "brianium/paratest": "^4.0.0",
+ "ext-curl": "*",
+ "phpdocumentor/reflection-docblock": "^5",
+ "phpmyadmin/sql-parser": "5.1.0",
+ "phpspec/prophecy": ">=1.9.0",
+ "phpunit/phpunit": "^9.0",
+ "psalm/plugin-phpunit": "^0.13",
+ "slevomat/coding-standard": "^5.0",
+ "squizlabs/php_codesniffer": "^3.5",
+ "symfony/process": "^4.3",
+ "weirdan/prophecy-shim": "^1.0 || ^2.0"
+ },
+ "suggest": {
+ "ext-igbinary": "^2.0.5"
+ },
+ "bin": [
+ "psalm",
+ "psalm-language-server",
+ "psalm-plugin",
+ "psalm-refactor",
+ "psalter"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.x-dev",
+ "dev-3.x": "3.x-dev",
+ "dev-2.x": "2.x-dev",
+ "dev-1.x": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psalm\\": "src/Psalm/"
+ },
+ "files": [
+ "src/functions.php",
+ "src/spl_object_id.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Matthew Brown"
+ }
+ ],
+ "description": "A static analysis tool for finding errors in PHP applications",
+ "keywords": [
+ "code",
+ "inspection",
+ "php"
+ ],
+ "support": {
+ "issues": "https://github.com/vimeo/psalm/issues",
+ "source": "https://github.com/vimeo/psalm/tree/4.0.1"
+ },
+ "time": "2020-10-20T13:40:17+00:00"
+ },
{
"name": "webmozart/assert",
"version": "1.9.1",
@@ -12412,8 +13484,113 @@
"check",
"validate"
],
+ "support": {
+ "issues": "https://github.com/webmozart/assert/issues",
+ "source": "https://github.com/webmozart/assert/tree/master"
+ },
"time": "2020-07-08T17:02:28+00:00"
},
+ {
+ "name": "webmozart/glob",
+ "version": "4.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/webmozart/glob.git",
+ "reference": "3cbf63d4973cf9d780b93d2da8eec7e4a9e63bbe"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/webmozart/glob/zipball/3cbf63d4973cf9d780b93d2da8eec7e4a9e63bbe",
+ "reference": "3cbf63d4973cf9d780b93d2da8eec7e4a9e63bbe",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.3.3|^7.0",
+ "webmozart/path-util": "^2.2"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.6",
+ "sebastian/version": "^1.0.1",
+ "symfony/filesystem": "^2.5"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.1-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Webmozart\\Glob\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Bernhard Schussek",
+ "email": "bschussek@gmail.com"
+ }
+ ],
+ "description": "A PHP implementation of Ant's glob.",
+ "support": {
+ "issues": "https://github.com/webmozart/glob/issues",
+ "source": "https://github.com/webmozart/glob/tree/master"
+ },
+ "time": "2015-12-29T11:14:33+00:00"
+ },
+ {
+ "name": "webmozart/path-util",
+ "version": "2.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/webmozart/path-util.git",
+ "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/webmozart/path-util/zipball/d939f7edc24c9a1bb9c0dee5cb05d8e859490725",
+ "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "webmozart/assert": "~1.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.6",
+ "sebastian/version": "^1.0.1"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Webmozart\\PathUtil\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Bernhard Schussek",
+ "email": "bschussek@gmail.com"
+ }
+ ],
+ "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.",
+ "support": {
+ "issues": "https://github.com/webmozart/path-util/issues",
+ "source": "https://github.com/webmozart/path-util/tree/2.3.0"
+ },
+ "time": "2015-12-17T08:42:14+00:00"
+ },
{
"name": "wildbit/postmark-php",
"version": "4.0.0",
@@ -12446,6 +13623,10 @@
"MIT"
],
"description": "The officially supported client for Postmark (http://postmarkapp.com)",
+ "support": {
+ "issues": "https://github.com/wildbit/postmark-php/issues",
+ "source": "https://github.com/wildbit/postmark-php/tree/4.0.0"
+ },
"time": "2020-09-10T16:36:51+00:00"
},
{
@@ -12513,6 +13694,10 @@
"rest",
"service discovery"
],
+ "support": {
+ "issues": "https://github.com/zircote/swagger-php/issues",
+ "source": "https://github.com/zircote/swagger-php/tree/3.1.0"
+ },
"time": "2020-09-03T20:18:43+00:00"
}
],
@@ -12528,5 +13713,5 @@
"ext-json": "*"
},
"platform-dev": [],
- "plugin-api-version": "1.1.0"
+ "plugin-api-version": "2.0.0"
}
diff --git a/config/app.php b/config/app.php
index bbd643def594..c1dd0812a8ef 100644
--- a/config/app.php
+++ b/config/app.php
@@ -181,6 +181,7 @@ return [
App\Providers\MultiDBProvider::class,
App\Providers\ClientPortalServiceProvider::class,
App\Providers\NinjaTranslationServiceProvider::class,
+
],
/*
diff --git a/config/ninja.php b/config/ninja.php
index 1356bc393528..2ea9e28e7557 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.19',
+ 'app_version' => '5.0.22',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''),
diff --git a/database/factories/CreditInvitationFactory.php b/database/factories/CreditInvitationFactory.php
new file mode 100644
index 000000000000..1c74de5406f8
--- /dev/null
+++ b/database/factories/CreditInvitationFactory.php
@@ -0,0 +1,37 @@
+ Str::random(40),
+ ];
+ }
+}
\ No newline at end of file
diff --git a/database/factories/TaskStatusFactory.php b/database/factories/TaskStatusFactory.php
new file mode 100644
index 000000000000..02f49d3e0dd3
--- /dev/null
+++ b/database/factories/TaskStatusFactory.php
@@ -0,0 +1,38 @@
+ $this->faker->text(7),
+ ];
+ }
+}
\ No newline at end of file
diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php
index 28edf4625a34..a19aa434da38 100644
--- a/database/migrations/2014_10_12_100000_create_password_resets_table.php
+++ b/database/migrations/2014_10_12_100000_create_password_resets_table.php
@@ -1,4 +1,14 @@
dropUnique('projects_company_id_name_unique');
+ });
+
+ Schema::table('expenses', function (Blueprint $table) {
+ $table->unsignedInteger('invoice_currency_id')->nullable()->change();
+ $table->unsignedInteger('expense_currency_id')->nullable()->change();
+ $table->text('private_notes')->nullable()->change();
+ $table->text('public_notes')->nullable()->change();
+ $table->text('transaction_reference')->nullable()->change();
+ });
+
+ Schema::table('companies', function (Blueprint $table) {
+ $table->boolean('invoice_expense_documents')->default(false);
+ $table->boolean('auto_start_tasks')->default(false);
+
+ });
+
+ Schema::create('task_statuses', function (Blueprint $table) {
+ $table->increments('id');
+ $table->string('name')->nullable();
+ $table->unsignedInteger('company_id')->nullable();
+ $table->unsignedInteger('user_id')->nullable();
+ $table->boolean('is_deleted')->default(0);
+ $table->timestamps(6);
+ $table->softDeletes('deleted_at', 6);
+
+ $table->index(['company_id', 'deleted_at']);
+
+ $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade')->onUpdate('cascade');
+ $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade')->onUpdate('cascade');
+ });
+
+ Schema::table('tasks', function (Blueprint $table) {
+ $table->decimal('rate', 16, 4)->default(0);
+ $table->renameColumn('task_status_id', 'status_id');
+ $table->renameColumn('task_status_sort_order', 'sort_order');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ //
+ }
+}
diff --git a/database/migrations/2020_10_21_222738_expenses_nullable_assigned_user.php b/database/migrations/2020_10_21_222738_expenses_nullable_assigned_user.php
new file mode 100644
index 000000000000..6a88014227da
--- /dev/null
+++ b/database/migrations/2020_10_21_222738_expenses_nullable_assigned_user.php
@@ -0,0 +1,42 @@
+unsignedInteger('assigned_user_id')->nullable()->change();
+
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ //
+ }
+}
diff --git a/database/migrations/2020_10_22_204900_company_table_fields.php b/database/migrations/2020_10_22_204900_company_table_fields.php
new file mode 100644
index 000000000000..107f18575fa5
--- /dev/null
+++ b/database/migrations/2020_10_22_204900_company_table_fields.php
@@ -0,0 +1,36 @@
+boolean('invoice_task_timelog')->default(true);
+ $table->boolean('invoice_task_documents')->default(false);
+ $table->dropColumn('use_credits_payment');
+ });
+
+ Schema::table('task_statuses', function(Blueprint $table){
+ $table->unsignedInteger('status_sort_order')->default(0);
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ //
+ }
+}
diff --git a/database/migrations/2020_10_27_021751_tasks_invoice_documents.php b/database/migrations/2020_10_27_021751_tasks_invoice_documents.php
new file mode 100644
index 000000000000..3bb2c8ddd366
--- /dev/null
+++ b/database/migrations/2020_10_27_021751_tasks_invoice_documents.php
@@ -0,0 +1,35 @@
+boolean('invoice_documents')->default(0);
+ });
+
+ Schema::table('companies', function(Blueprint $table){
+ $table->boolean('show_tasks_table')->default();
+ });
+
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ //
+ }
+}
diff --git a/database/schema/db-ninja-01-schema.dump b/database/schema/db-ninja-01-schema.dump
new file mode 100644
index 000000000000..d51c60492349
--- /dev/null
+++ b/database/schema/db-ninja-01-schema.dump
@@ -0,0 +1,1691 @@
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `accounts` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `plan` enum('pro','enterprise','white_label') COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `plan_term` enum('month','year') COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `plan_started` date DEFAULT NULL,
+ `plan_paid` date DEFAULT NULL,
+ `plan_expires` date DEFAULT NULL,
+ `user_agent` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `key` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `payment_id` int(10) unsigned DEFAULT NULL,
+ `default_company_id` int(10) unsigned NOT NULL,
+ `trial_started` date DEFAULT NULL,
+ `trial_plan` enum('pro','enterprise') COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `plan_price` decimal(7,2) DEFAULT NULL,
+ `num_users` smallint(6) NOT NULL DEFAULT '1',
+ `utm_source` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `utm_medium` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `utm_campaign` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `utm_term` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `utm_content` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `latest_version` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0.0.0',
+ `report_errors` tinyint(1) NOT NULL DEFAULT '0',
+ `referral_code` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `accounts_payment_id_index` (`payment_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `activities` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `user_id` int(10) unsigned DEFAULT NULL,
+ `company_id` int(10) unsigned NOT NULL,
+ `client_id` int(10) unsigned DEFAULT NULL,
+ `client_contact_id` int(10) unsigned DEFAULT NULL,
+ `account_id` int(10) unsigned DEFAULT NULL,
+ `project_id` int(10) unsigned DEFAULT NULL,
+ `vendor_id` int(10) unsigned DEFAULT NULL,
+ `payment_id` int(10) unsigned DEFAULT NULL,
+ `invoice_id` int(10) unsigned DEFAULT NULL,
+ `credit_id` int(10) unsigned DEFAULT NULL,
+ `invitation_id` int(10) unsigned DEFAULT NULL,
+ `task_id` int(10) unsigned DEFAULT NULL,
+ `expense_id` int(10) unsigned DEFAULT NULL,
+ `activity_type_id` int(10) unsigned DEFAULT NULL,
+ `ip` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `is_system` tinyint(1) NOT NULL DEFAULT '0',
+ `notes` text COLLATE utf8mb4_unicode_ci NOT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `token_id` int(10) unsigned DEFAULT NULL,
+ `quote_id` int(10) unsigned DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `activities_vendor_id_company_id_index` (`vendor_id`,`company_id`),
+ KEY `activities_project_id_company_id_index` (`project_id`,`company_id`),
+ KEY `activities_user_id_company_id_index` (`user_id`,`company_id`),
+ KEY `activities_client_id_company_id_index` (`client_id`,`company_id`),
+ KEY `activities_payment_id_company_id_index` (`payment_id`,`company_id`),
+ KEY `activities_invoice_id_company_id_index` (`invoice_id`,`company_id`),
+ KEY `activities_credit_id_company_id_index` (`credit_id`,`company_id`),
+ KEY `activities_invitation_id_company_id_index` (`invitation_id`,`company_id`),
+ KEY `activities_task_id_company_id_index` (`task_id`,`company_id`),
+ KEY `activities_expense_id_company_id_index` (`expense_id`,`company_id`),
+ KEY `activities_client_contact_id_company_id_index` (`client_contact_id`,`company_id`),
+ KEY `activities_company_id_foreign` (`company_id`),
+ CONSTRAINT `activities_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `backups` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `activity_id` int(10) unsigned NOT NULL,
+ `json_backup` mediumtext COLLATE utf8mb4_unicode_ci,
+ `html_backup` longtext COLLATE utf8mb4_unicode_ci,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `amount` decimal(16,4) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `backups_activity_id_foreign` (`activity_id`),
+ CONSTRAINT `backups_activity_id_foreign` FOREIGN KEY (`activity_id`) REFERENCES `activities` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `bank_companies` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned NOT NULL,
+ `bank_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `username` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `bank_companies_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `bank_companies_user_id_foreign` (`user_id`),
+ KEY `bank_companies_bank_id_foreign` (`bank_id`),
+ CONSTRAINT `bank_companies_bank_id_foreign` FOREIGN KEY (`bank_id`) REFERENCES `banks` (`id`),
+ CONSTRAINT `bank_companies_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `bank_companies_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `bank_subcompanies` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `bank_company_id` int(10) unsigned NOT NULL,
+ `account_name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `website` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `account_number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `bank_subcompanies_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `bank_subcompanies_user_id_foreign` (`user_id`),
+ KEY `bank_subcompanies_bank_company_id_foreign` (`bank_company_id`),
+ CONSTRAINT `bank_subcompanies_bank_company_id_foreign` FOREIGN KEY (`bank_company_id`) REFERENCES `bank_companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `bank_subcompanies_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `bank_subcompanies_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `banks` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `remote_id` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `bank_library_id` int(11) NOT NULL DEFAULT '1',
+ `config` text COLLATE utf8mb4_unicode_ci,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `client_contacts` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned NOT NULL,
+ `client_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `first_name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `last_name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `phone` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value4` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `email` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `email_verified_at` timestamp NULL DEFAULT NULL,
+ `confirmation_code` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `is_primary` tinyint(1) NOT NULL DEFAULT '0',
+ `confirmed` tinyint(1) NOT NULL DEFAULT '0',
+ `last_login` timestamp NULL DEFAULT NULL,
+ `failed_logins` smallint(6) DEFAULT NULL,
+ `oauth_user_id` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `oauth_provider_id` int(10) unsigned DEFAULT NULL,
+ `google_2fa_secret` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `accepted_terms_version` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `avatar` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `avatar_type` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `avatar_size` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `password` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `token` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `is_locked` tinyint(1) NOT NULL DEFAULT '0',
+ `send_email` tinyint(1) NOT NULL DEFAULT '1',
+ `contact_key` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `remember_token` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `client_contacts_oauth_user_id_unique` (`oauth_user_id`),
+ UNIQUE KEY `client_contacts_oauth_provider_id_unique` (`oauth_provider_id`),
+ KEY `client_contacts_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `client_contacts_company_id_email_deleted_at_index` (`company_id`,`email`,`deleted_at`),
+ KEY `client_contacts_company_id_index` (`company_id`),
+ KEY `client_contacts_client_id_index` (`client_id`),
+ KEY `client_contacts_user_id_index` (`user_id`),
+ CONSTRAINT `client_contacts_client_id_foreign` FOREIGN KEY (`client_id`) REFERENCES `clients` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `client_gateway_tokens` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned NOT NULL,
+ `client_id` int(10) unsigned DEFAULT NULL,
+ `token` text COLLATE utf8mb4_unicode_ci,
+ `routing_number` text COLLATE utf8mb4_unicode_ci,
+ `company_gateway_id` int(10) unsigned NOT NULL,
+ `gateway_customer_reference` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `gateway_type_id` int(10) unsigned NOT NULL,
+ `is_default` tinyint(1) NOT NULL DEFAULT '0',
+ `meta` text COLLATE utf8mb4_unicode_ci,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `client_gateway_tokens_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `client_gateway_tokens_client_id_foreign` (`client_id`),
+ CONSTRAINT `client_gateway_tokens_client_id_foreign` FOREIGN KEY (`client_id`) REFERENCES `clients` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `client_gateway_tokens_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `clients` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `assigned_user_id` int(10) unsigned DEFAULT NULL,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `website` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `private_notes` text COLLATE utf8mb4_unicode_ci,
+ `public_notes` text COLLATE utf8mb4_unicode_ci,
+ `client_hash` text COLLATE utf8mb4_unicode_ci,
+ `logo` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `phone` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `balance` decimal(16,4) NOT NULL DEFAULT '0.0000',
+ `paid_to_date` decimal(16,4) NOT NULL DEFAULT '0.0000',
+ `credit_balance` decimal(16,4) NOT NULL DEFAULT '0.0000',
+ `last_login` timestamp NULL DEFAULT NULL,
+ `industry_id` int(10) unsigned DEFAULT NULL,
+ `size_id` int(10) unsigned DEFAULT NULL,
+ `address1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `address2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `city` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `state` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `postal_code` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `country_id` int(10) unsigned DEFAULT NULL,
+ `custom_value1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value4` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `shipping_address1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `shipping_address2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `shipping_city` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `shipping_state` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `shipping_postal_code` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `shipping_country_id` int(10) unsigned DEFAULT NULL,
+ `settings` mediumtext COLLATE utf8mb4_unicode_ci,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ `group_settings_id` int(10) unsigned DEFAULT NULL,
+ `vat_number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `id_number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `clients_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `clients_industry_id_foreign` (`industry_id`),
+ KEY `clients_size_id_foreign` (`size_id`),
+ KEY `clients_company_id_index` (`company_id`),
+ KEY `clients_user_id_index` (`user_id`),
+ CONSTRAINT `clients_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `clients_industry_id_foreign` FOREIGN KEY (`industry_id`) REFERENCES `industries` (`id`),
+ CONSTRAINT `clients_size_id_foreign` FOREIGN KEY (`size_id`) REFERENCES `sizes` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `companies` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `account_id` int(10) unsigned NOT NULL,
+ `industry_id` int(10) unsigned DEFAULT NULL,
+ `ip` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `company_key` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `logo` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `convert_products` tinyint(1) NOT NULL DEFAULT '0',
+ `fill_products` tinyint(1) NOT NULL DEFAULT '1',
+ `update_products` tinyint(1) NOT NULL DEFAULT '1',
+ `show_product_details` tinyint(1) NOT NULL DEFAULT '1',
+ `client_can_register` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_surcharge_taxes1` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_surcharge_taxes2` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_surcharge_taxes3` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_surcharge_taxes4` tinyint(1) NOT NULL DEFAULT '0',
+ `show_product_cost` tinyint(1) NOT NULL DEFAULT '0',
+ `enabled_tax_rates` int(10) unsigned NOT NULL DEFAULT '0',
+ `enabled_modules` int(10) unsigned NOT NULL DEFAULT '0',
+ `enable_product_cost` tinyint(1) NOT NULL DEFAULT '0',
+ `enable_product_quantity` tinyint(1) NOT NULL DEFAULT '1',
+ `default_quantity` tinyint(1) NOT NULL DEFAULT '1',
+ `subdomain` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `db` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `size_id` int(10) unsigned DEFAULT NULL,
+ `first_day_of_week` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `first_month_of_year` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `portal_mode` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'subdomain',
+ `portal_domain` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `enable_modules` smallint(6) NOT NULL DEFAULT '0',
+ `custom_fields` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
+ `settings` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
+ `slack_webhook_url` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `google_analytics_key` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `enabled_item_tax_rates` int(11) NOT NULL DEFAULT '0',
+ `is_large` tinyint(1) NOT NULL DEFAULT '0',
+ `enable_shop_api` tinyint(1) NOT NULL DEFAULT '0',
+ `default_auto_bill` enum('off','always','optin','optout') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'off',
+ `mark_expenses_invoiceable` tinyint(1) NOT NULL DEFAULT '0',
+ `mark_expenses_paid` tinyint(1) NOT NULL DEFAULT '0',
+ `use_credits_payment` enum('always','off','option') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'off',
+ `invoice_expense_documents` tinyint(1) NOT NULL DEFAULT '0',
+ `auto_start_tasks` tinyint(1) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `companies_company_key_unique` (`company_key`),
+ KEY `companies_industry_id_foreign` (`industry_id`),
+ KEY `companies_size_id_foreign` (`size_id`),
+ KEY `companies_account_id_index` (`account_id`),
+ CONSTRAINT `companies_account_id_foreign` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `companies_industry_id_foreign` FOREIGN KEY (`industry_id`) REFERENCES `industries` (`id`),
+ CONSTRAINT `companies_size_id_foreign` FOREIGN KEY (`size_id`) REFERENCES `sizes` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `company_gateways` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `gateway_key` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `accepted_credit_cards` int(10) unsigned NOT NULL,
+ `require_cvv` tinyint(1) NOT NULL DEFAULT '1',
+ `show_billing_address` tinyint(1) DEFAULT '1',
+ `show_shipping_address` tinyint(1) DEFAULT '1',
+ `update_details` tinyint(1) DEFAULT '0',
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ `config` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
+ `fees_and_limits` text COLLATE utf8mb4_unicode_ci NOT NULL,
+ `custom_value1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value4` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ `token_billing` enum('off','always','optin','optout') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'off',
+ `label` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `company_gateways_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `company_gateways_gateway_key_foreign` (`gateway_key`),
+ KEY `company_gateways_user_id_foreign` (`user_id`),
+ CONSTRAINT `company_gateways_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `company_gateways_gateway_key_foreign` FOREIGN KEY (`gateway_key`) REFERENCES `gateways` (`key`),
+ CONSTRAINT `company_gateways_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `company_ledgers` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned NOT NULL,
+ `client_id` int(10) unsigned DEFAULT NULL,
+ `user_id` int(10) unsigned DEFAULT NULL,
+ `activity_id` int(10) unsigned DEFAULT NULL,
+ `adjustment` decimal(16,4) DEFAULT NULL,
+ `balance` decimal(16,4) DEFAULT NULL,
+ `notes` text COLLATE utf8mb4_unicode_ci,
+ `hash` text COLLATE utf8mb4_unicode_ci,
+ `company_ledgerable_id` int(10) unsigned NOT NULL,
+ `company_ledgerable_type` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `company_ledgers_company_id_foreign` (`company_id`),
+ KEY `company_ledgers_client_id_foreign` (`client_id`),
+ CONSTRAINT `company_ledgers_client_id_foreign` FOREIGN KEY (`client_id`) REFERENCES `clients` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `company_ledgers_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `company_tokens` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned NOT NULL,
+ `account_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `token` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ `is_system` tinyint(1) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `company_tokens_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `company_tokens_account_id_foreign` (`account_id`),
+ KEY `company_tokens_user_id_foreign` (`user_id`),
+ KEY `company_tokens_company_id_index` (`company_id`),
+ CONSTRAINT `company_tokens_account_id_foreign` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `company_tokens_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `company_tokens_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `company_user` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned NOT NULL,
+ `account_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `permissions` mediumtext COLLATE utf8mb4_unicode_ci,
+ `notifications` mediumtext COLLATE utf8mb4_unicode_ci,
+ `settings` mediumtext COLLATE utf8mb4_unicode_ci,
+ `slack_webhook_url` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `is_owner` tinyint(1) NOT NULL DEFAULT '0',
+ `is_admin` tinyint(1) NOT NULL DEFAULT '0',
+ `is_migrating` tinyint(1) NOT NULL DEFAULT '0',
+ `is_locked` tinyint(1) NOT NULL DEFAULT '0',
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `company_user_company_id_user_id_unique` (`company_id`,`user_id`),
+ KEY `company_user_account_id_company_id_deleted_at_index` (`account_id`,`company_id`,`deleted_at`),
+ KEY `company_user_user_id_index` (`user_id`),
+ CONSTRAINT `company_user_account_id_foreign` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`) ON DELETE CASCADE,
+ CONSTRAINT `company_user_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `countries` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `capital` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `citizenship` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `country_code` varchar(3) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `currency` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `currency_code` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `currency_sub_unit` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `full_name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `iso_3166_2` varchar(2) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `iso_3166_3` varchar(3) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `region_code` varchar(3) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `sub_region_code` varchar(3) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `eea` tinyint(1) NOT NULL DEFAULT '0',
+ `swap_postal_code` tinyint(1) NOT NULL DEFAULT '0',
+ `swap_currency_symbol` tinyint(1) NOT NULL DEFAULT '0',
+ `thousand_separator` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `decimal_separator` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `credit_invitations` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `client_contact_id` int(10) unsigned NOT NULL,
+ `credit_id` int(10) unsigned NOT NULL,
+ `key` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `transaction_reference` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `message_id` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `email_error` mediumtext COLLATE utf8mb4_unicode_ci,
+ `signature_base64` text COLLATE utf8mb4_unicode_ci,
+ `signature_date` datetime DEFAULT NULL,
+ `sent_date` datetime DEFAULT NULL,
+ `viewed_date` datetime DEFAULT NULL,
+ `opened_date` datetime DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `credit_invitations_client_contact_id_credit_id_unique` (`client_contact_id`,`credit_id`),
+ KEY `credit_invitations_user_id_foreign` (`user_id`),
+ KEY `credit_invitations_company_id_foreign` (`company_id`),
+ KEY `credit_invitations_deleted_at_credit_id_company_id_index` (`deleted_at`,`credit_id`,`company_id`),
+ KEY `credit_invitations_credit_id_index` (`credit_id`),
+ KEY `credit_invitations_key_index` (`key`),
+ CONSTRAINT `credit_invitations_client_contact_id_foreign` FOREIGN KEY (`client_contact_id`) REFERENCES `client_contacts` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `credit_invitations_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `credit_invitations_credit_id_foreign` FOREIGN KEY (`credit_id`) REFERENCES `credits` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `credit_invitations_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `credits` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `client_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `assigned_user_id` int(10) unsigned DEFAULT NULL,
+ `company_id` int(10) unsigned NOT NULL,
+ `status_id` int(10) unsigned NOT NULL,
+ `project_id` int(10) unsigned DEFAULT NULL,
+ `vendor_id` int(10) unsigned DEFAULT NULL,
+ `recurring_id` int(10) unsigned DEFAULT NULL,
+ `design_id` int(10) unsigned DEFAULT NULL,
+ `invoice_id` int(10) unsigned DEFAULT NULL,
+ `number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `discount` double(8,2) NOT NULL DEFAULT '0.00',
+ `is_amount_discount` tinyint(1) NOT NULL DEFAULT '0',
+ `po_number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `date` date DEFAULT NULL,
+ `last_sent_date` datetime DEFAULT NULL,
+ `due_date` date DEFAULT NULL,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ `line_items` mediumtext COLLATE utf8mb4_unicode_ci,
+ `backup` mediumtext COLLATE utf8mb4_unicode_ci,
+ `footer` text COLLATE utf8mb4_unicode_ci,
+ `public_notes` text COLLATE utf8mb4_unicode_ci,
+ `private_notes` text COLLATE utf8mb4_unicode_ci,
+ `terms` text COLLATE utf8mb4_unicode_ci,
+ `tax_name1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate1` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `tax_name2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate2` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `tax_name3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate3` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `total_taxes` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `uses_inclusive_taxes` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_value1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value4` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `next_send_date` datetime DEFAULT NULL,
+ `custom_surcharge1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_surcharge2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_surcharge3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_surcharge4` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_surcharge_tax1` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_surcharge_tax2` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_surcharge_tax3` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_surcharge_tax4` tinyint(1) NOT NULL DEFAULT '0',
+ `exchange_rate` decimal(13,6) NOT NULL DEFAULT '1.000000',
+ `amount` decimal(16,4) NOT NULL,
+ `balance` decimal(16,4) NOT NULL,
+ `partial` decimal(16,4) DEFAULT NULL,
+ `partial_due_date` datetime DEFAULT NULL,
+ `last_viewed` datetime DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ `reminder1_sent` date DEFAULT NULL,
+ `reminder2_sent` date DEFAULT NULL,
+ `reminder3_sent` date DEFAULT NULL,
+ `reminder_last_sent` date DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `credits_company_id_number_unique` (`company_id`,`number`),
+ KEY `credits_user_id_foreign` (`user_id`),
+ KEY `credits_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `credits_client_id_index` (`client_id`),
+ KEY `credits_company_id_index` (`company_id`),
+ CONSTRAINT `credits_client_id_foreign` FOREIGN KEY (`client_id`) REFERENCES `clients` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `credits_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `credits_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `currencies` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `symbol` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `precision` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `thousand_separator` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `decimal_separator` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `code` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `swap_currency_symbol` tinyint(1) NOT NULL DEFAULT '0',
+ `exchange_rate` decimal(13,6) NOT NULL DEFAULT '1.000000',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `date_formats` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `format` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `format_moment` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `format_dart` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `datetime_formats` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `format` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `format_moment` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `format_dart` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `designs` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `user_id` int(10) unsigned DEFAULT NULL,
+ `company_id` int(10) unsigned DEFAULT NULL,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `is_custom` tinyint(1) NOT NULL DEFAULT '1',
+ `is_active` tinyint(1) NOT NULL DEFAULT '1',
+ `design` mediumtext COLLATE utf8mb4_unicode_ci,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `designs_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `designs_company_id_index` (`company_id`),
+ CONSTRAINT `designs_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `documents` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `user_id` int(10) unsigned NOT NULL,
+ `assigned_user_id` int(10) unsigned NOT NULL,
+ `company_id` int(10) unsigned NOT NULL,
+ `project_id` int(10) unsigned DEFAULT NULL,
+ `vendor_id` int(10) unsigned DEFAULT NULL,
+ `url` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `preview` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `type` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `disk` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `hash` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `size` int(10) unsigned DEFAULT NULL,
+ `width` int(10) unsigned DEFAULT NULL,
+ `height` int(10) unsigned DEFAULT NULL,
+ `is_default` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_value1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value4` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ `documentable_id` int(10) unsigned NOT NULL,
+ `documentable_type` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `is_public` tinyint(1) NOT NULL DEFAULT '1',
+ PRIMARY KEY (`id`),
+ KEY `documents_company_id_index` (`company_id`),
+ CONSTRAINT `documents_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `expense_categories` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `user_id` int(10) unsigned NOT NULL,
+ `company_id` int(10) unsigned NOT NULL,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp NULL DEFAULT NULL,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `expense_categories_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `expense_categories_company_id_index` (`company_id`),
+ CONSTRAINT `expense_categories_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `expenses` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp NULL DEFAULT NULL,
+ `company_id` int(10) unsigned NOT NULL,
+ `vendor_id` int(10) unsigned DEFAULT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `assigned_user_id` int(10) unsigned DEFAULT NULL,
+ `invoice_id` int(10) unsigned DEFAULT NULL,
+ `client_id` int(10) unsigned DEFAULT NULL,
+ `bank_id` int(10) unsigned DEFAULT NULL,
+ `invoice_currency_id` int(10) unsigned DEFAULT NULL,
+ `expense_currency_id` int(10) unsigned DEFAULT NULL,
+ `category_id` int(10) unsigned DEFAULT NULL,
+ `payment_type_id` int(10) unsigned DEFAULT NULL,
+ `recurring_expense_id` int(10) unsigned DEFAULT NULL,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ `amount` decimal(13,2) NOT NULL,
+ `foreign_amount` decimal(13,2) NOT NULL,
+ `exchange_rate` decimal(13,6) NOT NULL DEFAULT '1.000000',
+ `tax_name1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate1` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `tax_name2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate2` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `tax_name3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate3` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `date` date DEFAULT NULL,
+ `payment_date` date DEFAULT NULL,
+ `private_notes` text COLLATE utf8mb4_unicode_ci,
+ `public_notes` text COLLATE utf8mb4_unicode_ci,
+ `transaction_reference` text COLLATE utf8mb4_unicode_ci,
+ `should_be_invoiced` tinyint(1) NOT NULL DEFAULT '0',
+ `invoice_documents` tinyint(1) NOT NULL DEFAULT '1',
+ `transaction_id` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value4` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `project_id` int(10) unsigned DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `expenses_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `expenses_user_id_foreign` (`user_id`),
+ KEY `expenses_company_id_index` (`company_id`),
+ CONSTRAINT `expenses_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `expenses_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `failed_jobs` (
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+ `connection` text COLLATE utf8mb4_unicode_ci NOT NULL,
+ `queue` text COLLATE utf8mb4_unicode_ci NOT NULL,
+ `payload` longtext COLLATE utf8mb4_unicode_ci NOT NULL,
+ `exception` longtext COLLATE utf8mb4_unicode_ci NOT NULL,
+ `failed_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `gateway_types` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `alias` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `gateways` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `key` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `provider` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `visible` tinyint(1) NOT NULL DEFAULT '1',
+ `sort_order` int(10) unsigned NOT NULL DEFAULT '10000',
+ `site_url` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `is_offsite` tinyint(1) NOT NULL DEFAULT '0',
+ `is_secure` tinyint(1) NOT NULL DEFAULT '0',
+ `fields` longtext COLLATE utf8mb4_unicode_ci,
+ `default_gateway_type_id` int(10) unsigned NOT NULL DEFAULT '1',
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `gateways_key_unique` (`key`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `group_settings` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned DEFAULT NULL,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `settings` mediumtext COLLATE utf8mb4_unicode_ci,
+ `is_default` tinyint(1) NOT NULL DEFAULT '0',
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `group_settings_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ CONSTRAINT `group_settings_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `industries` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `invoice_invitations` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `client_contact_id` int(10) unsigned NOT NULL,
+ `invoice_id` int(10) unsigned NOT NULL,
+ `key` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `transaction_reference` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `message_id` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `email_error` mediumtext COLLATE utf8mb4_unicode_ci,
+ `signature_base64` text COLLATE utf8mb4_unicode_ci,
+ `signature_date` datetime DEFAULT NULL,
+ `sent_date` datetime DEFAULT NULL,
+ `viewed_date` datetime DEFAULT NULL,
+ `opened_date` datetime DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `invoice_invitations_client_contact_id_invoice_id_unique` (`client_contact_id`,`invoice_id`),
+ KEY `invoice_invitations_user_id_foreign` (`user_id`),
+ KEY `invoice_invitations_company_id_foreign` (`company_id`),
+ KEY `invoice_invitations_deleted_at_invoice_id_company_id_index` (`deleted_at`,`invoice_id`,`company_id`),
+ KEY `invoice_invitations_invoice_id_index` (`invoice_id`),
+ KEY `invoice_invitations_key_index` (`key`),
+ CONSTRAINT `invoice_invitations_client_contact_id_foreign` FOREIGN KEY (`client_contact_id`) REFERENCES `client_contacts` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `invoice_invitations_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `invoice_invitations_invoice_id_foreign` FOREIGN KEY (`invoice_id`) REFERENCES `invoices` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `invoice_invitations_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `invoices` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `client_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `assigned_user_id` int(10) unsigned DEFAULT NULL,
+ `company_id` int(10) unsigned NOT NULL,
+ `status_id` int(10) unsigned NOT NULL,
+ `project_id` int(10) unsigned DEFAULT NULL,
+ `vendor_id` int(10) unsigned DEFAULT NULL,
+ `recurring_id` int(10) unsigned DEFAULT NULL,
+ `design_id` int(10) unsigned DEFAULT NULL,
+ `number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `discount` double(8,2) NOT NULL DEFAULT '0.00',
+ `is_amount_discount` tinyint(1) NOT NULL DEFAULT '0',
+ `po_number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `date` date DEFAULT NULL,
+ `last_sent_date` date DEFAULT NULL,
+ `due_date` datetime DEFAULT NULL,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ `line_items` mediumtext COLLATE utf8mb4_unicode_ci,
+ `backup` mediumtext COLLATE utf8mb4_unicode_ci,
+ `footer` text COLLATE utf8mb4_unicode_ci,
+ `public_notes` text COLLATE utf8mb4_unicode_ci,
+ `private_notes` text COLLATE utf8mb4_unicode_ci,
+ `terms` text COLLATE utf8mb4_unicode_ci,
+ `tax_name1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate1` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `tax_name2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate2` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `tax_name3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate3` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `total_taxes` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `uses_inclusive_taxes` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_value1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value4` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `next_send_date` datetime DEFAULT NULL,
+ `custom_surcharge1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_surcharge2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_surcharge3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_surcharge4` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_surcharge_tax1` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_surcharge_tax2` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_surcharge_tax3` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_surcharge_tax4` tinyint(1) NOT NULL DEFAULT '0',
+ `exchange_rate` decimal(13,6) NOT NULL DEFAULT '1.000000',
+ `amount` decimal(16,4) NOT NULL,
+ `balance` decimal(16,4) NOT NULL,
+ `partial` decimal(16,4) DEFAULT NULL,
+ `partial_due_date` datetime DEFAULT NULL,
+ `last_viewed` datetime DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ `reminder1_sent` date DEFAULT NULL,
+ `reminder2_sent` date DEFAULT NULL,
+ `reminder3_sent` date DEFAULT NULL,
+ `reminder_last_sent` date DEFAULT NULL,
+ `auto_bill_enabled` tinyint(1) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `invoices_company_id_number_unique` (`company_id`,`number`),
+ KEY `invoices_user_id_foreign` (`user_id`),
+ KEY `invoices_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `invoices_client_id_index` (`client_id`),
+ KEY `invoices_company_id_index` (`company_id`),
+ CONSTRAINT `invoices_client_id_foreign` FOREIGN KEY (`client_id`) REFERENCES `clients` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `invoices_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `invoices_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `jobs` (
+ `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+ `queue` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `payload` longtext COLLATE utf8mb4_unicode_ci NOT NULL,
+ `attempts` tinyint(3) unsigned NOT NULL,
+ `reserved_at` int(10) unsigned DEFAULT NULL,
+ `available_at` int(10) unsigned NOT NULL,
+ `created_at` int(10) unsigned NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `jobs_queue_index` (`queue`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `languages` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `locale` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `migrations` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `migration` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `batch` int(11) NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `password_resets` (
+ `email` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `token` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `created_at` timestamp NULL DEFAULT NULL,
+ KEY `password_resets_email_index` (`email`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `payment_hashes` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `hash` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `fee_total` decimal(16,4) NOT NULL,
+ `fee_invoice_id` int(10) unsigned DEFAULT NULL,
+ `data` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
+ `payment_id` int(10) unsigned DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `payment_hashes_payment_id_foreign` (`payment_id`),
+ CONSTRAINT `payment_hashes_payment_id_foreign` FOREIGN KEY (`payment_id`) REFERENCES `payments` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `payment_libraries` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `visible` tinyint(1) NOT NULL DEFAULT '1',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `payment_terms` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `num_days` int(11) DEFAULT NULL,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `company_id` int(10) unsigned DEFAULT NULL,
+ `user_id` int(10) unsigned DEFAULT NULL,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `payment_terms_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `payment_terms_user_id_foreign` (`user_id`),
+ CONSTRAINT `payment_terms_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `payment_terms_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `payment_types` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `gateway_type_id` int(11) DEFAULT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `paymentables` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `payment_id` int(10) unsigned NOT NULL,
+ `paymentable_id` int(10) unsigned NOT NULL,
+ `amount` decimal(16,4) NOT NULL DEFAULT '0.0000',
+ `refunded` decimal(16,4) NOT NULL DEFAULT '0.0000',
+ `paymentable_type` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `created_at` timestamp NULL DEFAULT NULL,
+ `updated_at` timestamp NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `paymentables_payment_id_foreign` (`payment_id`),
+ CONSTRAINT `paymentables_payment_id_foreign` FOREIGN KEY (`payment_id`) REFERENCES `payments` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `payments` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned NOT NULL,
+ `client_id` int(10) unsigned NOT NULL,
+ `project_id` int(10) unsigned DEFAULT NULL,
+ `vendor_id` int(10) unsigned DEFAULT NULL,
+ `user_id` int(10) unsigned DEFAULT NULL,
+ `assigned_user_id` int(10) unsigned DEFAULT NULL,
+ `client_contact_id` int(10) unsigned DEFAULT NULL,
+ `invitation_id` int(10) unsigned DEFAULT NULL,
+ `company_gateway_id` int(10) unsigned DEFAULT NULL,
+ `gateway_type_id` int(10) unsigned DEFAULT NULL,
+ `type_id` int(10) unsigned DEFAULT NULL,
+ `status_id` int(10) unsigned NOT NULL,
+ `amount` decimal(16,4) NOT NULL DEFAULT '0.0000',
+ `refunded` decimal(16,4) NOT NULL DEFAULT '0.0000',
+ `applied` decimal(16,4) NOT NULL DEFAULT '0.0000',
+ `date` date DEFAULT NULL,
+ `transaction_reference` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `payer_id` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `private_notes` text COLLATE utf8mb4_unicode_ci,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ `is_manual` tinyint(1) NOT NULL DEFAULT '0',
+ `exchange_rate` decimal(13,6) NOT NULL DEFAULT '1.000000',
+ `currency_id` int(10) unsigned NOT NULL,
+ `exchange_currency_id` int(10) unsigned NOT NULL,
+ `meta` text COLLATE utf8mb4_unicode_ci,
+ PRIMARY KEY (`id`),
+ KEY `payments_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `payments_client_contact_id_foreign` (`client_contact_id`),
+ KEY `payments_company_gateway_id_foreign` (`company_gateway_id`),
+ KEY `payments_user_id_foreign` (`user_id`),
+ KEY `payments_company_id_index` (`company_id`),
+ KEY `payments_client_id_index` (`client_id`),
+ KEY `payments_status_id_index` (`status_id`),
+ CONSTRAINT `payments_client_contact_id_foreign` FOREIGN KEY (`client_contact_id`) REFERENCES `client_contacts` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `payments_client_id_foreign` FOREIGN KEY (`client_id`) REFERENCES `clients` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `payments_company_gateway_id_foreign` FOREIGN KEY (`company_gateway_id`) REFERENCES `company_gateways` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `payments_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `payments_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `products` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `assigned_user_id` int(10) unsigned DEFAULT NULL,
+ `project_id` int(10) unsigned DEFAULT NULL,
+ `vendor_id` int(10) unsigned DEFAULT NULL,
+ `custom_value1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value4` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `product_key` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `notes` text COLLATE utf8mb4_unicode_ci,
+ `cost` decimal(16,4) NOT NULL DEFAULT '0.0000',
+ `price` decimal(16,4) NOT NULL DEFAULT '0.0000',
+ `quantity` decimal(16,4) NOT NULL DEFAULT '0.0000',
+ `tax_name1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate1` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `tax_name2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate2` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `tax_name3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate3` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `products_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `products_user_id_foreign` (`user_id`),
+ KEY `products_company_id_index` (`company_id`),
+ CONSTRAINT `products_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `products_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `projects` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `user_id` int(10) unsigned NOT NULL,
+ `assigned_user_id` int(10) unsigned NOT NULL,
+ `company_id` int(10) unsigned NOT NULL,
+ `client_id` int(10) unsigned DEFAULT NULL,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `task_rate` decimal(12,4) NOT NULL DEFAULT '0.0000',
+ `due_date` date DEFAULT NULL,
+ `private_notes` text COLLATE utf8mb4_unicode_ci,
+ `budgeted_hours` decimal(12,2) NOT NULL,
+ `custom_value1` text COLLATE utf8mb4_unicode_ci,
+ `custom_value2` text COLLATE utf8mb4_unicode_ci,
+ `custom_value3` text COLLATE utf8mb4_unicode_ci,
+ `custom_value4` text COLLATE utf8mb4_unicode_ci,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp NULL DEFAULT NULL,
+ `public_notes` text COLLATE utf8mb4_unicode_ci,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ `number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `projects_user_id_foreign` (`user_id`),
+ KEY `projects_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `projects_company_id_index` (`company_id`),
+ CONSTRAINT `projects_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `projects_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quote_invitations` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `client_contact_id` int(10) unsigned NOT NULL,
+ `quote_id` int(10) unsigned NOT NULL,
+ `key` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `transaction_reference` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `message_id` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `email_error` mediumtext COLLATE utf8mb4_unicode_ci,
+ `signature_base64` text COLLATE utf8mb4_unicode_ci,
+ `signature_date` datetime DEFAULT NULL,
+ `sent_date` datetime DEFAULT NULL,
+ `viewed_date` datetime DEFAULT NULL,
+ `opened_date` datetime DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `quote_invitations_client_contact_id_quote_id_unique` (`client_contact_id`,`quote_id`),
+ KEY `quote_invitations_user_id_foreign` (`user_id`),
+ KEY `quote_invitations_company_id_foreign` (`company_id`),
+ KEY `quote_invitations_deleted_at_quote_id_company_id_index` (`deleted_at`,`quote_id`,`company_id`),
+ KEY `quote_invitations_quote_id_index` (`quote_id`),
+ KEY `quote_invitations_key_index` (`key`),
+ CONSTRAINT `quote_invitations_client_contact_id_foreign` FOREIGN KEY (`client_contact_id`) REFERENCES `client_contacts` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `quote_invitations_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `quote_invitations_quote_id_foreign` FOREIGN KEY (`quote_id`) REFERENCES `quotes` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `quote_invitations_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quotes` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `client_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `assigned_user_id` int(10) unsigned DEFAULT NULL,
+ `company_id` int(10) unsigned NOT NULL,
+ `status_id` int(10) unsigned NOT NULL,
+ `project_id` int(10) unsigned DEFAULT NULL,
+ `vendor_id` int(10) unsigned DEFAULT NULL,
+ `recurring_id` int(10) unsigned DEFAULT NULL,
+ `design_id` int(10) unsigned DEFAULT NULL,
+ `invoice_id` int(10) unsigned DEFAULT NULL,
+ `number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `discount` double(8,2) NOT NULL DEFAULT '0.00',
+ `is_amount_discount` tinyint(1) NOT NULL DEFAULT '0',
+ `po_number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `date` date DEFAULT NULL,
+ `last_sent_date` date DEFAULT NULL,
+ `due_date` datetime DEFAULT NULL,
+ `next_send_date` datetime DEFAULT NULL,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ `line_items` mediumtext COLLATE utf8mb4_unicode_ci,
+ `backup` mediumtext COLLATE utf8mb4_unicode_ci,
+ `footer` text COLLATE utf8mb4_unicode_ci,
+ `public_notes` text COLLATE utf8mb4_unicode_ci,
+ `private_notes` text COLLATE utf8mb4_unicode_ci,
+ `terms` text COLLATE utf8mb4_unicode_ci,
+ `tax_name1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate1` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `tax_name2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate2` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `tax_name3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate3` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `total_taxes` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `uses_inclusive_taxes` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_value1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value4` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_surcharge1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_surcharge2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_surcharge3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_surcharge4` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_surcharge_tax1` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_surcharge_tax2` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_surcharge_tax3` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_surcharge_tax4` tinyint(1) NOT NULL DEFAULT '0',
+ `exchange_rate` decimal(13,6) NOT NULL DEFAULT '1.000000',
+ `amount` decimal(16,4) NOT NULL,
+ `balance` decimal(16,4) NOT NULL,
+ `partial` decimal(16,4) DEFAULT NULL,
+ `partial_due_date` datetime DEFAULT NULL,
+ `last_viewed` datetime DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ `reminder1_sent` date DEFAULT NULL,
+ `reminder2_sent` date DEFAULT NULL,
+ `reminder3_sent` date DEFAULT NULL,
+ `reminder_last_sent` date DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `quotes_company_id_number_unique` (`company_id`,`number`),
+ KEY `quotes_user_id_foreign` (`user_id`),
+ KEY `quotes_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `quotes_client_id_index` (`client_id`),
+ KEY `quotes_company_id_index` (`company_id`),
+ CONSTRAINT `quotes_client_id_foreign` FOREIGN KEY (`client_id`) REFERENCES `clients` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `quotes_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `quotes_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `recurring_invoice_invitations` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `client_contact_id` int(10) unsigned NOT NULL,
+ `recurring_invoice_id` int(10) unsigned NOT NULL,
+ `key` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ `transaction_reference` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `message_id` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `email_error` mediumtext COLLATE utf8mb4_unicode_ci,
+ `signature_base64` text COLLATE utf8mb4_unicode_ci,
+ `signature_date` datetime DEFAULT NULL,
+ `sent_date` datetime DEFAULT NULL,
+ `viewed_date` datetime DEFAULT NULL,
+ `opened_date` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `cli_rec` (`client_contact_id`,`recurring_invoice_id`),
+ KEY `recurring_invoice_invitations_user_id_foreign` (`user_id`),
+ KEY `recurring_invoice_invitations_company_id_foreign` (`company_id`),
+ KEY `rec_co_del` (`deleted_at`,`recurring_invoice_id`,`company_id`),
+ KEY `recurring_invoice_invitations_recurring_invoice_id_index` (`recurring_invoice_id`),
+ KEY `recurring_invoice_invitations_key_index` (`key`),
+ CONSTRAINT `recurring_invoice_invitations_client_contact_id_foreign` FOREIGN KEY (`client_contact_id`) REFERENCES `client_contacts` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `recurring_invoice_invitations_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `recurring_invoice_invitations_recurring_invoice_id_foreign` FOREIGN KEY (`recurring_invoice_id`) REFERENCES `recurring_invoices` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `recurring_invoice_invitations_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `recurring_invoices` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `client_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `assigned_user_id` int(10) unsigned DEFAULT NULL,
+ `company_id` int(10) unsigned NOT NULL,
+ `project_id` int(10) unsigned DEFAULT NULL,
+ `vendor_id` int(10) unsigned DEFAULT NULL,
+ `status_id` int(10) unsigned NOT NULL,
+ `number` text COLLATE utf8mb4_unicode_ci,
+ `discount` double(8,2) NOT NULL DEFAULT '0.00',
+ `is_amount_discount` tinyint(1) NOT NULL DEFAULT '0',
+ `po_number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `date` date DEFAULT NULL,
+ `due_date` datetime DEFAULT NULL,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ `line_items` mediumtext COLLATE utf8mb4_unicode_ci,
+ `backup` mediumtext COLLATE utf8mb4_unicode_ci,
+ `footer` text COLLATE utf8mb4_unicode_ci,
+ `public_notes` text COLLATE utf8mb4_unicode_ci,
+ `private_notes` text COLLATE utf8mb4_unicode_ci,
+ `terms` text COLLATE utf8mb4_unicode_ci,
+ `tax_name1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate1` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `tax_name2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate2` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `tax_name3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate3` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `total_taxes` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `custom_value1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value4` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `amount` decimal(16,4) NOT NULL,
+ `balance` decimal(16,4) NOT NULL,
+ `partial` decimal(16,4) DEFAULT NULL,
+ `last_viewed` datetime DEFAULT NULL,
+ `frequency_id` int(10) unsigned NOT NULL,
+ `last_sent_date` datetime DEFAULT NULL,
+ `next_send_date` datetime DEFAULT NULL,
+ `remaining_cycles` int(11) DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ `auto_bill` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'off',
+ `auto_bill_enabled` tinyint(1) NOT NULL DEFAULT '0',
+ `design_id` int(10) unsigned DEFAULT NULL,
+ `uses_inclusive_taxes` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_surcharge1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_surcharge2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_surcharge3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_surcharge4` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_surcharge_tax1` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_surcharge_tax2` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_surcharge_tax3` tinyint(1) NOT NULL DEFAULT '0',
+ `custom_surcharge_tax4` tinyint(1) NOT NULL DEFAULT '0',
+ `due_date_days` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `partial_due_date` date DEFAULT NULL,
+ `exchange_rate` decimal(13,6) NOT NULL DEFAULT '1.000000',
+ PRIMARY KEY (`id`),
+ KEY `recurring_invoices_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `recurring_invoices_user_id_foreign` (`user_id`),
+ KEY `recurring_invoices_client_id_index` (`client_id`),
+ KEY `recurring_invoices_company_id_index` (`company_id`),
+ KEY `recurring_invoices_status_id_index` (`status_id`),
+ CONSTRAINT `recurring_invoices_client_id_foreign` FOREIGN KEY (`client_id`) REFERENCES `clients` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `recurring_invoices_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `recurring_invoices_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `recurring_quotes` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `client_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `assigned_user_id` int(10) unsigned DEFAULT NULL,
+ `company_id` int(10) unsigned NOT NULL,
+ `project_id` int(10) unsigned DEFAULT NULL,
+ `vendor_id` int(10) unsigned DEFAULT NULL,
+ `status_id` int(10) unsigned NOT NULL,
+ `discount` double(8,2) NOT NULL DEFAULT '0.00',
+ `is_amount_discount` tinyint(1) NOT NULL DEFAULT '0',
+ `number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `po_number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `date` date DEFAULT NULL,
+ `due_date` datetime DEFAULT NULL,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ `line_items` mediumtext COLLATE utf8mb4_unicode_ci,
+ `backup` mediumtext COLLATE utf8mb4_unicode_ci,
+ `footer` text COLLATE utf8mb4_unicode_ci,
+ `public_notes` text COLLATE utf8mb4_unicode_ci,
+ `private_notes` text COLLATE utf8mb4_unicode_ci,
+ `terms` text COLLATE utf8mb4_unicode_ci,
+ `tax_name1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate1` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `tax_name2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate2` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `tax_name3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `tax_rate3` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `total_taxes` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `custom_value1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value4` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `amount` decimal(16,4) NOT NULL DEFAULT '0.0000',
+ `balance` decimal(16,4) NOT NULL DEFAULT '0.0000',
+ `last_viewed` datetime DEFAULT NULL,
+ `frequency_id` int(10) unsigned NOT NULL,
+ `start_date` date DEFAULT NULL,
+ `last_sent_date` datetime DEFAULT NULL,
+ `next_send_date` datetime DEFAULT NULL,
+ `remaining_cycles` int(10) unsigned DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `recurring_quotes_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `recurring_quotes_user_id_foreign` (`user_id`),
+ KEY `recurring_quotes_client_id_index` (`client_id`),
+ KEY `recurring_quotes_company_id_index` (`company_id`),
+ KEY `recurring_quotes_status_id_index` (`status_id`),
+ CONSTRAINT `recurring_quotes_client_id_foreign` FOREIGN KEY (`client_id`) REFERENCES `clients` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `recurring_quotes_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `recurring_quotes_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `sizes` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `system_logs` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned DEFAULT NULL,
+ `client_id` int(10) unsigned DEFAULT NULL,
+ `category_id` int(10) unsigned DEFAULT NULL,
+ `event_id` int(10) unsigned DEFAULT NULL,
+ `type_id` int(10) unsigned DEFAULT NULL,
+ `log` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `system_logs_company_id_foreign` (`company_id`),
+ KEY `system_logs_client_id_foreign` (`client_id`),
+ CONSTRAINT `system_logs_client_id_foreign` FOREIGN KEY (`client_id`) REFERENCES `clients` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `system_logs_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `task_statuses` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `company_id` int(10) unsigned DEFAULT NULL,
+ `user_id` int(10) unsigned DEFAULT NULL,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `task_statuses_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `task_statuses_user_id_foreign` (`user_id`),
+ CONSTRAINT `task_statuses_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `task_statuses_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `tasks` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `user_id` int(10) unsigned NOT NULL,
+ `assigned_user_id` int(10) unsigned NOT NULL,
+ `company_id` int(10) unsigned NOT NULL,
+ `client_id` int(10) unsigned DEFAULT NULL,
+ `invoice_id` int(10) unsigned DEFAULT NULL,
+ `project_id` int(10) unsigned DEFAULT NULL,
+ `status_id` int(10) unsigned DEFAULT NULL,
+ `sort_order` smallint(6) DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp NULL DEFAULT NULL,
+ `custom_value1` text COLLATE utf8mb4_unicode_ci,
+ `custom_value2` text COLLATE utf8mb4_unicode_ci,
+ `custom_value3` text COLLATE utf8mb4_unicode_ci,
+ `custom_value4` text COLLATE utf8mb4_unicode_ci,
+ `start_time` timestamp NULL DEFAULT NULL,
+ `duration` int(11) DEFAULT NULL,
+ `description` text COLLATE utf8mb4_unicode_ci,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ `is_running` tinyint(1) NOT NULL DEFAULT '0',
+ `time_log` text COLLATE utf8mb4_unicode_ci,
+ `number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `rate` decimal(16,4) NOT NULL DEFAULT '0.0000',
+ PRIMARY KEY (`id`),
+ KEY `tasks_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `tasks_user_id_foreign` (`user_id`),
+ KEY `tasks_invoice_id_foreign` (`invoice_id`),
+ KEY `tasks_client_id_foreign` (`client_id`),
+ KEY `tasks_company_id_index` (`company_id`),
+ CONSTRAINT `tasks_client_id_foreign` FOREIGN KEY (`client_id`) REFERENCES `clients` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `tasks_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `tasks_invoice_id_foreign` FOREIGN KEY (`invoice_id`) REFERENCES `invoices` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `tasks_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `tax_rates` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ `name` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `rate` decimal(13,3) NOT NULL DEFAULT '0.000',
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `tax_rates_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `tax_rates_user_id_foreign` (`user_id`),
+ KEY `tax_rates_company_id_index` (`company_id`),
+ CONSTRAINT `tax_rates_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `tax_rates_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `timezones` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `location` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `utc_offset` int(11) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `users` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `account_id` int(10) unsigned NOT NULL,
+ `first_name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `last_name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `phone` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `ip` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `device_token` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `email` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `email_verified_at` timestamp NULL DEFAULT NULL,
+ `confirmation_code` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `theme_id` int(11) DEFAULT NULL,
+ `failed_logins` smallint(6) DEFAULT NULL,
+ `referral_code` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `oauth_user_id` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `oauth_user_token` text COLLATE utf8mb4_unicode_ci,
+ `oauth_provider_id` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `google_2fa_secret` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `accepted_terms_version` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `avatar` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `avatar_width` int(10) unsigned DEFAULT NULL,
+ `avatar_height` int(10) unsigned DEFAULT NULL,
+ `avatar_size` int(10) unsigned DEFAULT NULL,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ `last_login` datetime DEFAULT NULL,
+ `signature` mediumtext COLLATE utf8mb4_unicode_ci,
+ `password` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `remember_token` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value4` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ `oauth_user_refresh_token` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `users_email_unique` (`email`),
+ UNIQUE KEY `users_oauth_user_id_oauth_provider_id_unique` (`oauth_user_id`,`oauth_provider_id`),
+ KEY `users_account_id_index` (`account_id`),
+ CONSTRAINT `users_account_id_foreign` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `vendor_contacts` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned NOT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `vendor_id` int(10) unsigned NOT NULL,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp NULL DEFAULT NULL,
+ `is_primary` tinyint(1) NOT NULL DEFAULT '0',
+ `first_name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `last_name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `email` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `phone` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value4` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `send_email` tinyint(1) NOT NULL DEFAULT '0',
+ `email_verified_at` timestamp NULL DEFAULT NULL,
+ `confirmation_code` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `confirmed` tinyint(1) NOT NULL DEFAULT '0',
+ `last_login` timestamp NULL DEFAULT NULL,
+ `failed_logins` smallint(6) DEFAULT NULL,
+ `oauth_user_id` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `oauth_provider_id` int(10) unsigned DEFAULT NULL,
+ `google_2fa_secret` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `accepted_terms_version` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `avatar` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `avatar_type` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `avatar_size` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `password` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `token` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `is_locked` tinyint(1) NOT NULL DEFAULT '0',
+ `contact_key` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `remember_token` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `vendor_contacts_oauth_user_id_unique` (`oauth_user_id`),
+ UNIQUE KEY `vendor_contacts_oauth_provider_id_unique` (`oauth_provider_id`),
+ KEY `vendor_contacts_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `vendor_contacts_user_id_foreign` (`user_id`),
+ KEY `vendor_contacts_vendor_id_index` (`vendor_id`),
+ KEY `vendor_contacts_company_id_email_deleted_at_index` (`company_id`,`email`,`deleted_at`),
+ CONSTRAINT `vendor_contacts_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `vendor_contacts_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `vendor_contacts_vendor_id_foreign` FOREIGN KEY (`vendor_id`) REFERENCES `vendors` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `vendors` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp NULL DEFAULT NULL,
+ `user_id` int(10) unsigned NOT NULL,
+ `assigned_user_id` int(10) unsigned DEFAULT NULL,
+ `company_id` int(10) unsigned NOT NULL,
+ `currency_id` int(10) unsigned DEFAULT NULL,
+ `name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `address1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `address2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `city` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `state` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `postal_code` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `country_id` int(10) unsigned DEFAULT NULL,
+ `work_phone` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `private_notes` text COLLATE utf8mb4_unicode_ci,
+ `website` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `is_deleted` tinyint(4) NOT NULL DEFAULT '0',
+ `vat_number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `transaction_name` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `id_number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `custom_value4` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+ `vendor_hash` text COLLATE utf8mb4_unicode_ci,
+ `public_notes` text COLLATE utf8mb4_unicode_ci,
+ PRIMARY KEY (`id`),
+ KEY `vendors_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+ KEY `vendors_user_id_foreign` (`user_id`),
+ KEY `vendors_country_id_foreign` (`country_id`),
+ KEY `vendors_currency_id_foreign` (`currency_id`),
+ CONSTRAINT `vendors_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `vendors_country_id_foreign` FOREIGN KEY (`country_id`) REFERENCES `countries` (`id`),
+ CONSTRAINT `vendors_currency_id_foreign` FOREIGN KEY (`currency_id`) REFERENCES `currencies` (`id`),
+ CONSTRAINT `vendors_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `webhooks` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `company_id` int(10) unsigned DEFAULT NULL,
+ `user_id` int(10) unsigned DEFAULT NULL,
+ `event_id` int(10) unsigned DEFAULT NULL,
+ `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ `target_url` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+ `format` enum('JSON','UBL') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'JSON',
+ `created_at` timestamp(6) NULL DEFAULT NULL,
+ `updated_at` timestamp(6) NULL DEFAULT NULL,
+ `deleted_at` timestamp(6) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `subscriptions_company_id_foreign` (`company_id`),
+ KEY `subscriptions_event_id_company_id_index` (`event_id`,`company_id`),
+ CONSTRAINT `subscriptions_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+INSERT INTO `migrations` VALUES (1,'2014_10_12_100000_create_password_resets_table',1);
+INSERT INTO `migrations` VALUES (2,'2014_10_13_000000_create_users_table',1);
+INSERT INTO `migrations` VALUES (3,'2019_11_10_115926_create_failed_jobs_table',1);
+INSERT INTO `migrations` VALUES (4,'2020_03_05_123315_create_jobs_table',1);
+INSERT INTO `migrations` VALUES (5,'2020_04_08_234530_add_is_deleted_column_to_company_tokens_table',1);
+INSERT INTO `migrations` VALUES (6,'2020_05_13_035355_add_google_refresh_token_to_users_table',1);
+INSERT INTO `migrations` VALUES (7,'2020_07_05_084934_company_too_large_attribute',1);
+INSERT INTO `migrations` VALUES (8,'2020_07_08_065301_add_token_id_to_activity_table',1);
+INSERT INTO `migrations` VALUES (9,'2020_07_21_112424_update_enabled_modules_value',1);
+INSERT INTO `migrations` VALUES (10,'2020_07_28_104218_shop_token',1);
+INSERT INTO `migrations` VALUES (11,'2020_08_04_080851_add_is_deleted_to_group_settings',1);
+INSERT INTO `migrations` VALUES (12,'2020_08_11_221627_add_is_deleted_flag_to_client_gateway_token_table',1);
+INSERT INTO `migrations` VALUES (13,'2020_08_13_095946_remove_photo_design',1);
+INSERT INTO `migrations` VALUES (14,'2020_08_13_212702_add_reminder_sent_fields_to_entity_tables',1);
+INSERT INTO `migrations` VALUES (15,'2020_08_18_140557_add_is_public_to_documents_table',1);
+INSERT INTO `migrations` VALUES (16,'2020_09_22_205113_id_number_fields_for_missing_entities',1);
+INSERT INTO `migrations` VALUES (17,'2020_09_27_215800_update_gateway_table_visible_column',1);
+INSERT INTO `migrations` VALUES (18,'2020_10_11_211122_vendor_schema_update',1);
+INSERT INTO `migrations` VALUES (19,'2020_10_12_204517_project_number_column',1);
+INSERT INTO `migrations` VALUES (20,'2020_10_14_201320_project_ids_to_entities',1);
+INSERT INTO `migrations` VALUES (21,'2020_10_19_101823_project_name_unique_removal',1);
+INSERT INTO `migrations` VALUES (22,'2020_10_21_222738_expenses_nullable_assigned_user',1);
diff --git a/database/seeders/GatewayTypesSeeder.php b/database/seeders/GatewayTypesSeeder.php
index 25a814132bdb..8faed88b2437 100644
--- a/database/seeders/GatewayTypesSeeder.php
+++ b/database/seeders/GatewayTypesSeeder.php
@@ -35,6 +35,7 @@ class GatewayTypesSeeder extends Seeder
['id' => 11, 'alias' => 'apple_pay', 'name' => 'Apple Pay'],
['id' => 12, 'alias' => 'custom2', 'name' => 'Custom'],
['id' => 13, 'alias' => 'custom3', 'name' => 'Custom'],
+ ['id' => 14, 'alias' => 'credit', 'name' => 'Credit'],
];
foreach ($gateway_types as $gateway_type) {
diff --git a/database/seeders/PaymentTypesSeeder.php b/database/seeders/PaymentTypesSeeder.php
index cef35ed5b994..eaae804a7811 100644
--- a/database/seeders/PaymentTypesSeeder.php
+++ b/database/seeders/PaymentTypesSeeder.php
@@ -31,6 +31,7 @@ class PaymentTypesSeeder extends Seeder
const GATEWAY_TYPE_APPLE_PAY = 11;
const GATEWAY_TYPE_CUSTOM2 = 12;
const GATEWAY_TYPE_CUSTOM3 = 13;
+ const GATEWAY_TYPE_CREDIT = 14;
public function run()
{
@@ -69,6 +70,7 @@ class PaymentTypesSeeder extends Seeder
['name' => 'SEPA', 'gateway_type_id' => self::GATEWAY_TYPE_SEPA],
['name' => 'GoCardless', 'gateway_type_id' => self::GATEWAY_TYPE_GOCARDLESS],
['name' => 'Crypto', 'gateway_type_id' => self::GATEWAY_TYPE_CRYPTO],
+ ['name' => 'Credit', 'gateway_type_id' => self::GATEWAY_TYPE_CREDIT],
];
$x = 1;
diff --git a/psalm.xml b/psalm.xml
new file mode 100644
index 000000000000..151fa3530cc5
--- /dev/null
+++ b/psalm.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/assets/NOTICES b/public/assets/NOTICES
index c2cd55b34837..5d0906d1c0d3 100644
--- a/public/assets/NOTICES
+++ b/public/assets/NOTICES
@@ -5548,13 +5548,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
dart
-Copyright 2009 The Go Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file
---------------------------------------------------------------------------------
-dart
-
-Copyright 2012, the Dart project authors.
+Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file
+for details. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -5581,10 +5576,14 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
dart
-wasmer
-Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file
-for details. All rights reserved.
+Copyright 2009 The Go Authors. All rights reserved.
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file
+--------------------------------------------------------------------------------
+dart
+
+Copyright 2012, the Dart project authors.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
diff --git a/public/css/app.css b/public/css/app.css
index 6758fc590b24..0bd8e8719d04 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -1 +1 @@
-/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}main{display:block}h1{font-size:2em;margin:.67em 0}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details{display:block}summary{display:list-item}[hidden],template{display:none}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}button{background-color:transparent;background-image:none}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}fieldset,ol,ul{margin:0;padding:0}ol,ul{list-style:none}html{font-family:Open Sans,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;line-height:1.5}*,:after,:before{box-sizing:border-box;border:0 solid #d2d6dc}hr{border-top-width:1px}img{border-style:solid}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{color:#a0aec0}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#a0aec0}input::placeholder,textarea::placeholder{color:#a0aec0}[role=button],button{cursor:pointer}table{border-collapse:collapse}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}button,input,optgroup,select,textarea{padding:0;line-height:inherit;color:inherit}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}.container{width:100%}@media (min-width:640px){.container{max-width:640px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:1024px){.container{max-width:1024px}}@media (min-width:1280px){.container{max-width:1280px}}.form-input{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.375rem;padding:.5rem .75rem;font-size:1rem;line-height:1.5}.form-input::-moz-placeholder{color:#9fa6b2;opacity:1}.form-input:-ms-input-placeholder{color:#9fa6b2;opacity:1}.form-input::placeholder{color:#9fa6b2;opacity:1}.form-input:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-textarea{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.375rem;padding:.5rem .75rem;font-size:1rem;line-height:1.5}.form-textarea::-moz-placeholder{color:#9fa6b2;opacity:1}.form-textarea:-ms-input-placeholder{color:#9fa6b2;opacity:1}.form-textarea::placeholder{color:#9fa6b2;opacity:1}.form-textarea:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-multiselect{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.375rem;padding:.5rem .75rem;font-size:1rem;line-height:1.5}.form-multiselect:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-select{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20' fill='none'%3E%3Cpath d='M7 7l3-3 3 3m0 6l-3 3-3-3' stroke='%239fa6b2' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");-webkit-appearance:none;-moz-appearance:none;appearance:none;-webkit-print-color-adjust:exact;color-adjust:exact;background-repeat:no-repeat;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.375rem;padding:.5rem 2.5rem .5rem .75rem;font-size:1rem;line-height:1.5;background-position:right .5rem center;background-size:1.5em 1.5em}.form-select::-ms-expand{color:#9fa6b2;border:none}@media not print{.form-select::-ms-expand{display:none}}@media print and (-ms-high-contrast:active),print and (-ms-high-contrast:none){.form-select{padding-right:.75rem}}.form-select:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-checkbox:checked{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg viewBox='0 0 16 16' fill='%23fff' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M5.707 7.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4a1 1 0 00-1.414-1.414L7 8.586 5.707 7.293z'/%3E%3C/svg%3E");border-color:transparent;background-color:currentColor;background-size:100% 100%;background-position:50%;background-repeat:no-repeat}@media not print{.form-checkbox::-ms-check{border-width:1px;color:transparent;background:inherit;border-color:inherit;border-radius:inherit}}.form-checkbox{-webkit-appearance:none;-moz-appearance:none;appearance:none;-webkit-print-color-adjust:exact;color-adjust:exact;display:inline-block;vertical-align:middle;background-origin:border-box;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;flex-shrink:0;height:1rem;width:1rem;color:#3f83f8;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.25rem}.form-checkbox:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-checkbox:checked:focus,.form-radio:checked{border-color:transparent}.form-radio:checked{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg viewBox='0 0 16 16' fill='%23fff' xmlns='http://www.w3.org/2000/svg'%3E%3Ccircle cx='8' cy='8' r='3'/%3E%3C/svg%3E");background-color:currentColor;background-size:100% 100%;background-position:50%;background-repeat:no-repeat}@media not print{.form-radio::-ms-check{border-width:1px;color:transparent;background:inherit;border-color:inherit;border-radius:inherit}}.form-radio{-webkit-appearance:none;-moz-appearance:none;appearance:none;-webkit-print-color-adjust:exact;color-adjust:exact;display:inline-block;vertical-align:middle;background-origin:border-box;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;flex-shrink:0;border-radius:100%;height:1rem;width:1rem;color:#3f83f8;background-color:#fff;border-color:#d2d6dc;border-width:1px}.form-radio:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-radio:checked:focus{border-color:transparent}.button{border-radius:.25rem;padding:.75rem 1rem;font-size:.875rem;line-height:1rem;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform;transition-duration:.15s;transition-timing-function:cubic-bezier(.4,0,.2,1)}button:disabled{opacity:.5;cursor:not-allowed}.button-primary{--text-opacity:1;color:#fff;color:rgba(255,255,255,var(--text-opacity))}.button-primary:hover{font-weight:600}.button-block{display:block;width:100%}.button-danger{--bg-opacity:1;background-color:#f05252;background-color:rgba(240,82,82,var(--bg-opacity));--text-opacity:1;color:#fff;color:rgba(255,255,255,var(--text-opacity))}.button-danger:hover{--bg-opacity:1;background-color:#e02424;background-color:rgba(224,36,36,var(--bg-opacity))}.button-secondary{--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity))}.button-secondary:hover{--bg-opacity:1;background-color:#e5e7eb;background-color:rgba(229,231,235,var(--bg-opacity))}.button-link:hover{font-weight:600;text-decoration:underline}.button-link:focus{outline:2px solid transparent;outline-offset:2px;text-decoration:underline}.validation{border-left-width:2px;margin-top:.5rem;margin-bottom:.25rem;--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity));padding:.25rem .75rem}.validation-fail{border-color:#f05252;border-color:rgba(240,82,82,var(--border-opacity))}.validation-fail,.validation-pass{--border-opacity:1;--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity));font-size:.875rem}.validation-pass{border-color:#0e9f6e;border-color:rgba(14,159,110,var(--border-opacity))}.input{align-items:center;border-width:1px;--border-opacity:1;border-color:#d2d6dc;border-color:rgba(210,214,220,var(--border-opacity));border-radius:.25rem;margin-top:.5rem;padding:.5rem 1rem;font-size:.875rem}.input:focus{outline:2px solid transparent;outline-offset:2px;--bg-opacity:1;background-color:#f9fafb;background-color:rgba(249,250,251,var(--bg-opacity))}.input-label{font-size:.875rem;--text-opacity:1;color:#4b5563;color:rgba(75,85,99,var(--text-opacity))}.input-slim{padding-top:.5rem;padding-bottom:.5rem}.alert{padding:.75rem 1rem;font-size:.875rem;border-left-width:2px;margin-top:.5rem;margin-bottom:.25rem;--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity));--border-opacity:1;border-color:#9fa6b2;border-color:rgba(159,166,178,var(--border-opacity))}.alert-success{--border-opacity:1;border-color:#0e9f6e;border-color:rgba(14,159,110,var(--border-opacity))}.alert-failure{--border-opacity:1;border-color:#f05252;border-color:rgba(240,82,82,var(--border-opacity))}.badge{display:inline-flex;align-items:center;padding:.125rem .625rem;border-radius:9999px;font-size:.75rem;font-weight:500;line-height:1rem}.badge-light{background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity));color:#252f3f;color:rgba(37,47,63,var(--text-opacity))}.badge-light,.badge-primary{--bg-opacity:1;--text-opacity:1}.badge-primary{background-color:#c3ddfd;background-color:rgba(195,221,253,var(--bg-opacity));color:#3f83f8;color:rgba(63,131,248,var(--text-opacity))}.badge-danger{background-color:#fde8e8;background-color:rgba(253,232,232,var(--bg-opacity));color:#f05252;color:rgba(240,82,82,var(--text-opacity))}.badge-danger,.badge-success{--bg-opacity:1;--text-opacity:1}.badge-success{background-color:#def7ec;background-color:rgba(222,247,236,var(--bg-opacity));color:#0e9f6e;color:rgba(14,159,110,var(--text-opacity))}.badge-secondary{--bg-opacity:1;background-color:#252f3f;background-color:rgba(37,47,63,var(--bg-opacity));--text-opacity:1;color:#e5e7eb;color:rgba(229,231,235,var(--text-opacity))}.badge-warning{background-color:#feecdc;background-color:rgba(254,236,220,var(--bg-opacity));color:#ff5a1f;color:rgba(255,90,31,var(--text-opacity))}.badge-info,.badge-warning{--bg-opacity:1;--text-opacity:1}.badge-info{background-color:#e1effe;background-color:rgba(225,239,254,var(--bg-opacity));color:#3f83f8;color:rgba(63,131,248,var(--text-opacity))}@media (min-width:640px){.dataTables_length{margin-top:1.25rem!important;margin-bottom:1.25rem!important}}@media (min-width:1024px){.dataTables_length{margin-top:1rem!important;margin-bottom:1rem!important}}.dataTables_length select{--bg-opacity:1!important;background-color:#fff!important;background-color:rgba(255,255,255,var(--bg-opacity))!important;align-items:center!important;border-width:1px!important;--border-opacity:1!important;border-color:#d2d6dc!important;border-color:rgba(210,214,220,var(--border-opacity))!important;border-radius:.25rem!important;margin-top:.5rem!important;font-size:.875rem!important;margin-left:.5rem!important;margin-right:.5rem!important;padding:.5rem!important}.dataTables_filter{margin-bottom:1rem}.dataTables_filter input{-webkit-appearance:none!important;-moz-appearance:none!important;appearance:none!important;background-color:#fff!important;border-radius:.375rem!important;font-size:1rem!important;line-height:1.5!important;align-items:center!important;border-width:1px!important;--border-opacity:1!important;border-color:#d2d6dc!important;border-color:rgba(210,214,220,var(--border-opacity))!important;border-radius:.25rem!important;margin-top:.5rem!important;padding:.5rem 1rem!important;font-size:.875rem!important}@media (min-width:1024px){.dataTables_filter{margin-top:-3rem!important}}.dataTables_paginate{padding-bottom:1.5rem!important;padding-top:.5rem!important}.dataTables_paginate .paginate_button{transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform!important;transition-duration:.15s!important;transition-timing-function:cubic-bezier(.4,0,.2,1)!important;--bg-opacity:1!important;background-color:#fff!important;background-color:rgba(255,255,255,var(--bg-opacity))!important;border-width:1px!important;--border-opacity:1!important;border-color:#d2d6dc!important;border-color:rgba(210,214,220,var(--border-opacity))!important;font-size:.875rem!important;line-height:1rem!important;font-weight:500!important;border-radius:.25rem!important;--text-opacity:1!important;color:#374151!important;color:rgba(55,65,81,var(--text-opacity))!important;margin-right:.25rem!important;padding:.5rem 1rem!important;cursor:pointer!important}.dataTables_paginate .current{--bg-opacity:1!important;background-color:#1c64f2!important;background-color:rgba(28,100,242,var(--bg-opacity))!important;--text-opacity:1!important;color:#fff!important;color:rgba(255,255,255,var(--text-opacity))!important}.dataTables_info{font-size:.875rem!important}.dataTables_empty{padding-top:1rem!important;padding-bottom:1rem!important}.pagination{display:flex!important;align-items:center!important}.pagination .page-link{margin-top:-1px!important;border-top-width:2px!important;border-color:transparent!important;padding-top:1rem!important;padding-left:1rem!important;padding-right:1rem!important;display:inline-flex!important;align-items:center!important;font-size:.875rem!important;line-height:1.25rem!important;font-weight:500!important;--text-opacity:1!important;color:#6b7280!important;color:rgba(107,114,128,var(--text-opacity))!important;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform!important;transition-timing-function:cubic-bezier(.4,0,.2,1)!important;transition-duration:.15s!important;cursor:pointer!important}.pagination .page-link:hover{--text-opacity:1!important;color:#374151!important;color:rgba(55,65,81,var(--text-opacity))!important;--border-opacity:1!important;border-color:#d2d6dc!important;border-color:rgba(210,214,220,var(--border-opacity))!important}.pagination .page-link:focus{outline:2px solid transparent;outline-offset:2px;--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity));--border-opacity:1;border-color:#9fa6b2;border-color:rgba(159,166,178,var(--border-opacity))}.pagination .active>span{--text-opacity:1!important;color:#1c64f2!important;color:rgba(28,100,242,var(--text-opacity))!important;--border-opacity:1!important;border-color:#1c64f2!important;border-color:rgba(28,100,242,var(--border-opacity))!important}.space-x-1>:not(template)~:not(template){--space-x-reverse:0;margin-right:calc(0.25rem*var(--space-x-reverse));margin-left:calc(0.25rem*(1 - var(--space-x-reverse)))}.bg-white{--bg-opacity:1;background-color:#fff;background-color:rgba(255,255,255,var(--bg-opacity))}.bg-gray-50{--bg-opacity:1;background-color:#f9fafb;background-color:rgba(249,250,251,var(--bg-opacity))}.bg-gray-100{--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity))}.bg-gray-200{--bg-opacity:1;background-color:#e5e7eb;background-color:rgba(229,231,235,var(--bg-opacity))}.bg-gray-500{--bg-opacity:1;background-color:#6b7280;background-color:rgba(107,114,128,var(--bg-opacity))}.bg-gray-600{--bg-opacity:1;background-color:#4b5563;background-color:rgba(75,85,99,var(--bg-opacity))}.bg-gray-800{--bg-opacity:1;background-color:#252f3f;background-color:rgba(37,47,63,var(--bg-opacity))}.bg-gray-900{--bg-opacity:1;background-color:#161e2e;background-color:rgba(22,30,46,var(--bg-opacity))}.bg-red-100{--bg-opacity:1;background-color:#fde8e8;background-color:rgba(253,232,232,var(--bg-opacity))}.bg-blue-50{--bg-opacity:1;background-color:#ebf5ff;background-color:rgba(235,245,255,var(--bg-opacity))}.bg-blue-600{--bg-opacity:1;background-color:#1c64f2;background-color:rgba(28,100,242,var(--bg-opacity))}.focus\:bg-gray-100:focus,.hover\:bg-gray-100:hover{--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity))}.focus\:bg-gray-600:focus{--bg-opacity:1;background-color:#4b5563;background-color:rgba(75,85,99,var(--bg-opacity))}.active\:bg-gray-50:active{--bg-opacity:1;background-color:#f9fafb;background-color:rgba(249,250,251,var(--bg-opacity))}.border-transparent{border-color:transparent}.border-gray-100{--border-opacity:1;border-color:#f4f5f7;border-color:rgba(244,245,247,var(--border-opacity))}.border-gray-200{--border-opacity:1;border-color:#e5e7eb;border-color:rgba(229,231,235,var(--border-opacity))}.border-gray-300{--border-opacity:1;border-color:#d2d6dc;border-color:rgba(210,214,220,var(--border-opacity))}.border-gray-800{--border-opacity:1;border-color:#252f3f;border-color:rgba(37,47,63,var(--border-opacity))}.border-green-500{--border-opacity:1;border-color:#0e9f6e;border-color:rgba(14,159,110,var(--border-opacity))}.border-blue-500{--border-opacity:1;border-color:#3f83f8;border-color:rgba(63,131,248,var(--border-opacity))}.border-blue-600{--border-opacity:1;border-color:#1c64f2;border-color:rgba(28,100,242,var(--border-opacity))}.hover\:border-gray-300:hover{--border-opacity:1;border-color:#d2d6dc;border-color:rgba(210,214,220,var(--border-opacity))}.focus\:border-gray-400:focus{--border-opacity:1;border-color:#9fa6b2;border-color:rgba(159,166,178,var(--border-opacity))}.focus\:border-blue-300:focus{--border-opacity:1;border-color:#a4cafe;border-color:rgba(164,202,254,var(--border-opacity))}.rounded-sm{border-radius:.125rem}.rounded{border-radius:.25rem}.rounded-md{border-radius:.375rem}.rounded-lg{border-radius:.5rem}.rounded-full{border-radius:9999px}.border-none{border-style:none}.border-0{border-width:0}.border{border-width:1px}.border-t-2{border-top-width:2px}.border-l-2{border-left-width:2px}.border-t{border-top-width:1px}.border-r{border-right-width:1px}.border-b{border-bottom-width:1px}.cursor-pointer{cursor:pointer}.block{display:block}.inline-block{display:inline-block}.flex{display:flex}.inline-flex{display:inline-flex}.table{display:table}.grid{display:grid}.hidden{display:none}.flex-row{flex-direction:row}.flex-col{flex-direction:column}.items-end{align-items:flex-end}.items-center{align-items:center}.justify-end{justify-content:flex-end}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.flex-1{flex:1 1 0%}.flex-shrink-0{flex-shrink:0}.font-sans{font-family:Open Sans,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji}.font-medium{font-weight:500}.font-semibold{font-weight:600}.font-bold{font-weight:700}.focus\:font-semibold:focus,.hover\:font-semibold:hover{font-weight:600}.h-0{height:0}.h-5{height:1.25rem}.h-6{height:1.5rem}.h-8{height:2rem}.h-12{height:3rem}.h-16{height:4rem}.h-32{height:8rem}.h-screen{height:100vh}.text-xs{font-size:.75rem}.text-sm{font-size:.875rem}.text-lg{font-size:1.125rem}.text-xl{font-size:1.25rem}.text-2xl{font-size:1.5rem}.text-3xl{font-size:1.875rem}.leading-4{line-height:1rem}.leading-5{line-height:1.25rem}.leading-6{line-height:1.5rem}.m-auto{margin:auto}.mx-2{margin-left:.5rem;margin-right:.5rem}.my-4{margin-top:1rem;margin-bottom:1rem}.my-10{margin-top:2.5rem;margin-bottom:2.5rem}.mx-auto{margin-left:auto;margin-right:auto}.-my-2{margin-top:-.5rem;margin-bottom:-.5rem}.mt-0{margin-top:0}.mb-0{margin-bottom:0}.mt-1{margin-top:.25rem}.mr-1{margin-right:.25rem}.ml-1{margin-left:.25rem}.mt-2{margin-top:.5rem}.mr-2{margin-right:.5rem}.mb-2{margin-bottom:.5rem}.ml-2{margin-left:.5rem}.mt-3{margin-top:.75rem}.mr-3{margin-right:.75rem}.mb-3{margin-bottom:.75rem}.ml-3{margin-left:.75rem}.mt-4{margin-top:1rem}.mr-4{margin-right:1rem}.mb-4{margin-bottom:1rem}.mt-5{margin-top:1.25rem}.mt-6{margin-top:1.5rem}.mb-6{margin-bottom:1.5rem}.mt-8{margin-top:2rem}.mt-10{margin-top:2.5rem}.mb-10{margin-bottom:2.5rem}.-mr-1{margin-right:-.25rem}.-ml-1{margin-left:-.25rem}.-mr-14{margin-right:-3.5rem}.-mt-px{margin-top:-1px}.max-w-xs{max-width:20rem}.max-w-xl{max-width:36rem}.max-w-2xl{max-width:42rem}.min-h-screen{min-height:100vh}.min-w-full{min-width:100%}.object-cover{-o-object-fit:cover;object-fit:cover}.opacity-0{opacity:0}.opacity-25{opacity:.25}.opacity-75{opacity:.75}.opacity-100{opacity:1}.focus\:outline-none:focus{outline:2px solid transparent;outline-offset:2px}.overflow-hidden{overflow:hidden}.overflow-x-auto{overflow-x:auto}.overflow-y-auto{overflow-y:auto}.overflow-y-hidden{overflow-y:hidden}.overflow-y-scroll{overflow-y:scroll}.p-1{padding:.25rem}.p-3{padding:.75rem}.p-4{padding:1rem}.py-1{padding-top:.25rem;padding-bottom:.25rem}.py-2{padding-top:.5rem;padding-bottom:.5rem}.px-2{padding-left:.5rem;padding-right:.5rem}.py-3{padding-top:.75rem;padding-bottom:.75rem}.px-3{padding-left:.75rem;padding-right:.75rem}.py-4{padding-top:1rem;padding-bottom:1rem}.px-4{padding-left:1rem;padding-right:1rem}.py-5{padding-top:1.25rem;padding-bottom:1.25rem}.py-6{padding-top:1.5rem;padding-bottom:1.5rem}.px-6{padding-left:1.5rem;padding-right:1.5rem}.py-8{padding-top:2rem;padding-bottom:2rem}.px-10{padding-left:2.5rem;padding-right:2.5rem}.pr-1{padding-right:.25rem}.pl-1{padding-left:.25rem}.pt-4{padding-top:1rem}.pr-4{padding-right:1rem}.pb-4{padding-bottom:1rem}.pt-5{padding-top:1.25rem}.pt-6{padding-top:1.5rem}.pb-20{padding-bottom:5rem}.pointer-events-none{pointer-events:none}.pointer-events-auto{pointer-events:auto}.fixed{position:fixed}.absolute{position:absolute}.relative{position:relative}.inset-0{right:0;left:0}.inset-0,.inset-y-0{top:0;bottom:0}.inset-x-0{right:0;left:0}.top-0{top:0}.right-0{right:0}.bottom-0{bottom:0}.left-0{left:0}.shadow-xs{box-shadow:0 0 0 1px rgba(0,0,0,.05)}.shadow-sm{box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}.shadow{box-shadow:0 1px 3px 0 rgba(0,0,0,.1),0 1px 2px 0 rgba(0,0,0,.06)}.shadow-lg{box-shadow:0 10px 15px -3px rgba(0,0,0,.1),0 4px 6px -2px rgba(0,0,0,.05)}.shadow-xl{box-shadow:0 20px 25px -5px rgba(0,0,0,.1),0 10px 10px -5px rgba(0,0,0,.04)}.focus\:shadow-outline:focus{box-shadow:0 0 0 3px rgba(118,169,250,.45)}.focus\:shadow-outline-blue:focus{box-shadow:0 0 0 3px rgba(164,202,254,.45)}.fill-current{fill:currentColor}.text-left{text-align:left}.text-center{text-align:center}.text-right{text-align:right}.text-white{--text-opacity:1;color:#fff;color:rgba(255,255,255,var(--text-opacity))}.text-black{--text-opacity:1;color:#000;color:rgba(0,0,0,var(--text-opacity))}.text-gray-300{--text-opacity:1;color:#d2d6dc;color:rgba(210,214,220,var(--text-opacity))}.text-gray-400{--text-opacity:1;color:#9fa6b2;color:rgba(159,166,178,var(--text-opacity))}.text-gray-500{--text-opacity:1;color:#6b7280;color:rgba(107,114,128,var(--text-opacity))}.text-gray-600{--text-opacity:1;color:#4b5563;color:rgba(75,85,99,var(--text-opacity))}.text-gray-700{--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity))}.text-gray-800{--text-opacity:1;color:#252f3f;color:rgba(37,47,63,var(--text-opacity))}.text-gray-900{--text-opacity:1;color:#161e2e;color:rgba(22,30,46,var(--text-opacity))}.text-red-400{--text-opacity:1;color:#f98080;color:rgba(249,128,128,var(--text-opacity))}.text-red-600{--text-opacity:1;color:#e02424;color:rgba(224,36,36,var(--text-opacity))}.text-blue-600{--text-opacity:1;color:#1c64f2;color:rgba(28,100,242,var(--text-opacity))}.hover\:text-gray-300:hover{--text-opacity:1;color:#d2d6dc;color:rgba(210,214,220,var(--text-opacity))}.hover\:text-gray-500:hover{--text-opacity:1;color:#6b7280;color:rgba(107,114,128,var(--text-opacity))}.hover\:text-gray-600:hover{--text-opacity:1;color:#4b5563;color:rgba(75,85,99,var(--text-opacity))}.hover\:text-gray-700:hover{--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity))}.hover\:text-gray-800:hover{--text-opacity:1;color:#252f3f;color:rgba(37,47,63,var(--text-opacity))}.hover\:text-gray-900:hover{--text-opacity:1;color:#161e2e;color:rgba(22,30,46,var(--text-opacity))}.hover\:text-blue-600:hover{--text-opacity:1;color:#1c64f2;color:rgba(28,100,242,var(--text-opacity))}.hover\:text-indigo-900:hover{--text-opacity:1;color:#362f78;color:rgba(54,47,120,var(--text-opacity))}.focus\:text-gray-500:focus{--text-opacity:1;color:#6b7280;color:rgba(107,114,128,var(--text-opacity))}.focus\:text-gray-600:focus{--text-opacity:1;color:#4b5563;color:rgba(75,85,99,var(--text-opacity))}.focus\:text-gray-700:focus{--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity))}.focus\:text-gray-900:focus{--text-opacity:1;color:#161e2e;color:rgba(22,30,46,var(--text-opacity))}.active\:text-gray-800:active{--text-opacity:1;color:#252f3f;color:rgba(37,47,63,var(--text-opacity))}.uppercase{text-transform:uppercase}.focus\:underline:focus{text-decoration:underline}.antialiased{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.tracking-wider{letter-spacing:.05em}.align-middle{vertical-align:middle}.align-bottom{vertical-align:bottom}.whitespace-no-wrap{white-space:nowrap}.break-words{overflow-wrap:break-word}.w-0{width:0}.w-5{width:1.25rem}.w-6{width:1.5rem}.w-8{width:2rem}.w-12{width:3rem}.w-14{width:3.5rem}.w-48{width:12rem}.w-56{width:14rem}.w-64{width:16rem}.w-auto{width:auto}.w-1\/2{width:50%}.w-full{width:100%}.z-0{z-index:0}.z-10{z-index:10}.z-30{z-index:30}.z-40{z-index:40}.gap-4{grid-gap:1rem;gap:1rem}.gap-6{grid-gap:1.5rem;gap:1.5rem}.grid-cols-6{grid-template-columns:repeat(6,minmax(0,1fr))}.grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.col-span-1{grid-column:span 1/span 1}.col-span-2{grid-column:span 2/span 2}.col-span-4{grid-column:span 4/span 4}.col-span-6{grid-column:span 6/span 6}.col-span-7{grid-column:span 7/span 7}.col-span-12{grid-column:span 12/span 12}.col-start-2{grid-column-start:2}.col-start-3{grid-column-start:3}.col-start-5{grid-column-start:5}.transform{--transform-translate-x:0;--transform-translate-y:0;--transform-rotate:0;--transform-skew-x:0;--transform-skew-y:0;--transform-scale-x:1;--transform-scale-y:1;transform:translateX(var(--transform-translate-x)) translateY(var(--transform-translate-y)) rotate(var(--transform-rotate)) skewX(var(--transform-skew-x)) skewY(var(--transform-skew-y)) scaleX(var(--transform-scale-x)) scaleY(var(--transform-scale-y))}.origin-top-right{transform-origin:top right}.scale-95{--transform-scale-x:.95;--transform-scale-y:.95}.scale-100{--transform-scale-x:1;--transform-scale-y:1}.translate-x-0{--transform-translate-x:0}.-translate-x-full{--transform-translate-x:-100%}.translate-y-0{--transform-translate-y:0}.translate-y-4{--transform-translate-y:1rem}.transition-all{transition-property:all}.transition{transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform}.transition-opacity{transition-property:opacity}.ease-linear{transition-timing-function:linear}.ease-in{transition-timing-function:cubic-bezier(.4,0,1,1)}.ease-out{transition-timing-function:cubic-bezier(0,0,.2,1)}.ease-in-out{transition-timing-function:cubic-bezier(.4,0,.2,1)}.duration-75{transition-duration:75ms}.duration-100{transition-duration:.1s}.duration-150{transition-duration:.15s}.duration-200{transition-duration:.2s}.duration-300{transition-duration:.3s}@-webkit-keyframes spin{to{transform:rotate(1turn)}}@keyframes spin{to{transform:rotate(1turn)}}@-webkit-keyframes ping{75%,to{transform:scale(2);opacity:0}}@keyframes ping{75%,to{transform:scale(2);opacity:0}}@-webkit-keyframes pulse{50%{opacity:.5}}@keyframes pulse{50%{opacity:.5}}@-webkit-keyframes bounce{0%,to{transform:translateY(-25%);-webkit-animation-timing-function:cubic-bezier(.8,0,1,1);animation-timing-function:cubic-bezier(.8,0,1,1)}50%{transform:none;-webkit-animation-timing-function:cubic-bezier(0,0,.2,1);animation-timing-function:cubic-bezier(0,0,.2,1)}}@keyframes bounce{0%,to{transform:translateY(-25%);-webkit-animation-timing-function:cubic-bezier(.8,0,1,1);animation-timing-function:cubic-bezier(.8,0,1,1)}50%{transform:none;-webkit-animation-timing-function:cubic-bezier(0,0,.2,1);animation-timing-function:cubic-bezier(0,0,.2,1)}}.animate-spin{-webkit-animation:spin 1s linear infinite;animation:spin 1s linear infinite}@media (min-width:640px){.sm\:container{width:100%;max-width:640px}@media (min-width:768px){.sm\:container{max-width:768px}}@media (min-width:1024px){.sm\:container{max-width:1024px}}@media (min-width:1280px){.sm\:container{max-width:1280px}}.sm\:rounded-lg{border-radius:.5rem}.sm\:block{display:block}.sm\:inline-block{display:inline-block}.sm\:flex{display:flex}.sm\:grid{display:grid}.sm\:hidden{display:none}.sm\:flex-row-reverse{flex-direction:row-reverse}.sm\:items-start{align-items:flex-start}.sm\:items-center{align-items:center}.sm\:justify-center{justify-content:center}.sm\:justify-between{justify-content:space-between}.sm\:flex-shrink-0{flex-shrink:0}.sm\:h-10{height:2.5rem}.sm\:h-screen{height:100vh}.sm\:mx-0{margin-left:0;margin-right:0}.sm\:my-8{margin-top:2rem;margin-bottom:2rem}.sm\:-mx-6{margin-left:-1.5rem;margin-right:-1.5rem}.sm\:mt-0{margin-top:0}.sm\:ml-3{margin-left:.75rem}.sm\:mt-4{margin-top:1rem}.sm\:ml-4{margin-left:1rem}.sm\:mt-6{margin-top:1.5rem}.sm\:ml-6{margin-left:1.5rem}.sm\:max-w-sm{max-width:24rem}.sm\:max-w-lg{max-width:32rem}.sm\:p-0{padding:0}.sm\:p-6{padding:1.5rem}.sm\:px-0{padding-left:0;padding-right:0}.sm\:px-6{padding-left:1.5rem;padding-right:1.5rem}.sm\:inset-0{top:0;right:0;bottom:0;left:0}.sm\:text-left{text-align:left}.sm\:align-middle{vertical-align:middle}.sm\:w-10{width:2.5rem}.sm\:w-auto{width:auto}.sm\:w-full{width:100%}.sm\:gap-4{grid-gap:1rem;gap:1rem}.sm\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.sm\:col-span-2{grid-column:span 2/span 2}.sm\:col-span-3{grid-column:span 3/span 3}.sm\:col-span-4{grid-column:span 4/span 4}.sm\:col-span-6{grid-column:span 6/span 6}.sm\:scale-95{--transform-scale-x:.95;--transform-scale-y:.95}.sm\:scale-100{--transform-scale-x:1;--transform-scale-y:1}.sm\:translate-y-0{--transform-translate-y:0}}@media (min-width:768px){.md\:container{width:100%}@media (min-width:640px){.md\:container{max-width:640px}}@media (min-width:768px){.md\:container{max-width:768px}}@media (min-width:1024px){.md\:container{max-width:1024px}}@media (min-width:1280px){.md\:container{max-width:1280px}}.md\:block{display:block}.md\:flex{display:flex}.md\:grid{display:grid}.md\:hidden{display:none}.md\:justify-between{justify-content:space-between}.md\:flex-shrink-0{flex-shrink:0}.md\:mt-0{margin-top:0}.md\:mr-2{margin-right:.5rem}.md\:ml-2{margin-left:.5rem}.md\:ml-6{margin-left:1.5rem}.md\:mt-10{margin-top:2.5rem}.md\:-mr-1{margin-right:-.25rem}.md\:px-8{padding-left:2rem;padding-right:2rem}.md\:w-1\/2{width:50%}.md\:w-1\/3{width:33.333333%}.md\:gap-6{grid-gap:1.5rem;gap:1.5rem}.md\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.md\:col-span-1{grid-column:span 1/span 1}.md\:col-span-2{grid-column:span 2/span 2}.md\:col-span-3{grid-column:span 3/span 3}.md\:col-span-4{grid-column:span 4/span 4}.md\:col-span-6{grid-column:span 6/span 6}.md\:col-start-2{grid-column-start:2}.md\:col-start-4{grid-column-start:4}}@media (min-width:1024px){.lg\:container{width:100%}@media (min-width:640px){.lg\:container{max-width:640px}}@media (min-width:768px){.lg\:container{max-width:768px}}@media (min-width:1024px){.lg\:container{max-width:1024px}}@media (min-width:1280px){.lg\:container{max-width:1280px}}.lg\:block{display:block}.lg\:flex{display:flex}.lg\:grid{display:grid}.lg\:items-center{align-items:center}.lg\:-mx-8{margin-left:-2rem;margin-right:-2rem}.lg\:px-8{padding-left:2rem;padding-right:2rem}.lg\:w-1\/4{width:25%}.lg\:w-1\/5{width:20%}.lg\:gap-4{grid-gap:1rem;gap:1rem}.lg\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.lg\:grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.lg\:col-span-3{grid-column:span 3/span 3}.lg\:col-span-6{grid-column:span 6/span 6}.lg\:col-start-4{grid-column-start:4}}@media (min-width:1280px){.xl\:container{width:100%}@media (min-width:640px){.xl\:container{max-width:640px}}@media (min-width:768px){.xl\:container{max-width:768px}}@media (min-width:1024px){.xl\:container{max-width:1024px}}@media (min-width:1280px){.xl\:container{max-width:1280px}}}
\ No newline at end of file
+/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}main{display:block}h1{font-size:2em;margin:.67em 0}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details{display:block}summary{display:list-item}[hidden],template{display:none}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}button{background-color:transparent;background-image:none}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}fieldset,ol,ul{margin:0;padding:0}ol,ul{list-style:none}html{font-family:Open Sans,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;line-height:1.5}*,:after,:before{box-sizing:border-box;border:0 solid #d2d6dc}hr{border-top-width:1px}img{border-style:solid}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{color:#a0aec0}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#a0aec0}input::placeholder,textarea::placeholder{color:#a0aec0}[role=button],button{cursor:pointer}table{border-collapse:collapse}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}button,input,optgroup,select,textarea{padding:0;line-height:inherit;color:inherit}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}.container{width:100%}@media (min-width:640px){.container{max-width:640px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:1024px){.container{max-width:1024px}}@media (min-width:1280px){.container{max-width:1280px}}.form-input{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.375rem;padding:.5rem .75rem;font-size:1rem;line-height:1.5}.form-input::-moz-placeholder{color:#9fa6b2;opacity:1}.form-input:-ms-input-placeholder{color:#9fa6b2;opacity:1}.form-input::placeholder{color:#9fa6b2;opacity:1}.form-input:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-textarea{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.375rem;padding:.5rem .75rem;font-size:1rem;line-height:1.5}.form-textarea::-moz-placeholder{color:#9fa6b2;opacity:1}.form-textarea:-ms-input-placeholder{color:#9fa6b2;opacity:1}.form-textarea::placeholder{color:#9fa6b2;opacity:1}.form-textarea:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-multiselect{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.375rem;padding:.5rem .75rem;font-size:1rem;line-height:1.5}.form-multiselect:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-select{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20' fill='none'%3E%3Cpath d='M7 7l3-3 3 3m0 6l-3 3-3-3' stroke='%239fa6b2' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");-webkit-appearance:none;-moz-appearance:none;appearance:none;-webkit-print-color-adjust:exact;color-adjust:exact;background-repeat:no-repeat;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.375rem;padding:.5rem 2.5rem .5rem .75rem;font-size:1rem;line-height:1.5;background-position:right .5rem center;background-size:1.5em 1.5em}.form-select::-ms-expand{color:#9fa6b2;border:none}@media not print{.form-select::-ms-expand{display:none}}@media print and (-ms-high-contrast:active),print and (-ms-high-contrast:none){.form-select{padding-right:.75rem}}.form-select:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-checkbox:checked{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg viewBox='0 0 16 16' fill='%23fff' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M5.707 7.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4a1 1 0 00-1.414-1.414L7 8.586 5.707 7.293z'/%3E%3C/svg%3E");border-color:transparent;background-color:currentColor;background-size:100% 100%;background-position:50%;background-repeat:no-repeat}@media not print{.form-checkbox::-ms-check{border-width:1px;color:transparent;background:inherit;border-color:inherit;border-radius:inherit}}.form-checkbox{-webkit-appearance:none;-moz-appearance:none;appearance:none;-webkit-print-color-adjust:exact;color-adjust:exact;display:inline-block;vertical-align:middle;background-origin:border-box;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;flex-shrink:0;height:1rem;width:1rem;color:#3f83f8;background-color:#fff;border-color:#d2d6dc;border-width:1px;border-radius:.25rem}.form-checkbox:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-checkbox:checked:focus,.form-radio:checked{border-color:transparent}.form-radio:checked{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg viewBox='0 0 16 16' fill='%23fff' xmlns='http://www.w3.org/2000/svg'%3E%3Ccircle cx='8' cy='8' r='3'/%3E%3C/svg%3E");background-color:currentColor;background-size:100% 100%;background-position:50%;background-repeat:no-repeat}@media not print{.form-radio::-ms-check{border-width:1px;color:transparent;background:inherit;border-color:inherit;border-radius:inherit}}.form-radio{-webkit-appearance:none;-moz-appearance:none;appearance:none;-webkit-print-color-adjust:exact;color-adjust:exact;display:inline-block;vertical-align:middle;background-origin:border-box;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;flex-shrink:0;border-radius:100%;height:1rem;width:1rem;color:#3f83f8;background-color:#fff;border-color:#d2d6dc;border-width:1px}.form-radio:focus{outline:none;box-shadow:0 0 0 3px rgba(164,202,254,.45);border-color:#a4cafe}.form-radio:checked:focus{border-color:transparent}.button{border-radius:.25rem;padding:.75rem 1rem;font-size:.875rem;line-height:1rem;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform;transition-duration:.15s;transition-timing-function:cubic-bezier(.4,0,.2,1)}button:disabled{opacity:.5;cursor:not-allowed}.button-primary{--text-opacity:1;color:#fff;color:rgba(255,255,255,var(--text-opacity))}.button-primary:hover{font-weight:600}.button-block{display:block;width:100%}.button-danger{--bg-opacity:1;background-color:#f05252;background-color:rgba(240,82,82,var(--bg-opacity));--text-opacity:1;color:#fff;color:rgba(255,255,255,var(--text-opacity))}.button-danger:hover{--bg-opacity:1;background-color:#e02424;background-color:rgba(224,36,36,var(--bg-opacity))}.button-secondary{--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity))}.button-secondary:hover{--bg-opacity:1;background-color:#e5e7eb;background-color:rgba(229,231,235,var(--bg-opacity))}.button-link:hover{font-weight:600;text-decoration:underline}.button-link:focus{outline:2px solid transparent;outline-offset:2px;text-decoration:underline}.validation{border-left-width:2px;margin-top:.5rem;margin-bottom:.25rem;--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity));padding:.25rem .75rem}.validation-fail{border-color:#f05252;border-color:rgba(240,82,82,var(--border-opacity))}.validation-fail,.validation-pass{--border-opacity:1;--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity));font-size:.875rem}.validation-pass{border-color:#0e9f6e;border-color:rgba(14,159,110,var(--border-opacity))}.input{align-items:center;border-width:1px;--border-opacity:1;border-color:#d2d6dc;border-color:rgba(210,214,220,var(--border-opacity));border-radius:.25rem;margin-top:.5rem;padding:.5rem 1rem;font-size:.875rem}.input:focus{outline:2px solid transparent;outline-offset:2px;--bg-opacity:1;background-color:#f9fafb;background-color:rgba(249,250,251,var(--bg-opacity))}.input-label{font-size:.875rem;--text-opacity:1;color:#4b5563;color:rgba(75,85,99,var(--text-opacity))}.input-slim{padding-top:.5rem;padding-bottom:.5rem}.alert{padding:.75rem 1rem;font-size:.875rem;border-left-width:2px;margin-top:.5rem;margin-bottom:.25rem;--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity));--border-opacity:1;border-color:#9fa6b2;border-color:rgba(159,166,178,var(--border-opacity))}.alert-success{--border-opacity:1;border-color:#0e9f6e;border-color:rgba(14,159,110,var(--border-opacity))}.alert-failure{--border-opacity:1;border-color:#f05252;border-color:rgba(240,82,82,var(--border-opacity))}.badge{display:inline-flex;align-items:center;padding:.125rem .625rem;border-radius:9999px;font-size:.75rem;font-weight:500;line-height:1rem}.badge-light{background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity));color:#252f3f;color:rgba(37,47,63,var(--text-opacity))}.badge-light,.badge-primary{--bg-opacity:1;--text-opacity:1}.badge-primary{background-color:#c3ddfd;background-color:rgba(195,221,253,var(--bg-opacity));color:#3f83f8;color:rgba(63,131,248,var(--text-opacity))}.badge-danger{background-color:#fde8e8;background-color:rgba(253,232,232,var(--bg-opacity));color:#f05252;color:rgba(240,82,82,var(--text-opacity))}.badge-danger,.badge-success{--bg-opacity:1;--text-opacity:1}.badge-success{background-color:#def7ec;background-color:rgba(222,247,236,var(--bg-opacity));color:#0e9f6e;color:rgba(14,159,110,var(--text-opacity))}.badge-secondary{--bg-opacity:1;background-color:#252f3f;background-color:rgba(37,47,63,var(--bg-opacity));--text-opacity:1;color:#e5e7eb;color:rgba(229,231,235,var(--text-opacity))}.badge-warning{background-color:#feecdc;background-color:rgba(254,236,220,var(--bg-opacity));color:#ff5a1f;color:rgba(255,90,31,var(--text-opacity))}.badge-info,.badge-warning{--bg-opacity:1;--text-opacity:1}.badge-info{background-color:#e1effe;background-color:rgba(225,239,254,var(--bg-opacity));color:#3f83f8;color:rgba(63,131,248,var(--text-opacity))}@media (min-width:640px){.dataTables_length{margin-top:1.25rem!important;margin-bottom:1.25rem!important}}@media (min-width:1024px){.dataTables_length{margin-top:1rem!important;margin-bottom:1rem!important}}.dataTables_length select{--bg-opacity:1!important;background-color:#fff!important;background-color:rgba(255,255,255,var(--bg-opacity))!important;align-items:center!important;border-width:1px!important;--border-opacity:1!important;border-color:#d2d6dc!important;border-color:rgba(210,214,220,var(--border-opacity))!important;border-radius:.25rem!important;margin-top:.5rem!important;font-size:.875rem!important;margin-left:.5rem!important;margin-right:.5rem!important;padding:.5rem!important}.dataTables_filter{margin-bottom:1rem}.dataTables_filter input{-webkit-appearance:none!important;-moz-appearance:none!important;appearance:none!important;background-color:#fff!important;border-radius:.375rem!important;font-size:1rem!important;line-height:1.5!important;align-items:center!important;border-width:1px!important;--border-opacity:1!important;border-color:#d2d6dc!important;border-color:rgba(210,214,220,var(--border-opacity))!important;border-radius:.25rem!important;margin-top:.5rem!important;padding:.5rem 1rem!important;font-size:.875rem!important}@media (min-width:1024px){.dataTables_filter{margin-top:-3rem!important}}.dataTables_paginate{padding-bottom:1.5rem!important;padding-top:.5rem!important}.dataTables_paginate .paginate_button{transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform!important;transition-duration:.15s!important;transition-timing-function:cubic-bezier(.4,0,.2,1)!important;--bg-opacity:1!important;background-color:#fff!important;background-color:rgba(255,255,255,var(--bg-opacity))!important;border-width:1px!important;--border-opacity:1!important;border-color:#d2d6dc!important;border-color:rgba(210,214,220,var(--border-opacity))!important;font-size:.875rem!important;line-height:1rem!important;font-weight:500!important;border-radius:.25rem!important;--text-opacity:1!important;color:#374151!important;color:rgba(55,65,81,var(--text-opacity))!important;margin-right:.25rem!important;padding:.5rem 1rem!important;cursor:pointer!important}.dataTables_paginate .current{--bg-opacity:1!important;background-color:#1c64f2!important;background-color:rgba(28,100,242,var(--bg-opacity))!important;--text-opacity:1!important;color:#fff!important;color:rgba(255,255,255,var(--text-opacity))!important}.dataTables_info{font-size:.875rem!important}.dataTables_empty{padding-top:1rem!important;padding-bottom:1rem!important}.pagination{display:flex!important;align-items:center!important}.pagination .page-link{margin-top:-1px!important;border-top-width:2px!important;border-color:transparent!important;padding-top:1rem!important;padding-left:1rem!important;padding-right:1rem!important;display:inline-flex!important;align-items:center!important;font-size:.875rem!important;line-height:1.25rem!important;font-weight:500!important;--text-opacity:1!important;color:#6b7280!important;color:rgba(107,114,128,var(--text-opacity))!important;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform!important;transition-timing-function:cubic-bezier(.4,0,.2,1)!important;transition-duration:.15s!important;cursor:pointer!important}.pagination .page-link:hover{--text-opacity:1!important;color:#374151!important;color:rgba(55,65,81,var(--text-opacity))!important;--border-opacity:1!important;border-color:#d2d6dc!important;border-color:rgba(210,214,220,var(--border-opacity))!important}.pagination .page-link:focus{outline:2px solid transparent;outline-offset:2px;--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity));--border-opacity:1;border-color:#9fa6b2;border-color:rgba(159,166,178,var(--border-opacity))}.pagination .active>span{--text-opacity:1!important;color:#1c64f2!important;color:rgba(28,100,242,var(--text-opacity))!important;--border-opacity:1!important;border-color:#1c64f2!important;border-color:rgba(28,100,242,var(--border-opacity))!important}.space-x-1>:not(template)~:not(template){--space-x-reverse:0;margin-right:calc(0.25rem*var(--space-x-reverse));margin-left:calc(0.25rem*(1 - var(--space-x-reverse)))}.bg-white{--bg-opacity:1;background-color:#fff;background-color:rgba(255,255,255,var(--bg-opacity))}.bg-gray-50{--bg-opacity:1;background-color:#f9fafb;background-color:rgba(249,250,251,var(--bg-opacity))}.bg-gray-100{--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity))}.bg-gray-200{--bg-opacity:1;background-color:#e5e7eb;background-color:rgba(229,231,235,var(--bg-opacity))}.bg-gray-500{--bg-opacity:1;background-color:#6b7280;background-color:rgba(107,114,128,var(--bg-opacity))}.bg-gray-600{--bg-opacity:1;background-color:#4b5563;background-color:rgba(75,85,99,var(--bg-opacity))}.bg-gray-800{--bg-opacity:1;background-color:#252f3f;background-color:rgba(37,47,63,var(--bg-opacity))}.bg-gray-900{--bg-opacity:1;background-color:#161e2e;background-color:rgba(22,30,46,var(--bg-opacity))}.bg-red-100{--bg-opacity:1;background-color:#fde8e8;background-color:rgba(253,232,232,var(--bg-opacity))}.bg-green-500{--bg-opacity:1;background-color:#0e9f6e;background-color:rgba(14,159,110,var(--bg-opacity))}.bg-blue-50{--bg-opacity:1;background-color:#ebf5ff;background-color:rgba(235,245,255,var(--bg-opacity))}.bg-blue-600{--bg-opacity:1;background-color:#1c64f2;background-color:rgba(28,100,242,var(--bg-opacity))}.hover\:bg-gray-100:hover{--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity))}.hover\:bg-green-600:hover{--bg-opacity:1;background-color:#057a55;background-color:rgba(5,122,85,var(--bg-opacity))}.focus\:bg-gray-100:focus{--bg-opacity:1;background-color:#f4f5f7;background-color:rgba(244,245,247,var(--bg-opacity))}.focus\:bg-gray-600:focus{--bg-opacity:1;background-color:#4b5563;background-color:rgba(75,85,99,var(--bg-opacity))}.active\:bg-gray-50:active{--bg-opacity:1;background-color:#f9fafb;background-color:rgba(249,250,251,var(--bg-opacity))}.border-transparent{border-color:transparent}.border-gray-100{--border-opacity:1;border-color:#f4f5f7;border-color:rgba(244,245,247,var(--border-opacity))}.border-gray-200{--border-opacity:1;border-color:#e5e7eb;border-color:rgba(229,231,235,var(--border-opacity))}.border-gray-300{--border-opacity:1;border-color:#d2d6dc;border-color:rgba(210,214,220,var(--border-opacity))}.border-gray-800{--border-opacity:1;border-color:#252f3f;border-color:rgba(37,47,63,var(--border-opacity))}.border-green-500{--border-opacity:1;border-color:#0e9f6e;border-color:rgba(14,159,110,var(--border-opacity))}.border-blue-500{--border-opacity:1;border-color:#3f83f8;border-color:rgba(63,131,248,var(--border-opacity))}.border-blue-600{--border-opacity:1;border-color:#1c64f2;border-color:rgba(28,100,242,var(--border-opacity))}.hover\:border-gray-300:hover{--border-opacity:1;border-color:#d2d6dc;border-color:rgba(210,214,220,var(--border-opacity))}.focus\:border-gray-400:focus{--border-opacity:1;border-color:#9fa6b2;border-color:rgba(159,166,178,var(--border-opacity))}.focus\:border-blue-300:focus{--border-opacity:1;border-color:#a4cafe;border-color:rgba(164,202,254,var(--border-opacity))}.rounded-sm{border-radius:.125rem}.rounded{border-radius:.25rem}.rounded-md{border-radius:.375rem}.rounded-lg{border-radius:.5rem}.rounded-full{border-radius:9999px}.border-none{border-style:none}.border-0{border-width:0}.border{border-width:1px}.border-t-2{border-top-width:2px}.border-l-2{border-left-width:2px}.border-t{border-top-width:1px}.border-r{border-right-width:1px}.border-b{border-bottom-width:1px}.cursor-pointer{cursor:pointer}.block{display:block}.inline-block{display:inline-block}.flex{display:flex}.inline-flex{display:inline-flex}.table{display:table}.grid{display:grid}.hidden{display:none}.flex-row{flex-direction:row}.flex-col{flex-direction:column}.items-end{align-items:flex-end}.items-center{align-items:center}.justify-end{justify-content:flex-end}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.flex-1{flex:1 1 0%}.flex-shrink-0{flex-shrink:0}.font-sans{font-family:Open Sans,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji}.font-medium{font-weight:500}.font-semibold{font-weight:600}.font-bold{font-weight:700}.focus\:font-semibold:focus,.hover\:font-semibold:hover{font-weight:600}.h-0{height:0}.h-5{height:1.25rem}.h-6{height:1.5rem}.h-8{height:2rem}.h-12{height:3rem}.h-16{height:4rem}.h-32{height:8rem}.h-screen{height:100vh}.text-xs{font-size:.75rem}.text-sm{font-size:.875rem}.text-lg{font-size:1.125rem}.text-xl{font-size:1.25rem}.text-2xl{font-size:1.5rem}.text-3xl{font-size:1.875rem}.leading-4{line-height:1rem}.leading-5{line-height:1.25rem}.leading-6{line-height:1.5rem}.leading-tight{line-height:1.25}.m-auto{margin:auto}.mx-2{margin-left:.5rem;margin-right:.5rem}.my-4{margin-top:1rem;margin-bottom:1rem}.my-10{margin-top:2.5rem;margin-bottom:2.5rem}.mx-auto{margin-left:auto;margin-right:auto}.-my-2{margin-top:-.5rem;margin-bottom:-.5rem}.mt-0{margin-top:0}.mb-0{margin-bottom:0}.mt-1{margin-top:.25rem}.mr-1{margin-right:.25rem}.ml-1{margin-left:.25rem}.mt-2{margin-top:.5rem}.mr-2{margin-right:.5rem}.mb-2{margin-bottom:.5rem}.ml-2{margin-left:.5rem}.mt-3{margin-top:.75rem}.mr-3{margin-right:.75rem}.mb-3{margin-bottom:.75rem}.ml-3{margin-left:.75rem}.mt-4{margin-top:1rem}.mr-4{margin-right:1rem}.mb-4{margin-bottom:1rem}.mt-5{margin-top:1.25rem}.mt-6{margin-top:1.5rem}.mb-6{margin-bottom:1.5rem}.mt-8{margin-top:2rem}.mt-10{margin-top:2.5rem}.mb-10{margin-bottom:2.5rem}.-mr-1{margin-right:-.25rem}.-ml-1{margin-left:-.25rem}.-mr-14{margin-right:-3.5rem}.-mt-px{margin-top:-1px}.max-w-xs{max-width:20rem}.max-w-xl{max-width:36rem}.max-w-2xl{max-width:42rem}.min-h-screen{min-height:100vh}.min-w-full{min-width:100%}.object-cover{-o-object-fit:cover;object-fit:cover}.opacity-0{opacity:0}.opacity-25{opacity:.25}.opacity-75{opacity:.75}.opacity-100{opacity:1}.focus\:outline-none:focus{outline:2px solid transparent;outline-offset:2px}.overflow-hidden{overflow:hidden}.overflow-x-auto{overflow-x:auto}.overflow-y-auto{overflow-y:auto}.overflow-y-hidden{overflow-y:hidden}.overflow-y-scroll{overflow-y:scroll}.p-1{padding:.25rem}.p-3{padding:.75rem}.p-4{padding:1rem}.p-6{padding:1.5rem}.py-1{padding-top:.25rem;padding-bottom:.25rem}.py-2{padding-top:.5rem;padding-bottom:.5rem}.px-2{padding-left:.5rem;padding-right:.5rem}.py-3{padding-top:.75rem;padding-bottom:.75rem}.px-3{padding-left:.75rem;padding-right:.75rem}.py-4{padding-top:1rem;padding-bottom:1rem}.px-4{padding-left:1rem;padding-right:1rem}.py-5{padding-top:1.25rem;padding-bottom:1.25rem}.py-6{padding-top:1.5rem;padding-bottom:1.5rem}.px-6{padding-left:1.5rem;padding-right:1.5rem}.py-8{padding-top:2rem;padding-bottom:2rem}.px-10{padding-left:2.5rem;padding-right:2.5rem}.pr-1{padding-right:.25rem}.pl-1{padding-left:.25rem}.pt-4{padding-top:1rem}.pr-4{padding-right:1rem}.pb-4{padding-bottom:1rem}.pt-5{padding-top:1.25rem}.pt-6{padding-top:1.5rem}.pb-20{padding-bottom:5rem}.pointer-events-none{pointer-events:none}.pointer-events-auto{pointer-events:auto}.fixed{position:fixed}.absolute{position:absolute}.relative{position:relative}.inset-0{right:0;left:0}.inset-0,.inset-y-0{top:0;bottom:0}.inset-x-0{right:0;left:0}.top-0{top:0}.right-0{right:0}.bottom-0{bottom:0}.left-0{left:0}.shadow-xs{box-shadow:0 0 0 1px rgba(0,0,0,.05)}.shadow-sm{box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}.shadow{box-shadow:0 1px 3px 0 rgba(0,0,0,.1),0 1px 2px 0 rgba(0,0,0,.06)}.shadow-lg{box-shadow:0 10px 15px -3px rgba(0,0,0,.1),0 4px 6px -2px rgba(0,0,0,.05)}.shadow-xl{box-shadow:0 20px 25px -5px rgba(0,0,0,.1),0 10px 10px -5px rgba(0,0,0,.04)}.focus\:shadow-outline:focus{box-shadow:0 0 0 3px rgba(118,169,250,.45)}.focus\:shadow-outline-blue:focus{box-shadow:0 0 0 3px rgba(164,202,254,.45)}.fill-current{fill:currentColor}.table-auto{table-layout:auto}.text-left{text-align:left}.text-center{text-align:center}.text-right{text-align:right}.text-white{--text-opacity:1;color:#fff;color:rgba(255,255,255,var(--text-opacity))}.text-black{--text-opacity:1;color:#000;color:rgba(0,0,0,var(--text-opacity))}.text-gray-300{--text-opacity:1;color:#d2d6dc;color:rgba(210,214,220,var(--text-opacity))}.text-gray-400{--text-opacity:1;color:#9fa6b2;color:rgba(159,166,178,var(--text-opacity))}.text-gray-500{--text-opacity:1;color:#6b7280;color:rgba(107,114,128,var(--text-opacity))}.text-gray-600{--text-opacity:1;color:#4b5563;color:rgba(75,85,99,var(--text-opacity))}.text-gray-700{--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity))}.text-gray-800{--text-opacity:1;color:#252f3f;color:rgba(37,47,63,var(--text-opacity))}.text-gray-900{--text-opacity:1;color:#161e2e;color:rgba(22,30,46,var(--text-opacity))}.text-red-400{--text-opacity:1;color:#f98080;color:rgba(249,128,128,var(--text-opacity))}.text-red-600{--text-opacity:1;color:#e02424;color:rgba(224,36,36,var(--text-opacity))}.text-blue-500{--text-opacity:1;color:#3f83f8;color:rgba(63,131,248,var(--text-opacity))}.text-blue-600{--text-opacity:1;color:#1c64f2;color:rgba(28,100,242,var(--text-opacity))}.hover\:text-gray-300:hover{--text-opacity:1;color:#d2d6dc;color:rgba(210,214,220,var(--text-opacity))}.hover\:text-gray-500:hover{--text-opacity:1;color:#6b7280;color:rgba(107,114,128,var(--text-opacity))}.hover\:text-gray-600:hover{--text-opacity:1;color:#4b5563;color:rgba(75,85,99,var(--text-opacity))}.hover\:text-gray-700:hover{--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity))}.hover\:text-gray-800:hover{--text-opacity:1;color:#252f3f;color:rgba(37,47,63,var(--text-opacity))}.hover\:text-gray-900:hover{--text-opacity:1;color:#161e2e;color:rgba(22,30,46,var(--text-opacity))}.hover\:text-blue-600:hover{--text-opacity:1;color:#1c64f2;color:rgba(28,100,242,var(--text-opacity))}.hover\:text-indigo-900:hover{--text-opacity:1;color:#362f78;color:rgba(54,47,120,var(--text-opacity))}.focus\:text-gray-500:focus{--text-opacity:1;color:#6b7280;color:rgba(107,114,128,var(--text-opacity))}.focus\:text-gray-600:focus{--text-opacity:1;color:#4b5563;color:rgba(75,85,99,var(--text-opacity))}.focus\:text-gray-700:focus{--text-opacity:1;color:#374151;color:rgba(55,65,81,var(--text-opacity))}.focus\:text-gray-900:focus{--text-opacity:1;color:#161e2e;color:rgba(22,30,46,var(--text-opacity))}.active\:text-gray-800:active{--text-opacity:1;color:#252f3f;color:rgba(37,47,63,var(--text-opacity))}.uppercase{text-transform:uppercase}.focus\:underline:focus{text-decoration:underline}.antialiased{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.tracking-wider{letter-spacing:.05em}.align-middle{vertical-align:middle}.align-bottom{vertical-align:bottom}.whitespace-no-wrap{white-space:nowrap}.break-words{overflow-wrap:break-word}.w-0{width:0}.w-5{width:1.25rem}.w-6{width:1.5rem}.w-8{width:2rem}.w-12{width:3rem}.w-14{width:3.5rem}.w-48{width:12rem}.w-56{width:14rem}.w-64{width:16rem}.w-auto{width:auto}.w-1\/2{width:50%}.w-full{width:100%}.z-0{z-index:0}.z-10{z-index:10}.z-30{z-index:30}.z-40{z-index:40}.gap-4{grid-gap:1rem;gap:1rem}.gap-6{grid-gap:1.5rem;gap:1.5rem}.grid-cols-6{grid-template-columns:repeat(6,minmax(0,1fr))}.grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.col-span-1{grid-column:span 1/span 1}.col-span-2{grid-column:span 2/span 2}.col-span-4{grid-column:span 4/span 4}.col-span-6{grid-column:span 6/span 6}.col-span-7{grid-column:span 7/span 7}.col-span-12{grid-column:span 12/span 12}.col-start-2{grid-column-start:2}.col-start-3{grid-column-start:3}.col-start-5{grid-column-start:5}.transform{--transform-translate-x:0;--transform-translate-y:0;--transform-rotate:0;--transform-skew-x:0;--transform-skew-y:0;--transform-scale-x:1;--transform-scale-y:1;transform:translateX(var(--transform-translate-x)) translateY(var(--transform-translate-y)) rotate(var(--transform-rotate)) skewX(var(--transform-skew-x)) skewY(var(--transform-skew-y)) scaleX(var(--transform-scale-x)) scaleY(var(--transform-scale-y))}.origin-top-right{transform-origin:top right}.scale-95{--transform-scale-x:.95;--transform-scale-y:.95}.scale-100{--transform-scale-x:1;--transform-scale-y:1}.translate-x-0{--transform-translate-x:0}.-translate-x-full{--transform-translate-x:-100%}.translate-y-0{--transform-translate-y:0}.translate-y-4{--transform-translate-y:1rem}.transition-all{transition-property:all}.transition{transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform}.transition-opacity{transition-property:opacity}.ease-linear{transition-timing-function:linear}.ease-in{transition-timing-function:cubic-bezier(.4,0,1,1)}.ease-out{transition-timing-function:cubic-bezier(0,0,.2,1)}.ease-in-out{transition-timing-function:cubic-bezier(.4,0,.2,1)}.duration-75{transition-duration:75ms}.duration-100{transition-duration:.1s}.duration-150{transition-duration:.15s}.duration-200{transition-duration:.2s}.duration-300{transition-duration:.3s}@-webkit-keyframes spin{to{transform:rotate(1turn)}}@keyframes spin{to{transform:rotate(1turn)}}@-webkit-keyframes ping{75%,to{transform:scale(2);opacity:0}}@keyframes ping{75%,to{transform:scale(2);opacity:0}}@-webkit-keyframes pulse{50%{opacity:.5}}@keyframes pulse{50%{opacity:.5}}@-webkit-keyframes bounce{0%,to{transform:translateY(-25%);-webkit-animation-timing-function:cubic-bezier(.8,0,1,1);animation-timing-function:cubic-bezier(.8,0,1,1)}50%{transform:none;-webkit-animation-timing-function:cubic-bezier(0,0,.2,1);animation-timing-function:cubic-bezier(0,0,.2,1)}}@keyframes bounce{0%,to{transform:translateY(-25%);-webkit-animation-timing-function:cubic-bezier(.8,0,1,1);animation-timing-function:cubic-bezier(.8,0,1,1)}50%{transform:none;-webkit-animation-timing-function:cubic-bezier(0,0,.2,1);animation-timing-function:cubic-bezier(0,0,.2,1)}}.animate-spin{-webkit-animation:spin 1s linear infinite;animation:spin 1s linear infinite}@media (min-width:640px){.sm\:container{width:100%;max-width:640px}@media (min-width:768px){.sm\:container{max-width:768px}}@media (min-width:1024px){.sm\:container{max-width:1024px}}@media (min-width:1280px){.sm\:container{max-width:1280px}}.sm\:rounded-lg{border-radius:.5rem}.sm\:block{display:block}.sm\:inline-block{display:inline-block}.sm\:flex{display:flex}.sm\:grid{display:grid}.sm\:hidden{display:none}.sm\:flex-row-reverse{flex-direction:row-reverse}.sm\:items-start{align-items:flex-start}.sm\:items-center{align-items:center}.sm\:justify-center{justify-content:center}.sm\:justify-between{justify-content:space-between}.sm\:flex-shrink-0{flex-shrink:0}.sm\:h-10{height:2.5rem}.sm\:h-screen{height:100vh}.sm\:mx-0{margin-left:0;margin-right:0}.sm\:my-8{margin-top:2rem;margin-bottom:2rem}.sm\:-mx-6{margin-left:-1.5rem;margin-right:-1.5rem}.sm\:mt-0{margin-top:0}.sm\:ml-3{margin-left:.75rem}.sm\:mt-4{margin-top:1rem}.sm\:ml-4{margin-left:1rem}.sm\:mt-6{margin-top:1.5rem}.sm\:ml-6{margin-left:1.5rem}.sm\:max-w-sm{max-width:24rem}.sm\:max-w-lg{max-width:32rem}.sm\:p-0{padding:0}.sm\:p-6{padding:1.5rem}.sm\:px-0{padding-left:0;padding-right:0}.sm\:px-6{padding-left:1.5rem;padding-right:1.5rem}.sm\:inset-0{top:0;right:0;bottom:0;left:0}.sm\:text-left{text-align:left}.sm\:align-middle{vertical-align:middle}.sm\:w-10{width:2.5rem}.sm\:w-auto{width:auto}.sm\:w-full{width:100%}.sm\:gap-4{grid-gap:1rem;gap:1rem}.sm\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.sm\:col-span-2{grid-column:span 2/span 2}.sm\:col-span-3{grid-column:span 3/span 3}.sm\:col-span-4{grid-column:span 4/span 4}.sm\:col-span-6{grid-column:span 6/span 6}.sm\:scale-95{--transform-scale-x:.95;--transform-scale-y:.95}.sm\:scale-100{--transform-scale-x:1;--transform-scale-y:1}.sm\:translate-y-0{--transform-translate-y:0}}@media (min-width:768px){.md\:container{width:100%}@media (min-width:640px){.md\:container{max-width:640px}}@media (min-width:768px){.md\:container{max-width:768px}}@media (min-width:1024px){.md\:container{max-width:1024px}}@media (min-width:1280px){.md\:container{max-width:1280px}}.md\:block{display:block}.md\:flex{display:flex}.md\:grid{display:grid}.md\:hidden{display:none}.md\:flex-row{flex-direction:row}.md\:justify-between{justify-content:space-between}.md\:flex-shrink-0{flex-shrink:0}.md\:text-3xl{font-size:1.875rem}.md\:mt-0{margin-top:0}.md\:mr-2{margin-right:.5rem}.md\:ml-2{margin-left:.5rem}.md\:ml-6{margin-left:1.5rem}.md\:mt-10{margin-top:2.5rem}.md\:-mr-1{margin-right:-.25rem}.md\:px-8{padding-left:2rem;padding-right:2rem}.md\:w-1\/2{width:50%}.md\:w-1\/3{width:33.333333%}.md\:gap-6{grid-gap:1.5rem;gap:1.5rem}.md\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.md\:col-span-1{grid-column:span 1/span 1}.md\:col-span-2{grid-column:span 2/span 2}.md\:col-span-3{grid-column:span 3/span 3}.md\:col-span-4{grid-column:span 4/span 4}.md\:col-span-6{grid-column:span 6/span 6}.md\:col-start-2{grid-column-start:2}.md\:col-start-4{grid-column-start:4}}@media (min-width:1024px){.lg\:container{width:100%}@media (min-width:640px){.lg\:container{max-width:640px}}@media (min-width:768px){.lg\:container{max-width:768px}}@media (min-width:1024px){.lg\:container{max-width:1024px}}@media (min-width:1280px){.lg\:container{max-width:1280px}}.lg\:block{display:block}.lg\:-mx-8{margin-left:-2rem;margin-right:-2rem}.lg\:px-8{padding-left:2rem;padding-right:2rem}.lg\:w-1\/4{width:25%}.lg\:w-1\/5{width:20%}.lg\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.lg\:grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.lg\:col-span-3{grid-column:span 3/span 3}}@media (min-width:1280px){.xl\:container{width:100%}@media (min-width:640px){.xl\:container{max-width:640px}}@media (min-width:768px){.xl\:container{max-width:768px}}@media (min-width:1024px){.xl\:container{max-width:1024px}}@media (min-width:1280px){.xl\:container{max-width:1280px}}}
diff --git a/public/flutter_service_worker.js b/public/flutter_service_worker.js
index 33b1a9ab6767..168113e89dff 100644
--- a/public/flutter_service_worker.js
+++ b/public/flutter_service_worker.js
@@ -3,33 +3,33 @@ const MANIFEST = 'flutter-app-manifest';
const TEMP = 'flutter-temp-cache';
const CACHE_NAME = 'flutter-app-cache';
const RESOURCES = {
- "assets/assets/images/logo.png": "090f69e23311a4b6d851b3880ae52541",
-"assets/assets/images/payment_types/unionpay.png": "7002f52004e0ab8cc0b7450b0208ccb2",
-"assets/assets/images/payment_types/maestro.png": "e533b92bfb50339fdbfa79e3dfe81f08",
-"assets/assets/images/payment_types/solo.png": "2030c3ccaccf5d5e87916a62f5b084d6",
-"assets/assets/images/payment_types/switch.png": "4fa11c45327f5fdc20205821b2cfd9cc",
-"assets/assets/images/payment_types/dinerscard.png": "06d85186ba858c18ab7c9caa42c92024",
-"assets/assets/images/payment_types/ach.png": "7433f0aff779dc98a649b7a2daf777cf",
-"assets/assets/images/payment_types/jcb.png": "07e0942d16c5592118b72e74f2f7198c",
-"assets/assets/images/payment_types/discover.png": "6c0a386a00307f87db7bea366cca35f5",
-"assets/assets/images/payment_types/amex.png": "c49a4247984b3732a4af50a3390aa978",
-"assets/assets/images/payment_types/carteblanche.png": "d936e11fa3884b8c9f1bd5c914be8629",
-"assets/assets/images/payment_types/other.png": "d936e11fa3884b8c9f1bd5c914be8629",
-"assets/assets/images/payment_types/mastercard.png": "6f6cdc29ee2e22e06b1ac029cb52ef71",
-"assets/assets/images/payment_types/paypal.png": "8e06c094c1871376dfea1da8088c29d1",
-"assets/assets/images/payment_types/laser.png": "b4e6e93dd35517ac429301119ff05868",
-"assets/assets/images/payment_types/visa.png": "3ddc4a4d25c946e8ad7e6998f30fd4e3",
-"assets/assets/images/google-icon.png": "0f118259ce403274f407f5e982e681c3",
-"assets/AssetManifest.json": "ea09ed4b9b8b6c83d6896248aac7c527",
-"assets/fonts/MaterialIcons-Regular.otf": "1288c9e28052e028aba623321f7826ac",
-"assets/packages/material_design_icons_flutter/lib/fonts/materialdesignicons-webfont.ttf": "51c686b86bc12382579d8283b7e76b6b",
-"assets/FontManifest.json": "cf3c681641169319e61b61bd0277378f",
-"assets/NOTICES": "23c057eefb1ee72da3e32d88380ea642",
+ "favicon.ico": "51636d3a390451561744c42188ccd628",
"favicon.png": "dca91c54388f52eded692718d5a98b8b",
-"version.json": "8aae00fa2f61d4fb2f49b897675cf719",
-"main.dart.js": "6c23558db605872e80756c78eeb70ba5",
+"assets/assets/images/logo.png": "090f69e23311a4b6d851b3880ae52541",
+"assets/assets/images/payment_types/solo.png": "2030c3ccaccf5d5e87916a62f5b084d6",
+"assets/assets/images/payment_types/jcb.png": "07e0942d16c5592118b72e74f2f7198c",
+"assets/assets/images/payment_types/unionpay.png": "7002f52004e0ab8cc0b7450b0208ccb2",
+"assets/assets/images/payment_types/amex.png": "c49a4247984b3732a4af50a3390aa978",
+"assets/assets/images/payment_types/other.png": "d936e11fa3884b8c9f1bd5c914be8629",
+"assets/assets/images/payment_types/dinerscard.png": "06d85186ba858c18ab7c9caa42c92024",
+"assets/assets/images/payment_types/mastercard.png": "6f6cdc29ee2e22e06b1ac029cb52ef71",
+"assets/assets/images/payment_types/visa.png": "3ddc4a4d25c946e8ad7e6998f30fd4e3",
+"assets/assets/images/payment_types/switch.png": "4fa11c45327f5fdc20205821b2cfd9cc",
+"assets/assets/images/payment_types/ach.png": "7433f0aff779dc98a649b7a2daf777cf",
+"assets/assets/images/payment_types/paypal.png": "8e06c094c1871376dfea1da8088c29d1",
+"assets/assets/images/payment_types/carteblanche.png": "d936e11fa3884b8c9f1bd5c914be8629",
+"assets/assets/images/payment_types/laser.png": "b4e6e93dd35517ac429301119ff05868",
+"assets/assets/images/payment_types/maestro.png": "e533b92bfb50339fdbfa79e3dfe81f08",
+"assets/assets/images/payment_types/discover.png": "6c0a386a00307f87db7bea366cca35f5",
+"assets/assets/images/google-icon.png": "0f118259ce403274f407f5e982e681c3",
+"assets/fonts/MaterialIcons-Regular.otf": "1288c9e28052e028aba623321f7826ac",
+"assets/NOTICES": "10ad422a6909fbba8f9455468ba10a08",
+"assets/FontManifest.json": "cf3c681641169319e61b61bd0277378f",
+"assets/packages/material_design_icons_flutter/lib/fonts/materialdesignicons-webfont.ttf": "51c686b86bc12382579d8283b7e76b6b",
+"assets/AssetManifest.json": "ea09ed4b9b8b6c83d6896248aac7c527",
"manifest.json": "77215c1737c7639764e64a192be2f7b8",
-"favicon.ico": "51636d3a390451561744c42188ccd628",
+"main.dart.js": "fc145d1e5e139348b43cd9c201dcdd8b",
+"version.json": "aa391190726ff57028678087c66bb7da",
"/": "23224b5e03519aaa87594403d54412cf",
"icons/Icon-192.png": "bb1cf5f6982006952211c7c8404ffbed",
"icons/Icon-512.png": "0f9aff01367f0a0c69773d25ca16ef35"
diff --git a/public/js/setup/setup.js b/public/js/setup/setup.js
index 7c434edf4194..70b7947430a9 100644
--- a/public/js/setup/setup.js
+++ b/public/js/setup/setup.js
@@ -1,2 +1,2 @@
/*! For license information please see setup.js.LICENSE.txt */
-!function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="/",n(n.s=12)}({12:function(e,t,n){e.exports=n("tM+k")},"2SVd":function(e,t,n){"use strict";e.exports=function(e){return/^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(e)}},"5oMp":function(e,t,n){"use strict";e.exports=function(e,t){return t?e.replace(/\/+$/,"")+"/"+t.replace(/^\/+/,""):e}},"8oxB":function(e,t){var n,r,o=e.exports={};function i(){throw new Error("setTimeout has not been defined")}function s(){throw new Error("clearTimeout has not been defined")}function a(e){if(n===setTimeout)return setTimeout(e,0);if((n===i||!n)&&setTimeout)return n=setTimeout,setTimeout(e,0);try{return n(e,0)}catch(t){try{return n.call(null,e,0)}catch(t){return n.call(this,e,0)}}}!function(){try{n="function"==typeof setTimeout?setTimeout:i}catch(e){n=i}try{r="function"==typeof clearTimeout?clearTimeout:s}catch(e){r=s}}();var u,c=[],f=!1,l=-1;function d(){f&&u&&(f=!1,u.length?c=u.concat(c):l=-1,c.length&&p())}function p(){if(!f){var e=a(d);f=!0;for(var t=c.length;t;){for(u=c,c=[];++l1)for(var n=1;n=200&&e<300}};u.headers={common:{Accept:"application/json, text/plain, */*"}},r.forEach(["delete","get","head"],(function(e){u.headers[e]={}})),r.forEach(["post","put","patch"],(function(e){u.headers[e]=r.merge(i)})),e.exports=u}).call(this,n("8oxB"))},LYNF:function(e,t,n){"use strict";var r=n("OH9c");e.exports=function(e,t,n,o,i){var s=new Error(e);return r(s,t,n,o,i)}},Lmem:function(e,t,n){"use strict";e.exports=function(e){return!(!e||!e.__CANCEL__)}},MLWZ:function(e,t,n){"use strict";var r=n("xTJ+");function o(e){return encodeURIComponent(e).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,"+").replace(/%5B/gi,"[").replace(/%5D/gi,"]")}e.exports=function(e,t,n){if(!t)return e;var i;if(n)i=n(t);else if(r.isURLSearchParams(t))i=t.toString();else{var s=[];r.forEach(t,(function(e,t){null!=e&&(r.isArray(e)?t+="[]":e=[e],r.forEach(e,(function(e){r.isDate(e)?e=e.toISOString():r.isObject(e)&&(e=JSON.stringify(e)),s.push(o(t)+"="+o(e))})))})),i=s.join("&")}if(i){var a=e.indexOf("#");-1!==a&&(e=e.slice(0,a)),e+=(-1===e.indexOf("?")?"?":"&")+i}return e}},OH9c:function(e,t,n){"use strict";e.exports=function(e,t,n,r,o){return e.config=t,n&&(e.code=n),e.request=r,e.response=o,e.isAxiosError=!0,e.toJSON=function(){return{message:this.message,name:this.name,description:this.description,number:this.number,fileName:this.fileName,lineNumber:this.lineNumber,columnNumber:this.columnNumber,stack:this.stack,config:this.config,code:this.code}},e}},OTTw:function(e,t,n){"use strict";var r=n("xTJ+");e.exports=r.isStandardBrowserEnv()?function(){var e,t=/(msie|trident)/i.test(navigator.userAgent),n=document.createElement("a");function o(e){var r=e;return t&&(n.setAttribute("href",r),r=n.href),n.setAttribute("href",r),{href:n.href,protocol:n.protocol?n.protocol.replace(/:$/,""):"",host:n.host,search:n.search?n.search.replace(/^\?/,""):"",hash:n.hash?n.hash.replace(/^#/,""):"",hostname:n.hostname,port:n.port,pathname:"/"===n.pathname.charAt(0)?n.pathname:"/"+n.pathname}}return e=o(window.location.href),function(t){var n=r.isString(t)?o(t):t;return n.protocol===e.protocol&&n.host===e.host}}():function(){return!0}},"Rn+g":function(e,t,n){"use strict";var r=n("LYNF");e.exports=function(e,t,n){var o=n.config.validateStatus;!o||o(n.status)?e(n):t(r("Request failed with status code "+n.status,n.config,null,n.request,n))}},SntB:function(e,t,n){"use strict";var r=n("xTJ+");e.exports=function(e,t){t=t||{};var n={},o=["url","method","params","data"],i=["headers","auth","proxy"],s=["baseURL","url","transformRequest","transformResponse","paramsSerializer","timeout","withCredentials","adapter","responseType","xsrfCookieName","xsrfHeaderName","onUploadProgress","onDownloadProgress","maxContentLength","validateStatus","maxRedirects","httpAgent","httpsAgent","cancelToken","socketPath"];r.forEach(o,(function(e){void 0!==t[e]&&(n[e]=t[e])})),r.forEach(i,(function(o){r.isObject(t[o])?n[o]=r.deepMerge(e[o],t[o]):void 0!==t[o]?n[o]=t[o]:r.isObject(e[o])?n[o]=r.deepMerge(e[o]):void 0!==e[o]&&(n[o]=e[o])})),r.forEach(s,(function(r){void 0!==t[r]?n[r]=t[r]:void 0!==e[r]&&(n[r]=e[r])}));var a=o.concat(i).concat(s),u=Object.keys(t).filter((function(e){return-1===a.indexOf(e)}));return r.forEach(u,(function(r){void 0!==t[r]?n[r]=t[r]:void 0!==e[r]&&(n[r]=e[r])})),n}},UnBK:function(e,t,n){"use strict";var r=n("xTJ+"),o=n("xAGQ"),i=n("Lmem"),s=n("JEQr");function a(e){e.cancelToken&&e.cancelToken.throwIfRequested()}e.exports=function(e){return a(e),e.headers=e.headers||{},e.data=o(e.data,e.headers,e.transformRequest),e.headers=r.merge(e.headers.common||{},e.headers[e.method]||{},e.headers),r.forEach(["delete","get","head","post","put","patch","common"],(function(t){delete e.headers[t]})),(e.adapter||s.adapter)(e).then((function(t){return a(e),t.data=o(t.data,t.headers,e.transformResponse),t}),(function(t){return i(t)||(a(e),t&&t.response&&(t.response.data=o(t.response.data,t.response.headers,e.transformResponse))),Promise.reject(t)}))}},endd:function(e,t,n){"use strict";function r(e){this.message=e}r.prototype.toString=function(){return"Cancel"+(this.message?": "+this.message:"")},r.prototype.__CANCEL__=!0,e.exports=r},eqyj:function(e,t,n){"use strict";var r=n("xTJ+");e.exports=r.isStandardBrowserEnv()?{write:function(e,t,n,o,i,s){var a=[];a.push(e+"="+encodeURIComponent(t)),r.isNumber(n)&&a.push("expires="+new Date(n).toGMTString()),r.isString(o)&&a.push("path="+o),r.isString(i)&&a.push("domain="+i),!0===s&&a.push("secure"),document.cookie=a.join("; ")},read:function(e){var t=document.cookie.match(new RegExp("(^|;\\s*)("+e+")=([^;]*)"));return t?decodeURIComponent(t[3]):null},remove:function(e){this.write(e,"",Date.now()-864e5)}}:{write:function(){},read:function(){return null},remove:function(){}}},g7np:function(e,t,n){"use strict";var r=n("2SVd"),o=n("5oMp");e.exports=function(e,t){return e&&!r(t)?o(e,t):t}},"jfS+":function(e,t,n){"use strict";var r=n("endd");function o(e){if("function"!=typeof e)throw new TypeError("executor must be a function.");var t;this.promise=new Promise((function(e){t=e}));var n=this;e((function(e){n.reason||(n.reason=new r(e),t(n.reason))}))}o.prototype.throwIfRequested=function(){if(this.reason)throw this.reason},o.source=function(){var e;return{token:new o((function(t){e=t})),cancel:e}},e.exports=o},"tM+k":function(e,t,n){"use strict";n.r(t);var r=n("vDqi"),o=n.n(r);function i(e,t){for(var n=0;n1&&void 0!==arguments[1]?arguments[1]:null;e.classList.remove("alert-success"),e.innerText=t||"Oops, looks like something isn't correct!",e.classList.add("alert-failure")}},{key:"handle",value:function(){var e=this;this.checkDbButton.addEventListener("click",(function(){return e.handleDatabaseCheck()})),this.checkSmtpButton.addEventListener("click",(function(){return e.handleSmtpCheck()})),this.checkPdfButton.addEventListener("click",(function(){return e.handleTestPdfCheck()}))}}])&&i(t.prototype,n),r&&i(t,r),e}())).handle()},tQ2B:function(e,t,n){"use strict";var r=n("xTJ+"),o=n("Rn+g"),i=n("MLWZ"),s=n("g7np"),a=n("w0Vi"),u=n("OTTw"),c=n("LYNF");e.exports=function(e){return new Promise((function(t,f){var l=e.data,d=e.headers;r.isFormData(l)&&delete d["Content-Type"];var p=new XMLHttpRequest;if(e.auth){var h=e.auth.username||"",m=e.auth.password||"";d.Authorization="Basic "+btoa(h+":"+m)}var v=s(e.baseURL,e.url);if(p.open(e.method.toUpperCase(),i(v,e.params,e.paramsSerializer),!0),p.timeout=e.timeout,p.onreadystatechange=function(){if(p&&4===p.readyState&&(0!==p.status||p.responseURL&&0===p.responseURL.indexOf("file:"))){var n="getAllResponseHeaders"in p?a(p.getAllResponseHeaders()):null,r={data:e.responseType&&"text"!==e.responseType?p.response:p.responseText,status:p.status,statusText:p.statusText,headers:n,config:e,request:p};o(t,f,r),p=null}},p.onabort=function(){p&&(f(c("Request aborted",e,"ECONNABORTED",p)),p=null)},p.onerror=function(){f(c("Network Error",e,null,p)),p=null},p.ontimeout=function(){var t="timeout of "+e.timeout+"ms exceeded";e.timeoutErrorMessage&&(t=e.timeoutErrorMessage),f(c(t,e,"ECONNABORTED",p)),p=null},r.isStandardBrowserEnv()){var y=n("eqyj"),g=(e.withCredentials||u(v))&&e.xsrfCookieName?y.read(e.xsrfCookieName):void 0;g&&(d[e.xsrfHeaderName]=g)}if("setRequestHeader"in p&&r.forEach(d,(function(e,t){void 0===l&&"content-type"===t.toLowerCase()?delete d[t]:p.setRequestHeader(t,e)})),r.isUndefined(e.withCredentials)||(p.withCredentials=!!e.withCredentials),e.responseType)try{p.responseType=e.responseType}catch(t){if("json"!==e.responseType)throw t}"function"==typeof e.onDownloadProgress&&p.addEventListener("progress",e.onDownloadProgress),"function"==typeof e.onUploadProgress&&p.upload&&p.upload.addEventListener("progress",e.onUploadProgress),e.cancelToken&&e.cancelToken.promise.then((function(e){p&&(p.abort(),f(e),p=null)})),void 0===l&&(l=null),p.send(l)}))}},vDqi:function(e,t,n){e.exports=n("zuR4")},w0Vi:function(e,t,n){"use strict";var r=n("xTJ+"),o=["age","authorization","content-length","content-type","etag","expires","from","host","if-modified-since","if-unmodified-since","last-modified","location","max-forwards","proxy-authorization","referer","retry-after","user-agent"];e.exports=function(e){var t,n,i,s={};return e?(r.forEach(e.split("\n"),(function(e){if(i=e.indexOf(":"),t=r.trim(e.substr(0,i)).toLowerCase(),n=r.trim(e.substr(i+1)),t){if(s[t]&&o.indexOf(t)>=0)return;s[t]="set-cookie"===t?(s[t]?s[t]:[]).concat([n]):s[t]?s[t]+", "+n:n}})),s):s}},xAGQ:function(e,t,n){"use strict";var r=n("xTJ+");e.exports=function(e,t,n){return r.forEach(n,(function(n){e=n(e,t)})),e}},"xTJ+":function(e,t,n){"use strict";var r=n("HSsa"),o=Object.prototype.toString;function i(e){return"[object Array]"===o.call(e)}function s(e){return void 0===e}function a(e){return null!==e&&"object"==typeof e}function u(e){return"[object Function]"===o.call(e)}function c(e,t){if(null!=e)if("object"!=typeof e&&(e=[e]),i(e))for(var n=0,r=e.length;n1)for(var n=1;n=200&&e<300}};u.headers={common:{Accept:"application/json, text/plain, */*"}},r.forEach(["delete","get","head"],(function(e){u.headers[e]={}})),r.forEach(["post","put","patch"],(function(e){u.headers[e]=r.merge(i)})),e.exports=u}).call(this,n("8oxB"))},LYNF:function(e,t,n){"use strict";var r=n("OH9c");e.exports=function(e,t,n,o,i){var s=new Error(e);return r(s,t,n,o,i)}},Lmem:function(e,t,n){"use strict";e.exports=function(e){return!(!e||!e.__CANCEL__)}},MLWZ:function(e,t,n){"use strict";var r=n("xTJ+");function o(e){return encodeURIComponent(e).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,"+").replace(/%5B/gi,"[").replace(/%5D/gi,"]")}e.exports=function(e,t,n){if(!t)return e;var i;if(n)i=n(t);else if(r.isURLSearchParams(t))i=t.toString();else{var s=[];r.forEach(t,(function(e,t){null!=e&&(r.isArray(e)?t+="[]":e=[e],r.forEach(e,(function(e){r.isDate(e)?e=e.toISOString():r.isObject(e)&&(e=JSON.stringify(e)),s.push(o(t)+"="+o(e))})))})),i=s.join("&")}if(i){var a=e.indexOf("#");-1!==a&&(e=e.slice(0,a)),e+=(-1===e.indexOf("?")?"?":"&")+i}return e}},OH9c:function(e,t,n){"use strict";e.exports=function(e,t,n,r,o){return e.config=t,n&&(e.code=n),e.request=r,e.response=o,e.isAxiosError=!0,e.toJSON=function(){return{message:this.message,name:this.name,description:this.description,number:this.number,fileName:this.fileName,lineNumber:this.lineNumber,columnNumber:this.columnNumber,stack:this.stack,config:this.config,code:this.code}},e}},OTTw:function(e,t,n){"use strict";var r=n("xTJ+");e.exports=r.isStandardBrowserEnv()?function(){var e,t=/(msie|trident)/i.test(navigator.userAgent),n=document.createElement("a");function o(e){var r=e;return t&&(n.setAttribute("href",r),r=n.href),n.setAttribute("href",r),{href:n.href,protocol:n.protocol?n.protocol.replace(/:$/,""):"",host:n.host,search:n.search?n.search.replace(/^\?/,""):"",hash:n.hash?n.hash.replace(/^#/,""):"",hostname:n.hostname,port:n.port,pathname:"/"===n.pathname.charAt(0)?n.pathname:"/"+n.pathname}}return e=o(window.location.href),function(t){var n=r.isString(t)?o(t):t;return n.protocol===e.protocol&&n.host===e.host}}():function(){return!0}},"Rn+g":function(e,t,n){"use strict";var r=n("LYNF");e.exports=function(e,t,n){var o=n.config.validateStatus;!o||o(n.status)?e(n):t(r("Request failed with status code "+n.status,n.config,null,n.request,n))}},SntB:function(e,t,n){"use strict";var r=n("xTJ+");e.exports=function(e,t){t=t||{};var n={},o=["url","method","params","data"],i=["headers","auth","proxy"],s=["baseURL","url","transformRequest","transformResponse","paramsSerializer","timeout","withCredentials","adapter","responseType","xsrfCookieName","xsrfHeaderName","onUploadProgress","onDownloadProgress","maxContentLength","validateStatus","maxRedirects","httpAgent","httpsAgent","cancelToken","socketPath"];r.forEach(o,(function(e){void 0!==t[e]&&(n[e]=t[e])})),r.forEach(i,(function(o){r.isObject(t[o])?n[o]=r.deepMerge(e[o],t[o]):void 0!==t[o]?n[o]=t[o]:r.isObject(e[o])?n[o]=r.deepMerge(e[o]):void 0!==e[o]&&(n[o]=e[o])})),r.forEach(s,(function(r){void 0!==t[r]?n[r]=t[r]:void 0!==e[r]&&(n[r]=e[r])}));var a=o.concat(i).concat(s),u=Object.keys(t).filter((function(e){return-1===a.indexOf(e)}));return r.forEach(u,(function(r){void 0!==t[r]?n[r]=t[r]:void 0!==e[r]&&(n[r]=e[r])})),n}},UnBK:function(e,t,n){"use strict";var r=n("xTJ+"),o=n("xAGQ"),i=n("Lmem"),s=n("JEQr");function a(e){e.cancelToken&&e.cancelToken.throwIfRequested()}e.exports=function(e){return a(e),e.headers=e.headers||{},e.data=o(e.data,e.headers,e.transformRequest),e.headers=r.merge(e.headers.common||{},e.headers[e.method]||{},e.headers),r.forEach(["delete","get","head","post","put","patch","common"],(function(t){delete e.headers[t]})),(e.adapter||s.adapter)(e).then((function(t){return a(e),t.data=o(t.data,t.headers,e.transformResponse),t}),(function(t){return i(t)||(a(e),t&&t.response&&(t.response.data=o(t.response.data,t.response.headers,e.transformResponse))),Promise.reject(t)}))}},endd:function(e,t,n){"use strict";function r(e){this.message=e}r.prototype.toString=function(){return"Cancel"+(this.message?": "+this.message:"")},r.prototype.__CANCEL__=!0,e.exports=r},eqyj:function(e,t,n){"use strict";var r=n("xTJ+");e.exports=r.isStandardBrowserEnv()?{write:function(e,t,n,o,i,s){var a=[];a.push(e+"="+encodeURIComponent(t)),r.isNumber(n)&&a.push("expires="+new Date(n).toGMTString()),r.isString(o)&&a.push("path="+o),r.isString(i)&&a.push("domain="+i),!0===s&&a.push("secure"),document.cookie=a.join("; ")},read:function(e){var t=document.cookie.match(new RegExp("(^|;\\s*)("+e+")=([^;]*)"));return t?decodeURIComponent(t[3]):null},remove:function(e){this.write(e,"",Date.now()-864e5)}}:{write:function(){},read:function(){return null},remove:function(){}}},g7np:function(e,t,n){"use strict";var r=n("2SVd"),o=n("5oMp");e.exports=function(e,t){return e&&!r(t)?o(e,t):t}},"jfS+":function(e,t,n){"use strict";var r=n("endd");function o(e){if("function"!=typeof e)throw new TypeError("executor must be a function.");var t;this.promise=new Promise((function(e){t=e}));var n=this;e((function(e){n.reason||(n.reason=new r(e),t(n.reason))}))}o.prototype.throwIfRequested=function(){if(this.reason)throw this.reason},o.source=function(){var e;return{token:new o((function(t){e=t})),cancel:e}},e.exports=o},"tM+k":function(e,t,n){"use strict";n.r(t);var r=n("vDqi"),o=n.n(r);function i(e,t){for(var n=0;n1&&void 0!==arguments[1]?arguments[1]:null;e.classList.remove("alert-success"),e.innerText=t||"Oops, looks like something isn't correct!",e.classList.add("alert-failure")}},{key:"handle",value:function(){var e=this;this.checkDbButton.addEventListener("click",(function(){return e.handleDatabaseCheck()})),this.checkSmtpButton.addEventListener("click",(function(){return e.handleSmtpCheck()})),this.checkPdfButton.addEventListener("click",(function(){return e.handleTestPdfCheck()}))}}])&&i(t.prototype,n),r&&i(t,r),e}())).handle()},tQ2B:function(e,t,n){"use strict";var r=n("xTJ+"),o=n("Rn+g"),i=n("MLWZ"),s=n("g7np"),a=n("w0Vi"),u=n("OTTw"),c=n("LYNF");e.exports=function(e){return new Promise((function(t,f){var l=e.data,d=e.headers;r.isFormData(l)&&delete d["Content-Type"];var p=new XMLHttpRequest;if(e.auth){var h=e.auth.username||"",m=e.auth.password||"";d.Authorization="Basic "+btoa(h+":"+m)}var v=s(e.baseURL,e.url);if(p.open(e.method.toUpperCase(),i(v,e.params,e.paramsSerializer),!0),p.timeout=e.timeout,p.onreadystatechange=function(){if(p&&4===p.readyState&&(0!==p.status||p.responseURL&&0===p.responseURL.indexOf("file:"))){var n="getAllResponseHeaders"in p?a(p.getAllResponseHeaders()):null,r={data:e.responseType&&"text"!==e.responseType?p.response:p.responseText,status:p.status,statusText:p.statusText,headers:n,config:e,request:p};o(t,f,r),p=null}},p.onabort=function(){p&&(f(c("Request aborted",e,"ECONNABORTED",p)),p=null)},p.onerror=function(){f(c("Network Error",e,null,p)),p=null},p.ontimeout=function(){var t="timeout of "+e.timeout+"ms exceeded";e.timeoutErrorMessage&&(t=e.timeoutErrorMessage),f(c(t,e,"ECONNABORTED",p)),p=null},r.isStandardBrowserEnv()){var y=n("eqyj"),g=(e.withCredentials||u(v))&&e.xsrfCookieName?y.read(e.xsrfCookieName):void 0;g&&(d[e.xsrfHeaderName]=g)}if("setRequestHeader"in p&&r.forEach(d,(function(e,t){void 0===l&&"content-type"===t.toLowerCase()?delete d[t]:p.setRequestHeader(t,e)})),r.isUndefined(e.withCredentials)||(p.withCredentials=!!e.withCredentials),e.responseType)try{p.responseType=e.responseType}catch(t){if("json"!==e.responseType)throw t}"function"==typeof e.onDownloadProgress&&p.addEventListener("progress",e.onDownloadProgress),"function"==typeof e.onUploadProgress&&p.upload&&p.upload.addEventListener("progress",e.onUploadProgress),e.cancelToken&&e.cancelToken.promise.then((function(e){p&&(p.abort(),f(e),p=null)})),void 0===l&&(l=null),p.send(l)}))}},vDqi:function(e,t,n){e.exports=n("zuR4")},w0Vi:function(e,t,n){"use strict";var r=n("xTJ+"),o=["age","authorization","content-length","content-type","etag","expires","from","host","if-modified-since","if-unmodified-since","last-modified","location","max-forwards","proxy-authorization","referer","retry-after","user-agent"];e.exports=function(e){var t,n,i,s={};return e?(r.forEach(e.split("\n"),(function(e){if(i=e.indexOf(":"),t=r.trim(e.substr(0,i)).toLowerCase(),n=r.trim(e.substr(i+1)),t){if(s[t]&&o.indexOf(t)>=0)return;s[t]="set-cookie"===t?(s[t]?s[t]:[]).concat([n]):s[t]?s[t]+", "+n:n}})),s):s}},xAGQ:function(e,t,n){"use strict";var r=n("xTJ+");e.exports=function(e,t,n){return r.forEach(n,(function(n){e=n(e,t)})),e}},"xTJ+":function(e,t,n){"use strict";var r=n("HSsa"),o=Object.prototype.toString;function i(e){return"[object Array]"===o.call(e)}function s(e){return void 0===e}function a(e){return null!==e&&"object"==typeof e}function u(e){return"[object Function]"===o.call(e)}function c(e,t){if(null!=e)if("object"!=typeof e&&(e=[e]),i(e))for(var n=0,r=e.length;n>>16)/255
s[1]=((65280&a.gw(a))>>>8)/255
s[2]=((255&a.gw(a))>>>0)/255
s[3]=((4278190080&a.gw(a))>>>24)/255
return s},
-dA_:function(a,b,c,d,e,f){var s,r,q,p,o=e?1:0,n=b.a,m=J.d9y(n),l=J.aK(m),k=l.gaK9(m),j=l.gaKb(m),i=l.gaKa(m)
-l.gaK8(m)
-s=P.b8(C.l.aY(((4278190080&c.gw(c))>>>24)*0.039),(16711680&c.gw(c))>>>16,(65280&c.gw(c))>>>8,(255&c.gw(c))>>>0)
-r=P.b8(C.l.aY(((4278190080&c.gw(c))>>>24)*0.25),(16711680&c.gw(c))>>>16,(65280&c.gw(c))>>>8,(255&c.gw(c))>>>0)
-q={ambient:H.d0a(s),spot:H.d0a(r)}
-p=J.d8T($.cZ_?$.cYZ:H.b(H.R(u.b7)),q)
+dzn:function(a,b,c,d,e,f){var s,r,q,p,o=e?1:0,n=b.a,m=J.d8V(n),l=J.aK(m),k=l.gaKf(m),j=l.gaKh(m),i=l.gaKg(m)
+l.gaKe(m)
+s=P.b8(C.l.aZ(((4278190080&c.gw(c))>>>24)*0.039),(16711680&c.gw(c))>>>16,(65280&c.gw(c))>>>8,(255&c.gw(c))>>>0)
+r=P.b8(C.l.aZ(((4278190080&c.gw(c))>>>24)*0.25),(16711680&c.gw(c))>>>16,(65280&c.gw(c))>>>8,(255&c.gw(c))>>>0)
+q={ambient:H.d_B(s),spot:H.d_B(r)}
+p=J.d8f($.cYq?$.cYp:H.b(H.R(u.b7)),q)
m=new Float32Array(3)
m[2]=f*d
l=new Float32Array(3)
@@ -322,18 +322,18 @@ l[0]=(k+i)/2
l[1]=j-600
l[2]=f*600
j=J.aK(p)
-J.d94(a,n,m,l,f*800,j.gaG3(p),j.gahz(p),o)},
-cUV:function(){var s=H.iz()
-return s===C.jm||window.navigator.clipboard==null?new H.b06():new H.aSn()},
-dc5:function(){var s,r,q,p=document,o=p.body
+J.d8r(a,n,m,l,f*800,j.gaG9(p),j.gahD(p),o)},
+cUl:function(){var s=H.iz()
+return s===C.jo||window.navigator.clipboard==null?new H.b_R():new H.aS9()},
+dbs:function(){var s,r,q,p=document,o=p.body
o.toString
-o=new H.ajP(o)
-o.l0(0)
-s=$.VO
+o=new H.ajS(o)
+o.l_(0)
+s=$.VR
if(s!=null)J.fJ(s.b)
-$.VO=null
+$.VR=null
s=W.p2("flt-ruler-host",null)
-r=new H.at1(10,s,P.ab(t.UY,t.R3))
+r=new H.at4(10,s,P.ab(t.UY,t.R3))
q=s.style
q.position="fixed"
q.visibility="hidden"
@@ -344,60 +344,60 @@ q.width="0"
q.height="0"
p.body.appendChild(s)
$.tk.push(r.gke(r))
-$.VO=r
+$.VR=r
return o},
-ajQ:function(a,b,c,d,e,f,g,h,i){var s=$.cTi
-if(s==null?$.cTi=a.ellipse!=null:s)a.ellipse(b,c,d,e,f,g,h,i)
+ajT:function(a,b,c,d,e,f,g,h,i){var s=$.cSI
+if(s==null?$.cSI=a.ellipse!=null:s)a.ellipse(b,c,d,e,f,g,h,i)
else{a.save()
a.translate(b,c)
a.rotate(f)
a.scale(d,e)
a.arc(0,0,1,g,h,i)
a.restore()}},
-dc6:function(a){switch(a){case"DeviceOrientation.portraitUp":return"portrait-primary"
+dbt:function(a){switch(a){case"DeviceOrientation.portraitUp":return"portrait-primary"
case"DeviceOrientation.landscapeLeft":return"portrait-secondary"
case"DeviceOrientation.portraitDown":return"landscape-primary"
case"DeviceOrientation.landscapeRight":return"landscape-secondary"
default:return null}},
-cKP:function(a,b){var s
+cKd:function(a,b){var s
if(b.B(0,C.y))return a
s=new H.dP(new Float32Array(16))
-s.er(a)
-s.VG(0,b.a,b.b,0)
+s.eo(a)
+s.VF(0,b.a,b.b,0)
return s},
-cZk:function(a,b,c){var s,r,q=t.lU.a(a.a.cloneNode(!0)),p=q.style
+cYL:function(a,b,c){var s,r,q=t.lU.a(a.a.cloneNode(!0)),p=q.style
p.position="absolute"
p.whiteSpace="pre-wrap"
-C.x.d7(p,C.x.ce(p,"overflow-wrap"),"break-word","")
+C.x.d5(p,C.x.ce(p,"overflow-wrap"),"break-word","")
p.overflow="hidden"
-s=H.f(a.gey(a))+"px"
+s=H.f(a.gew(a))+"px"
p.height=s
-s=H.f(a.geI(a))+"px"
+s=H.f(a.geF(a))+"px"
p.width=s
-if(c!=null)H.cQ1(q,H.cKP(c,b).a)
+if(c!=null)H.cPq(q,H.cKd(c,b).a)
r=a.b
if(r.ch!=null){s=r.x
s=s==null||s===1}else s=!1
if(s){p.whiteSpace="pre"
-C.x.d7(p,C.x.ce(p,"text-overflow"),"ellipsis","")}return q},
-d_u:function(a,b){var s=b.lB(0),r=s.c,q=s.d,p=H.cZN(b,0,0,1/r,1/q),o=$.fr()
-o.hV(a,"clip-path","url(#svgClip"+$.adX+")")
-o.hV(a,"-webkit-clip-path","url(#svgClip"+$.adX+")")
+C.x.d5(p,C.x.ce(p,"text-overflow"),"ellipsis","")}return q},
+cZU:function(a,b){var s=b.lA(0),r=s.c,q=s.d,p=H.cZd(b,0,0,1/r,1/q),o=$.fr()
+o.hV(a,"clip-path","url(#svgClip"+$.ae_+")")
+o.hV(a,"-webkit-clip-path","url(#svgClip"+$.ae_+")")
o=a.style
r=H.f(r)+"px"
o.width=r
r=H.f(q)+"px"
o.height=r
return p},
-cZ3:function(a,b,c){var s=$.p6+1
+cYu:function(a,b,c){var s=$.p6+1
$.p6=s
s=u.m+s+u.J+H.f(H.jo(a))+'" flood-opacity="1" result="flood">'
return s+(c?'':'')+""},
-cMD:function(a,b,c){var s,r,q,p,o,n,m
+cM0:function(a,b,c){var s,r,q,p,o,n,m
if(0===b){c.push(new P.a_(a.c,a.d))
c.push(new P.a_(a.e,a.f))
-return}s=new H.aAy()
-a.ZB(s)
+return}s=new H.aAB()
+a.ZA(s)
r=s.a
r.toString
q=s.b
@@ -409,20 +409,20 @@ if(!H.jd(p,n,o))m=r.f=q.b=Math.abs(n-p)0){s=b[7]
b[9]=s
@@ -430,7 +430,7 @@ b[5]=s
if(o===2){s=b[13]
b[15]=s
b[11]=s}}return o},
-dlz:function(b0,b1,b2){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d,c,b,a,a0,a1,a2,a3,a4,a5,a6,a7,a8,a9=b0.length
+dkX:function(b0,b1,b2){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d,c,b,a,a0,a1,a2,a3,a4,a5,a6,a7,a8,a9=b0.length
if(0===a9)for(s=0;s<8;++s)b2[s]=b1[s]
else{r=b0[0]
for(q=a9-1,p=0,s=0;s0))return 0
@@ -507,26 +507,26 @@ if(j===0)return n
if(j<0)s=n
else r=n}while(Math.abs(r-s)>0.0000152587890625)
return(s+r)/2},
-cZn:function(a,b,c,d,e){return(((d+3*(b-c)-a)*e+3*(c-b-b+a))*e+3*(b-a))*e+a},
-dkE:function(a,b,c){var s
+cYO:function(a,b,c,d,e){return(((d+3*(b-c)-a)*e+3*(c-b-b+a))*e+3*(b-a))*e+a},
+dk1:function(a,b,c){var s
if(0===c)s=0===b||360===b
else s=!1
-if(s)return new P.a_(a.c,a.gef().b)
+if(s)return new P.a_(a.c,a.ged().b)
return null},
-ccm:function(a,b,c,d){var s=a+b
+cbV:function(a,b,c,d){var s=a+b
if(s<=c)return d
return Math.min(c/s,d)},
-cYA:function(a,b,c,d,e,f){return new H.c28(e-2*c+a,f-2*d+b,2*(c-a),2*(d-b),a,b)},
-cUY:function(){var s=new Float32Array(16)
-s=new H.SW(s,new Uint8Array(8))
+cY0:function(a,b,c,d,e,f){return new H.c1R(e-2*c+a,f-2*d+b,2*(c-a),2*(d-b),a,b)},
+cUo:function(){var s=new Float32Array(16)
+s=new H.T_(s,new Uint8Array(8))
s.e=s.c=8
s.fr=172
return s},
-deI:function(a,b,c){var s,r,q,p=a.d,o=a.c,n=new Float32Array(o*2),m=a.f
+de5:function(a,b,c){var s,r,q,p=a.d,o=a.c,n=new Float32Array(o*2),m=a.f
for(s=p*2,r=0;r0?1:0
return s},
-aKd:function(a,b){var s
+aKg:function(a,b){var s
if(a<0){a=-a
b=-b}if(b===0||a===0||a>=b)return null
s=a/b
if(isNaN(s))return null
if(s===0)return null
return s},
-dqk:function(a){var s,r,q=a.e,p=a.r
+dpI:function(a){var s,r,q=a.e,p=a.r
if(q+p!==a.c-a.a)return!1
s=a.f
r=a.x
if(s+r!==a.d-a.b)return!1
if(q!==a.Q||p!==a.y||s!==a.ch||r!==a.z)return!1
return!0},
-bgO:function(a,b,c,d,e,f){if(d==f)return H.jd(c,a,e)&&a!=e
+bgF:function(a,b,c,d,e,f){if(d==f)return H.jd(c,a,e)&&a!=e
else return a==c&&b==d},
-deJ: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.aKd(i,i-l+j)
+de6: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.aKg(i,i-l+j)
if(h!=null){s=o+h*(m-o)
r=n+h*(l-n)
q=m+h*(k-m)
@@ -582,15 +582,15 @@ a[8]=k
a[9]=j
return 1}a[3]=Math.abs(i)=q},
-cUX:function(a,b){var s=new H.bgL(a,!0,a.x)
-if(a.ch)a.MQ()
+cUn:function(a,b){var s=new H.bgC(a,!0,a.x)
+if(a.ch)a.MP()
if(!a.cx)s.Q=a.x
return s},
-dGP:function(a,b,c,d){var s,r,q,p,o=a[1],n=a[3]
+dGa:function(a,b,c,d){var s,r,q,p,o=a[1],n=a[3]
if(!H.jd(o,c,n))return
s=a[0]
r=a[2]
@@ -599,43 +599,43 @@ q=r-s
p=n-o
if(!(Math.abs((b-s)*p-q*(c-o))<0.000244140625))return
d.push(new P.a_(q,p))},
-dGQ:function(a,b,c,d){var s,r,q,p,o,n,m,l,k,j,i=a[1],h=a[3],g=a[5]
+dGb:function(a,b,c,d){var s,r,q,p,o,n,m,l,k,j,i=a[1],h=a[3],g=a[5]
if(!H.jd(i,c,h)&&!H.jd(h,c,g))return
s=a[0]
r=a[2]
q=a[4]
if(!H.jd(s,b,r)&&!H.jd(r,b,q))return
-p=new H.yy()
+p=new H.yx()
o=p.tx(i-2*h+g,2*(h-i),i-c)
for(n=q-2*r+s,m=2*(r-s),l=0;l30)C.b.f1($.ae4,0).d.A(0)}else a.d.A(0)},
-biF:function(a,b){if(a<=0)return b*0.1
+q=o-n}return new P.a_(r,q)}else{p=H.cY0(h+3*(j-i)-k,o+3*(m-l)-n,2*(i-2*j+k),2*(l-2*m+n),j-k,m-n)
+return new P.a_(p.a8F(c),p.a8G(c))}},
+cl3:function(a){if(a instanceof H.Fi)if(a.z===H.tS()){$.ae7.push(a)
+if($.ae7.length>30)C.b.f2($.ae7,0).d.A(0)}else a.d.A(0)},
+biw:function(a,b){if(a<=0)return b*0.1
else return Math.min(Math.max(b*0.5,a*10),b)},
-OI:function(a,b){var s=a<0?0:a,r=b<0?0:b
+OM:function(a,b){var s=a<0?0:a,r=b<0?0:b
return s*s+r*r},
-ae0:function(a){var s=a.a.y,r=s!=null?0+s.b*2:0
-return a.gjr()!==0?r+a.gjr()*0.70710678118:r},
-dy4:function(a){var s,r,q=$.clj,p=q.length
-if(p!==0){if(p>1)C.b.bY(q,new H.cDH())
-for(q=$.clj,p=q.length,s=0;s1)C.b.bY(q,new H.cDb())
+for(q=$.ckS,p=q.length,s=0;s1e5){$.dpN=s
-r=$.cP4
-H.cP8(q.go,q.id,r,t.Px)
-$.cP4=H.a([],t.no)}},
-drr:function(){return C.l.eV(window.performance.now()*1000)},
-daf:function(){var s=new H.aL1()
-s.amJ()
+s=$.cZe=C.l.eV(window.performance.now()*1000)
+$.cOs.push(new P.qW(H.a([$.cOH,$.cOl,$.cOk,$.cOC,s],t.wb)))
+$.cZe=$.cOC=$.cOk=$.cOl=$.cOH=-1
+if(s-$.d4j()>1e5){$.dpa=s
+r=$.cOs
+H.cOw(q.go,q.id,r,t.Px)
+$.cOs=H.a([],t.no)}},
+dqP:function(){return C.l.eV(window.performance.now()*1000)},
+d9C:function(){var s=new H.aL4()
+s.amN()
return s},
-dlx:function(a){var s=a.a
+dkV:function(a){var s=a.a
s.toString
if((s&256)!==0)return C.Cy
else if((s&65536)!==0)return C.Cz
else return C.Cx},
-dd8:function(a){var s=new H.RM(W.b6s(),a)
-s.amV(a)
+dcv:function(a){var s=new H.RQ(W.b6i(),a)
+s.amZ(a)
return s},
-dck:function(){var s=t.bo,r=H.a([],t.eE),q=H.a([],t.qj),p=H.OK()
-p=J.dZ(C.RT.a,p)?new H.aXM():new H.bf2()
-p=new H.b_e(P.ab(s,t.dL),P.ab(s,t.UF),r,q,new H.b_h(),new H.bsk(p),C.eH,H.a([],t.sQ))
-p.amT()
+dbH:function(){var s=t.bo,r=H.a([],t.eE),q=H.a([],t.qj),p=H.OO()
+p=J.e_(C.RT.a,p)?new H.aXy():new H.beP()
+p=new H.b_0(P.ab(s,t.dL),P.ab(s,t.UF),r,q,new H.b_3(),new H.bsb(p),C.eI,H.a([],t.sQ))
+p.amX()
return p},
-tS:function(){var s=$.cTv
-return s==null?$.cTv=H.dck():s},
-d09:function(a){var s,r,q,p,o,n,m,l,k=a.length,j=t.wb,i=H.a([],j),h=H.a([0],j)
+tR:function(){var s=$.cSV
+return s==null?$.cSV=H.dbH():s},
+d_A:function(a){var s,r,q,p,o,n,m,l,k=a.length,j=t.wb,i=H.a([],j),h=H.a([0],j)
for(s=0,r=0;rs)s=o}m=P.d6(s,0,!1,t.S)
l=h[s]
for(r=s-1;r>=0;--r){m[r]=l
l=i[l]}return m},
-cOn:function(){var s=new Uint8Array(0),r=new DataView(new ArrayBuffer(8))
-return new H.bEK(new H.avv(s,s.length),r,H.hR(r.buffer,0,null))},
-d_l:function(a){if(a===0)return C.y
+cNL:function(){var s=new Uint8Array(0),r=new DataView(new ArrayBuffer(8))
+return new H.bEp(new H.avy(s,0),r,H.hP(r.buffer,0,null))},
+cZM:function(a){if(a===0)return C.y
return new P.a_(200*a/600,400*a/600)},
-dyw:function(a,b){var s,r,q,p,o,n
+dxU:function(a,b){var s,r,q,p,o,n
if(b===0)return a
s=a.c
r=a.a
@@ -747,84 +747,84 @@ q=a.d
p=a.b
o=b*((800+(s-r)*0.5)/600)
n=b*((800+(q-p)*0.5)/600)
-return new P.ax(r-o,p-n,s+o,q+n).fD(H.d_l(b))},
-d_k:function(a,b){if(b===0)return null
-return new H.bwB(Math.min(b*((800+(a.c-a.a)*0.5)/600),b*((800+(a.d-a.b)*0.5)/600)),H.d_l(b))},
-d0E:function(a){var s=a.a
-return new P.a4((((C.N.aY(0.3*((4278190080&s)>>>24))&255)<<24|s&16777215)&4294967295)>>>0)},
-dcK:function(){var s=t.mo
-if($.cRP())return new H.al4(H.a([],s))
-else return new H.aFg(H.a([],s))},
-dDj:function(a,b){var s,r,q,p,o,n,m,l,k,j,i,h,g,f=H.cGh(a,b),e=$.aKN().Ce(f),d=e===C.rg?C.rb:null,c=e===C.yM
-if(e===C.yI||c)e=C.eb
+return new P.ay(r-o,p-n,s+o,q+n).fD(H.cZM(b))},
+cZL:function(a,b){if(b===0)return null
+return new H.bws(Math.min(b*((800+(a.c-a.a)*0.5)/600),b*((800+(a.d-a.b)*0.5)/600)),H.cZM(b))},
+d04:function(a){var s=a.a
+return new P.a3((((C.M.aZ(0.3*((4278190080&s)>>>24))&255)<<24|s&16777215)&4294967295)>>>0)},
+dc6:function(){var s=t.mo
+if($.cRe())return new H.al7(H.a([],s))
+else return new H.aFj(H.a([],s))},
+dCG:function(a,b){var s,r,q,p,o,n,m,l,k,j,i,h,g,f=H.cFM(a,b),e=$.aKQ().Cd(f),d=e===C.rf?C.ra:null,c=e===C.yM
+if(e===C.yI||c)e=C.ed
for(s=a.length,r=b,q=r,p=null,o=0;b65535?b+1:b)+1
-m=e===C.rg
+m=e===C.rf
l=!m
if(l)d=null
-f=H.cGh(a,b)
-k=$.aKN().Ce(f)
+f=H.cFM(a,b)
+k=$.aKQ().Cd(f)
j=k===C.yM
-if(e===C.nX||e===C.rc)return new H.mQ(b,r,q,C.nU)
-if(e===C.rf)if(k===C.nX)continue
-else return new H.mQ(b,r,q,C.nU)
+if(e===C.nX||e===C.rb)return new H.mP(b,r,q,C.nU)
+if(e===C.re)if(k===C.nX)continue
+else return new H.mP(b,r,q,C.nU)
if(l)q=b
-if(k===C.nX||k===C.rc||k===C.rf){r=b
-continue}if(b>=s)return new H.mQ(s,b,q,C.nV)
-if(k===C.rg){d=m?d:e
+if(k===C.nX||k===C.rb||k===C.re){r=b
+continue}if(b>=s)return new H.mP(s,b,q,C.nV)
+if(k===C.rf){d=m?d:e
r=b
-continue}if(k===C.r9){r=b
-continue}if(e===C.r9||d===C.r9)return new H.mQ(b,b,q,C.hQ)
+continue}if(k===C.r8){r=b
+continue}if(e===C.r8||d===C.r8)return new H.mP(b,b,q,C.hS)
if(k===C.yI||j){if(!m){if(n)--o
r=b
k=e
-continue}k=C.eb}if(c){r=b
-continue}if(k===C.rb||e===C.rb){r=b
+continue}k=C.ed}if(c){r=b
+continue}if(k===C.ra||e===C.ra){r=b
continue}if(e===C.yK){r=b
-continue}if(!(!l||e===C.r5||e===C.nW)&&k===C.yK){r=b
-continue}if(k===C.r7||k===C.ku||k===C.ID||k===C.r6||k===C.yJ){r=b
-continue}if(e===C.kt||d===C.kt){r=b
-continue}n=e!==C.rh
-if((!n||d===C.rh)&&k===C.kt){r=b
-continue}l=e!==C.r7
-if((!l||d===C.r7||e===C.ku||d===C.ku)&&k===C.yL){r=b
-continue}if((e===C.ra||d===C.ra)&&k===C.ra){r=b
-continue}if(m)return new H.mQ(b,b,q,C.hQ)
-if(!n||k===C.rh){r=b
-continue}if(e===C.yO||k===C.yO)return new H.mQ(b,b,q,C.hQ)
-if(k===C.r5||k===C.nW||k===C.yL||e===C.IB){r=b
-continue}if(p===C.dn)n=e===C.nW||e===C.r5
+continue}if(!(!l||e===C.r4||e===C.nW)&&k===C.yK){r=b
+continue}if(k===C.r6||k===C.kt||k===C.ID||k===C.r5||k===C.yJ){r=b
+continue}if(e===C.ks||d===C.ks){r=b
+continue}n=e!==C.rg
+if((!n||d===C.rg)&&k===C.ks){r=b
+continue}l=e!==C.r6
+if((!l||d===C.r6||e===C.kt||d===C.kt)&&k===C.yL){r=b
+continue}if((e===C.r9||d===C.r9)&&k===C.r9){r=b
+continue}if(m)return new H.mP(b,b,q,C.hS)
+if(!n||k===C.rg){r=b
+continue}if(e===C.yO||k===C.yO)return new H.mP(b,b,q,C.hS)
+if(k===C.r4||k===C.nW||k===C.yL||e===C.IB){r=b
+continue}if(p===C.dn)n=e===C.nW||e===C.r4
else n=!1
if(n){r=b
continue}n=e===C.yJ
if(n&&k===C.dn){r=b
continue}if(k===C.IC){r=b
-continue}m=e!==C.eb
-if(!((!m||e===C.dn)&&k===C.fE))if(e===C.fE)i=k===C.eb||k===C.dn
+continue}m=e!==C.ed
+if(!((!m||e===C.dn)&&k===C.fC))if(e===C.fC)i=k===C.ed||k===C.dn
else i=!1
else i=!0
if(i){r=b
-continue}i=e===C.ri
-if(i)h=k===C.yN||k===C.rd||k===C.re
+continue}i=e===C.rh
+if(i)h=k===C.yN||k===C.rc||k===C.rd
else h=!1
if(h){r=b
-continue}if((e===C.yN||e===C.rd||e===C.re)&&k===C.hR){r=b
+continue}if((e===C.yN||e===C.rc||e===C.rd)&&k===C.hT){r=b
continue}h=!i
-if(!h||e===C.hR)g=k===C.eb||k===C.dn
+if(!h||e===C.hT)g=k===C.ed||k===C.dn
else g=!1
if(g){r=b
-continue}if(!m||e===C.dn)g=k===C.ri||k===C.hR
+continue}if(!m||e===C.dn)g=k===C.rh||k===C.hT
else g=!1
if(g){r=b
-continue}if(!l||e===C.ku||e===C.fE)l=k===C.hR||k===C.ri
+continue}if(!l||e===C.kt||e===C.fC)l=k===C.hT||k===C.rh
else l=!1
if(l){r=b
-continue}l=e!==C.hR
-if((!l||i)&&k===C.kt){r=b
-continue}if((!l||!h||e===C.nW||e===C.r6||e===C.fE||n)&&k===C.fE){r=b
-continue}n=e===C.r8
-if(n)l=k===C.r8||k===C.nY||k===C.o_||k===C.o0
+continue}l=e!==C.hT
+if((!l||i)&&k===C.ks){r=b
+continue}if((!l||!h||e===C.nW||e===C.r5||e===C.fC||n)&&k===C.fC){r=b
+continue}n=e===C.r7
+if(n)l=k===C.r7||k===C.nY||k===C.o_||k===C.o0
else l=!1
if(l){r=b
continue}l=e!==C.nY
@@ -833,72 +833,72 @@ else h=!1
if(h){r=b
continue}h=e!==C.nZ
if((!h||e===C.o0)&&k===C.nZ){r=b
-continue}if((n||!l||!h||e===C.o_||e===C.o0)&&k===C.hR){r=b
-continue}if(i)n=k===C.r8||k===C.nY||k===C.nZ||k===C.o_||k===C.o0
+continue}if((n||!l||!h||e===C.o_||e===C.o0)&&k===C.hT){r=b
+continue}if(i)n=k===C.r7||k===C.nY||k===C.nZ||k===C.o_||k===C.o0
else n=!1
if(n){r=b
-continue}if(!m||e===C.dn)n=k===C.eb||k===C.dn
+continue}if(!m||e===C.dn)n=k===C.ed||k===C.dn
else n=!1
if(n){r=b
-continue}if(e===C.r6)n=k===C.eb||k===C.dn
+continue}if(e===C.r5)n=k===C.ed||k===C.dn
else n=!1
if(n){r=b
-continue}if(!m||e===C.dn||e===C.fE)if(k===C.kt){n=C.d.d3(a,b)
+continue}if(!m||e===C.dn||e===C.fC)if(k===C.ks){n=C.d.d1(a,b)
if(n!==9001)if(!(n>=12296&&n<=12317))n=n>=65047&&n<=65378
else n=!0
else n=!0
n=!n}else n=!1
else n=!1
if(n){r=b
-continue}if(e===C.ku){n=C.d.d3(a,b-1)
+continue}if(e===C.kt){n=C.d.d1(a,b-1)
if(n!==9001)if(!(n>=12296&&n<=12317))n=n>=65047&&n<=65378
else n=!0
else n=!0
-if(!n)n=k===C.eb||k===C.dn||k===C.fE
+if(!n)n=k===C.ed||k===C.dn||k===C.fC
else n=!1}else n=!1
if(n){r=b
continue}if(k===C.yP)if((o&1)===1){r=b
-continue}else return new H.mQ(b,b,q,C.hQ)
-if(e===C.rd&&k===C.re){r=b
-continue}return new H.mQ(b,b,q,C.hQ)}return new H.mQ(s,r,q,C.nV)},
-drp:function(a){var s=$.aKN().Ce(a)
-return s===C.rc||s===C.nX||s===C.rf},
-VN:function(a){var s,r=$.cq().gtR()
-if(!r.gag(r))if($.cOj.a){s=a.b
+continue}else return new H.mP(b,b,q,C.hS)
+if(e===C.rc&&k===C.rd){r=b
+continue}return new H.mP(b,b,q,C.hS)}return new H.mP(s,r,q,C.nV)},
+dqN:function(a){var s=$.aKQ().Cd(a)
+return s===C.rb||s===C.nX||s===C.re},
+VQ:function(a){var s,r=$.cq().gtR()
+if(!r.gag(r))if($.cNH.a){s=a.b
r=a.c!=null&&s.Q==null&&s.z==null}else r=!1
else r=!1
-if(r){r=$.cSO
-return r==null?$.cSO=new H.aPw(W.cSN(null,null).getContext("2d")):r}r=$.cTk
-return r==null?$.cTk=new H.aZd():r},
-cTj:function(a,b){if(a<=b)return b
+if(r){r=$.cSd
+return r==null?$.cSd=new H.aPz(W.cSc(null,null).getContext("2d")):r}r=$.cSK
+return r==null?$.cSK=new H.aZ_():r},
+cSJ:function(a,b){if(a<=b)return b
if(a-b<2)return a
-throw H.d(P.Rj("minIntrinsicWidth ("+H.f(a)+") is greater than maxIntrinsicWidth ("+H.f(b)+")."))},
-OJ:function(a,b,c,d,e){var s,r,q
+throw H.d(P.Rn("minIntrinsicWidth ("+H.f(a)+") is greater than maxIntrinsicWidth ("+H.f(b)+")."))},
+ON:function(a,b,c,d,e){var s,r,q
if(d===e)return 0
-if(d===$.cZD&&e===$.cZC&&c==$.cZF&&J.j($.cZE,b))return $.cZG
-$.cZD=d
-$.cZC=e
-$.cZF=c
-$.cZE=b
+if(d===$.cZ3&&e===$.cZ2&&c==$.cZ5&&J.j($.cZ4,b))return $.cZ6
+$.cZ3=d
+$.cZ2=e
+$.cZ5=c
+$.cZ4=b
s=b.y
if(s==null)s=0
r=d===0&&e===c.length?c:J.kR(c,d,e)
q=a.measureText(r).width
q.toString
-return $.cZG=C.l.aY((q+s*r.length)*100)/100},
-do0:function(a,b,c,d){while(!0){if(!(b=a.length)return null
-s=J.dB(a).d3(a,b)
-if((s&63488)===55296&&b>>6&31)+1<<16|(s&63)<<10|C.d.d3(a,b+1)&1023
+s=J.dB(a).d1(a,b)
+if((s&63488)===55296&&b>>6&31)+1<<16|(s&63)<<10|C.d.d1(a,b+1)&1023
return s},
-cWb:function(a,b,c,d,e){return new H.avy(H.dvm(a,b,c,e),d,P.ab(t.S,e),e.h("avy<0>"))},
-dvm:function(a,b,c,d){var s,r,q,p,o,n=H.a([],d.h("Y>")),m=a.length
-for(s=d.h("a5o<0>"),r=0;r"))},
+duK:function(a,b,c,d){var s,r,q,p,o,n=H.a([],d.h("Z>")),m=a.length
+for(s=d.h("a5r<0>"),r=0;r=0&&q<=r))break
q+=s
-if(H.dhP(b,q))break}return H.Yf(q,0,r)},
-dhP:function(a,b){var s,r,q,p,o,n,m,l,k,j=null
+if(H.dhc(b,q))break}return H.Yh(q,0,r)},
+dhc:function(a,b){var s,r,q,p,o,n,m,l,k,j=null
if(b<=0||b>=a.length)return!0
s=b-1
-if((C.d.d3(a,s)&63488)===55296)return!1
-r=$.aex().Ii(0,a,b)
-q=$.aex().Ii(0,a,s)
-if(q===C.vh&&r===C.vi)return!1
-if(H.jP(q,C.Cw,C.vh,C.vi,j,j))return!0
-if(H.jP(r,C.Cw,C.vh,C.vi,j,j))return!0
+if((C.d.d1(a,s)&63488)===55296)return!1
+r=$.aeA().Ii(0,a,b)
+q=$.aeA().Ii(0,a,s)
+if(q===C.vg&&r===C.vh)return!1
+if(H.jP(q,C.Cw,C.vg,C.vh,j,j))return!0
+if(H.jP(r,C.Cw,C.vg,C.vh,j,j))return!0
if(q===C.Cv&&r===C.Cv)return!1
if(H.jP(r,C.pp,C.pq,C.po,j,j))return!1
for(p=0;H.jP(q,C.pp,C.pq,C.po,j,j);){++p
s=b-p-1
if(s<0)return!0
-o=$.aex()
+o=$.aeA()
o.toString
-n=H.cGh(a,s)
-q=n==null?o.b:o.Ce(n)}if(H.jP(q,C.e_,C.cu,j,j,j)&&H.jP(r,C.e_,C.cu,j,j,j))return!1
+n=H.cFM(a,s)
+q=n==null?o.b:o.Cd(n)}if(H.jP(q,C.e0,C.cv,j,j,j)&&H.jP(r,C.e0,C.cv,j,j,j))return!1
m=0
do{++m
-l=$.aex().Ii(0,a,b+m)}while(H.jP(l,C.pp,C.pq,C.po,j,j))
+l=$.aeA().Ii(0,a,b+m)}while(H.jP(l,C.pp,C.pq,C.po,j,j))
do{++p
-k=$.aex().Ii(0,a,b-p-1)}while(H.jP(k,C.pp,C.pq,C.po,j,j))
-if(H.jP(q,C.e_,C.cu,j,j,j)&&H.jP(r,C.Ct,C.pn,C.nb,j,j)&&H.jP(l,C.e_,C.cu,j,j,j))return!1
-if(H.jP(k,C.e_,C.cu,j,j,j)&&H.jP(q,C.Ct,C.pn,C.nb,j,j)&&H.jP(r,C.e_,C.cu,j,j,j))return!1
-s=q===C.cu
-if(s&&r===C.nb)return!1
-if(s&&r===C.Cs&&l===C.cu)return!1
-if(k===C.cu&&q===C.Cs&&r===C.cu)return!1
-s=q===C.fj
-if(s&&r===C.fj)return!1
-if(H.jP(q,C.e_,C.cu,j,j,j)&&r===C.fj)return!1
-if(s&&H.jP(r,C.e_,C.cu,j,j,j))return!1
-if(k===C.fj&&H.jP(q,C.Cu,C.pn,C.nb,j,j)&&r===C.fj)return!1
-if(s&&H.jP(r,C.Cu,C.pn,C.nb,j,j)&&l===C.fj)return!1
+k=$.aeA().Ii(0,a,b-p-1)}while(H.jP(k,C.pp,C.pq,C.po,j,j))
+if(H.jP(q,C.e0,C.cv,j,j,j)&&H.jP(r,C.Ct,C.pn,C.na,j,j)&&H.jP(l,C.e0,C.cv,j,j,j))return!1
+if(H.jP(k,C.e0,C.cv,j,j,j)&&H.jP(q,C.Ct,C.pn,C.na,j,j)&&H.jP(r,C.e0,C.cv,j,j,j))return!1
+s=q===C.cv
+if(s&&r===C.na)return!1
+if(s&&r===C.Cs&&l===C.cv)return!1
+if(k===C.cv&&q===C.Cs&&r===C.cv)return!1
+s=q===C.fk
+if(s&&r===C.fk)return!1
+if(H.jP(q,C.e0,C.cv,j,j,j)&&r===C.fk)return!1
+if(s&&H.jP(r,C.e0,C.cv,j,j,j))return!1
+if(k===C.fk&&H.jP(q,C.Cu,C.pn,C.na,j,j)&&r===C.fk)return!1
+if(s&&H.jP(r,C.Cu,C.pn,C.na,j,j)&&l===C.fk)return!1
if(q===C.pr&&r===C.pr)return!1
-if(H.jP(q,C.e_,C.cu,C.fj,C.pr,C.vg)&&r===C.vg)return!1
-if(q===C.vg&&H.jP(r,C.e_,C.cu,C.fj,C.pr,j))return!1
+if(H.jP(q,C.e0,C.cv,C.fk,C.pr,C.vf)&&r===C.vf)return!1
+if(q===C.vf&&H.jP(r,C.e0,C.cv,C.fk,C.pr,j))return!1
return!0},
jP:function(a,b,c,d,e,f){if(a===b)return!0
if(a===c)return!0
@@ -1039,40 +1039,40 @@ if(d!=null&&a===d)return!0
if(e!=null&&a===e)return!0
if(f!=null&&a===f)return!0
return!1},
-cTt:function(a,b){switch(a){case"TextInputType.number":return b?C.Wy:C.X3
+cST:function(a,b){switch(a){case"TextInputType.number":return b?C.Wy:C.X3
case"TextInputType.phone":return C.X8
case"TextInputType.emailAddress":return C.WF
case"TextInputType.url":return C.Xf
case"TextInputType.multiline":return C.X2
case"TextInputType.text":default:return C.Xe}},
-dgS:function(a){var s
+dgf:function(a){var s
if(a==="TextCapitalization.words")s=C.BV
else if(a==="TextCapitalization.characters")s=C.BX
-else s=a==="TextCapitalization.sentences"?C.BW:C.v7
-return new H.a4Y(s)},
-dnR:function(a){},
-aK5:function(a,b){var s,r="transparent",q="none",p=a.style
+else s=a==="TextCapitalization.sentences"?C.BW:C.v6
+return new H.a50(s)},
+dne:function(a){},
+aK8:function(a,b){var s,r="transparent",q="none",p=a.style
p.whiteSpace="pre-wrap"
-C.x.d7(p,C.x.ce(p,"align-content"),"center","")
+C.x.d5(p,C.x.ce(p,"align-content"),"center","")
p.padding="0"
-C.x.d7(p,C.x.ce(p,"opacity"),"1","")
+C.x.d5(p,C.x.ce(p,"opacity"),"1","")
p.color=r
p.backgroundColor=r
p.background=r
p.outline=q
p.border=q
-C.x.d7(p,C.x.ce(p,"resize"),q,"")
+C.x.d5(p,C.x.ce(p,"resize"),q,"")
p.width="0"
p.height="0"
-C.x.d7(p,C.x.ce(p,"text-shadow"),r,"")
-C.x.d7(p,C.x.ce(p,"transform-origin"),"0 0 0","")
+C.x.d5(p,C.x.ce(p,"text-shadow"),r,"")
+C.x.d5(p,C.x.ce(p,"transform-origin"),"0 0 0","")
if(b){p.top="-9999px"
p.left="-9999px"}s=H.iz()
-if(s!==C.fm){s=H.iz()
+if(s!==C.fn){s=H.iz()
s=s===C.bE}else s=!0
if(s)a.classList.add("transparentTextEditing")
-C.x.d7(p,C.x.ce(p,"caret-color"),r,null)},
-dcj:function(a,a0){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d,c,b
+C.x.d5(p,C.x.ce(p,"caret-color"),r,null)},
+dbG:function(a,a0){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d,c,b
if(a==null)return null
s=t.N
r=P.ab(s,t.py)
@@ -1081,54 +1081,54 @@ p=document.createElement("form")
p.noValidate=!0
p.method="post"
p.action="#"
-C.Go.tb(p,"submit",new H.b_9())
-H.aK5(p,!1)
-o=J.RQ(0,s)
-n=H.cMh(a,C.Sx)
-if(a0!=null)for(s=J.vw(a0,t.lB),s=s.gaH(s),m=n.b;s.t();){l=s.gC(s)
+C.Go.tb(p,"submit",new H.aZW())
+H.aK8(p,!1)
+o=J.RU(0,s)
+n=H.cLF(a,C.Sx)
+if(a0!=null)for(s=J.vx(a0,t.lB),s=s.gaJ(s),m=n.b;s.t();){l=s.gC(s)
k=J.am(l)
j=k.i(l,"autofill")
i=k.i(l,"textCapitalization")
if(i==="TextCapitalization.words")i=C.BV
else if(i==="TextCapitalization.characters")i=C.BX
-else i=i==="TextCapitalization.sentences"?C.BW:C.v7
-h=H.cMh(j,new H.a4Y(i))
+else i=i==="TextCapitalization.sentences"?C.BW:C.v6
+h=H.cLF(j,new H.a50(i))
i=h.b
o.push(i)
-if(i!=m){g=H.cTt(J.e(k.i(l,"inputType"),"name"),!1).Rt()
+if(i!=m){g=H.cST(J.e(k.i(l,"inputType"),"name"),!1).Rs()
h.a.kM(g)
h.kM(g)
-H.aK5(g,!1)
+H.aK8(g,!1)
q.E(0,i,h)
r.E(0,i,g)
p.appendChild(g)}}else o.push(n.b)
-C.b.lF(o)
+C.b.lE(o)
for(s=o.length,f=0,m="";f0)m+="*"
m+=H.f(e)}d=m.charCodeAt(0)==0?m:m
-c=$.aes().i(0,d)
+c=$.aev().i(0,d)
if(c!=null)C.Go.h7(c)
-b=W.b6s()
-H.aK5(b,!0)
+b=W.b6i()
+H.aK8(b,!0)
b.className="submitBtn"
b.type="submit"
p.appendChild(b)
-return new H.b_6(p,r,q,d)},
-cMh:function(a,b){var s,r,q,p=J.am(a),o=p.i(a,"uniqueIdentifier")
+return new H.aZT(p,r,q,d)},
+cLF:function(a,b){var s,r,q,p=J.am(a),o=p.i(a,"uniqueIdentifier")
o.toString
s=p.i(a,"hints")
-r=H.cTp(p.i(a,"editingValue"))
-p=$.d0P()
+r=H.cSP(p.i(a,"editingValue"))
+p=$.d0f()
q=J.e(s,0)
p=p.a.i(0,q)
-return new H.afy(r,o,b,p==null?q:p)},
-cTp:function(a){var s=J.am(a),r=s.i(a,"selectionBase"),q=s.i(a,"selectionExtent")
-return new H.Aa(s.i(a,"text"),Math.max(0,H.aq(r)),Math.max(0,H.aq(q)))},
-cTo:function(a,b){if(t.Zb.b(a))return new H.Aa(a.value,a.selectionStart,a.selectionEnd)
-else if(t.S0.b(a))return new H.Aa(a.value,a.selectionStart,a.selectionEnd)
+return new H.afB(r,o,b,p==null?q:p)},
+cSP:function(a){var s=J.am(a),r=s.i(a,"selectionBase"),q=s.i(a,"selectionExtent")
+return new H.A9(s.i(a,"text"),Math.max(0,H.aq(r)),Math.max(0,H.aq(q)))},
+cSO:function(a,b){if(t.Zb.b(a))return new H.A9(a.value,a.selectionStart,a.selectionEnd)
+else if(t.S0.b(a))return new H.A9(a.value,a.selectionStart,a.selectionEnd)
else throw H.d(P.z("Initialized with unsupported input type"))},
-cU0:function(a){var s,r,q,p,o,n="inputType",m="autofill",l=J.am(a),k=J.e(l.i(a,n),"name"),j=J.e(l.i(a,n),"decimal")
-k=H.cTt(k,j==null?!1:j)
+cTr:function(a){var s,r,q,p,o,n="inputType",m="autofill",l=J.am(a),k=J.e(l.i(a,n),"name"),j=J.e(l.i(a,n),"decimal")
+k=H.cST(k,j==null?!1:j)
j=l.i(a,"inputAction")
if(j==null)j="TextInputAction.done"
s=l.i(a,"obscureText")
@@ -1137,34 +1137,34 @@ r=l.i(a,"readOnly")
if(r==null)r=!1
q=l.i(a,"autocorrect")
if(q==null)q=!0
-p=H.dgS(l.i(a,"textCapitalization"))
-o=l.aP(a,m)?H.cMh(l.i(a,m),C.Sx):null
-return new H.b6q(k,j,r,s,q,o,H.dcj(l.i(a,m),l.i(a,"fields")),p)},
-dcT:function(a){return new H.alh(a,H.a([],t.Iu))},
-cQ1:function(a,b){var s,r=a.style
+p=H.dgf(l.i(a,"textCapitalization"))
+o=l.aN(a,m)?H.cLF(l.i(a,m),C.Sx):null
+return new H.b6g(k,j,r,s,q,o,H.dbG(l.i(a,m),l.i(a,"fields")),p)},
+dcf:function(a){return new H.alk(a,H.a([],t.Iu))},
+cPq:function(a,b){var s,r=a.style
r.toString
-C.x.d7(r,C.x.ce(r,"transform-origin"),"0 0 0","")
-s=H.vr(b)
-C.x.d7(r,C.x.ce(r,"transform"),s,"")},
-vr:function(a){var s=H.d0G(a)
+C.x.d5(r,C.x.ce(r,"transform-origin"),"0 0 0","")
+s=H.vs(b)
+C.x.d5(r,C.x.ce(r,"transform"),s,"")},
+vs:function(a){var s=H.d06(a)
if(s===C.SK)return"matrix("+H.f(a[0])+","+H.f(a[1])+","+H.f(a[4])+","+H.f(a[5])+","+H.f(a[12])+","+H.f(a[13])+")"
-else if(s===C.SL)return H.dB8(a)
+else if(s===C.SL)return H.dAw(a)
else return"none"},
-d0G:function(a){if(!(a[15]===1&&a[14]===0&&a[11]===0&&a[10]===1&&a[9]===0&&a[8]===0&&a[7]===0&&a[6]===0&&a[3]===0&&a[2]===0))return C.SL
+d06:function(a){if(!(a[15]===1&&a[14]===0&&a[11]===0&&a[10]===1&&a[9]===0&&a[8]===0&&a[7]===0&&a[6]===0&&a[3]===0&&a[2]===0))return C.SL
if(a[0]===1&&a[1]===0&&a[4]===0&&a[5]===1&&a[12]===0&&a[13]===0)return C.SJ
else return C.SK},
-dB8:function(a){var s,r,q=a[0]
+dAw:function(a){var s,r,q=a[0]
if(q===1&&a[1]===0&&a[2]===0&&a[3]===0&&a[4]===0&&a[5]===1&&a[6]===0&&a[7]===0&&a[8]===0&&a[9]===0&&a[10]===1&&a[11]===0&&a[14]===0&&a[15]===1){s=a[12]
r=a[13]
return"translate3d("+H.f(s)+"px, "+H.f(r)+"px, 0px)"}else return"matrix3d("+H.f(q)+","+H.f(a[1])+","+H.f(a[2])+","+H.f(a[3])+","+H.f(a[4])+","+H.f(a[5])+","+H.f(a[6])+","+H.f(a[7])+","+H.f(a[8])+","+H.f(a[9])+","+H.f(a[10])+","+H.f(a[11])+","+H.f(a[12])+","+H.f(a[13])+","+H.f(a[14])+","+H.f(a[15])+")"},
-d0H:function(a,b){var s=$.d5h()
+d07:function(a,b){var s=$.d4I()
s[0]=b.a
s[1]=b.b
s[2]=b.c
s[3]=b.d
-H.cQb(a,s)
-return new P.ax(s[0],s[1],s[2],s[3])},
-cQb:function(a0,a1){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d,c,b,a=$.cRj()
+H.cPA(a,s)
+return new P.ay(s[0],s[1],s[2],s[3])},
+cPA:function(a0,a1){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d,c,b,a=$.cQJ()
a[0]=a1[0]
a[4]=a1[1]
a[8]=0
@@ -1181,7 +1181,7 @@ a[3]=a1[2]
a[7]=a1[3]
a[11]=0
a[15]=1
-s=$.d5g().a
+s=$.d4H().a
r=s[0]
q=s[4]
p=s[8]
@@ -1219,101 +1219,101 @@ a1[0]=Math.min(Math.min(Math.min(a[0],a[1]),a[2]),a[3])
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])},
-d0w:function(a,b){return a.a<=b.a&&a.b<=b.b&&a.c>=b.c&&a.d>=b.d},
-cZN:function(a,b,c,d,e){var s,r=''
break
-case C.w7:n=$.p6+1
+case C.w6:n=$.p6+1
$.p6=n
m=a2+n+a3+H.f(H.jo(o))+'" flood-opacity="1" result="flood">'
break
-case C.w8:n=$.p6+1
+case C.w7:n=$.p6+1
$.p6=n
m=a2+n+a3+H.f(H.jo(o))+'" flood-opacity="1" result="flood">'
break
case C.pK:o.toString
$.p6=$.p6+1
-l=o.gaQ1().eJ(0,255)
-k=o.gaGt().eJ(0,255)
-j=o.gafL().eJ(0,255)
+l=o.gaQ7().eG(0,255)
+k=o.gaGz().eG(0,255)
+j=o.gafP().eG(0,255)
m=a2+$.p6+'" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">'
break
-case C.pL:m=H.cZ3(o,"hard-light",!0)
+case C.pL:m=H.cYu(o,"hard-light",!0)
break
-case C.pO:case C.pM:case C.pN:case C.w9:case C.wa:case C.wb:case C.Dq:case C.Di:case C.pL:case C.Dj:case C.Dk:case C.pM:case C.pN:case C.Dm:case C.Dn:case C.Do:case C.Dp:m=H.cZ3(o,H.cra(q),!1)
+case C.pO:case C.pM:case C.pN:case C.w8:case C.w9:case C.wa:case C.Dq:case C.Di:case C.pL:case C.Dj:case C.Dk:case C.pM:case C.pN:case C.Dm:case C.Dn:case C.Do:case C.Dp:m=H.cYu(o,H.cqJ(q),!1)
break
-case C.w6:case C.Dl:case C.Dh:case C.wd:case C.wf:case C.Dr:case C.Dg:case C.nm:m=a0
+case C.w5:case C.Dl:case C.Dh:case C.wc:case C.we:case C.Dr:case C.Dg:case C.nl:m=a0
break
default:H.b(H.M(u.I))
-m=a0}i=W.ak1(m,new H.Xv(),a0)
+m=a0}i=W.ak4(m,new H.Xy(),a0)
a.c.appendChild(i)
a.f.push(i)
-p=a.a3p(a4)
+p=a.a3s(a4)
n=p.style
h="url(#_fcf"+$.p6+")"
n.toString
-C.x.d7(n,C.x.ce(n,"filter"),h,"")
+C.x.d5(n,C.x.ce(n,"filter"),h,"")
if(q===C.pO){n=p.style
h=H.jo(o)
n.toString
@@ -51556,67 +51472,67 @@ n.backgroundColor=h==null?"":h}break
default:o=r.a
p=document.createElement("div")
g=p.style
-switch(q){case C.Dg:case C.wf:g.position=a1
+switch(q){case C.Dg:case C.we:g.position=a1
break
-case C.w6:case C.nm:g.position=a1
+case C.w5:case C.nl:g.position=a1
n=H.jo(o)
g.backgroundColor=n==null?"":n
break
-case C.Dl:case C.wd:g.position=a1
+case C.Dl:case C.wc:g.position=a1
n="url('"+H.f(a4.a.src)+"')"
g.backgroundImage=n
break
default:g.position=a1
n="url('"+H.f(a4.a.src)+"')"
g.backgroundImage=n
-n=H.cra(q)
+n=H.cqJ(q)
if(n==null)n=""
-C.x.d7(g,C.x.ce(g,"background-blend-mode"),n,"")
+C.x.d5(g,C.x.ce(g,"background-blend-mode"),n,"")
n=H.jo(o)
g.backgroundColor=n==null?"":n
break}break}n=p.style
-h=H.cra(s)
+h=H.cqJ(s)
if(h==null)h=""
n.toString
-C.x.d7(n,C.x.ce(n,"mix-blend-mode"),h,"")
+C.x.d5(n,C.x.ce(n,"mix-blend-mode"),h,"")
n=a.d
if(n.b!=null){h=p.style
h.removeProperty("width")
h.removeProperty("height")
h=n.b
h.toString
-f=H.cZ9(h,p,a5,n.c)
+f=H.cYA(h,p,a5,n.c)
for(n=f.length,h=a.c,e=a.f,d=0;d>>16,(65280&p.gw(p))>>>8,(255&p.gw(p))>>>0))
p.toString
-s.shadowColor=p}else{p=H.jo(C.Z)
+s.shadowColor=p}else{p=H.jo(C.Y)
p.toString
s.shadowColor=p}s.translate(-5e4,0)
l=new Float32Array(2)
p=$.cq()
l[0]=5e4*p.gfw(p)
p=i.b
-p.c.adc(l)
+p.c.adh(l)
k=l[0]
j=l[1]
l[1]=0
l[0]=0
-p.c.adc(l)
+p.c.adh(l)
s.shadowOffsetX=k-l[0]
s.shadowOffsetY=j-l[1]}},
-zf:function(){var s=this.z
+zd:function(){var s=this.z
if((s==null?null:s.y)!=null){s=H.iz()
s=s===C.bE||!1}else s=!1
if(s)this.a.restore()},
-CT:function(a){var s=this.a
+CS:function(a){var s=this.a
if(a===C.bL)s.stroke()
else s.fill()},
-l0:function(a){var s=this,r=s.a
+l_:function(a){var s=this,r=s.a
r.fillStyle=""
s.f=r.fillStyle
r.strokeStyle=""
@@ -51910,245 +51826,245 @@ r.shadowColor="none"
r.shadowOffsetX=0
r.shadowOffsetY=0
r.globalCompositeOperation="source-over"
-s.c=C.nm
+s.c=C.nl
r.lineWidth=1
s.x=1
r.lineCap="butt"
-s.d=C.n5
+s.d=C.n4
r.lineJoin="miter"
-s.e=C.v4},
-gax:function(a){return this.a}}
-H.aGs.prototype={
+s.e=C.v3},
+gaw:function(a){return this.a}}
+H.aGv.prototype={
cq:function(a){var s
C.b.sH(this.a,0)
this.b=null
s=new H.dP(new Float32Array(16))
s.ft()
this.c=s},
-fb:function(a){var s=this.c,r=new H.dP(new Float32Array(16))
-r.er(s)
+fc:function(a){var s=this.c,r=new H.dP(new Float32Array(16))
+r.eo(s)
s=this.b
s=s==null?null:P.v(s,!0,t.Fk)
-this.a.push(new H.aGr(r,s))},
+this.a.push(new H.aGu(r,s))},
fM:function(a){var s,r=this.a
if(r.length===0)return
s=r.pop()
this.c=s.a
this.b=s.b},
dm:function(a,b,c){this.c.dm(0,b,c)},
-l8:function(a,b,c){this.c.l8(0,b,c)},
-rm:function(a,b){this.c.acL(0,$.d4o(),b)},
-b3:function(a,b){this.c.i5(0,new H.dP(b))},
-ll:function(a,b){var s,r,q=this.b
+l7:function(a,b,c){this.c.l7(0,b,c)},
+rm:function(a,b){this.c.acP(0,$.d3Q(),b)},
+b4:function(a,b){this.c.i4(0,new H.dP(b))},
+lk:function(a,b){var s,r,q=this.b
if(q==null)q=this.b=H.a([],t.EM)
s=this.c
r=new H.dP(new Float32Array(16))
-r.er(s)
-q.push(new H.Ow(b,null,null,r))},
+r.eo(s)
+q.push(new H.Oz(b,null,null,r))},
qJ:function(a,b){var s,r,q=this.b
if(q==null)q=this.b=H.a([],t.EM)
s=this.c
r=new H.dP(new Float32Array(16))
-r.er(s)
-q.push(new H.Ow(null,b,null,r))},
-ot:function(a,b){var s,r,q=this.b
+r.eo(s)
+q.push(new H.Oz(null,b,null,r))},
+ov:function(a,b){var s,r,q=this.b
if(q==null)q=this.b=H.a([],t.EM)
s=this.c
r=new H.dP(new Float32Array(16))
-r.er(s)
-q.push(new H.Ow(null,null,b,r))}}
-H.aPt.prototype={}
-H.aPu.prototype={}
-H.aPv.prototype={}
-H.btR.prototype={}
-H.buV.prototype={}
-H.buG.prototype={}
-H.bu8.prototype={}
-H.bu4.prototype={}
-H.bu3.prototype={}
-H.bu7.prototype={}
-H.bu6.prototype={}
-H.btD.prototype={}
-H.btC.prototype={}
-H.buK.prototype={}
-H.buJ.prototype={}
-H.buI.prototype={}
-H.buH.prototype={}
+r.eo(s)
+q.push(new H.Oz(null,null,b,r))}}
+H.aPw.prototype={}
+H.aPx.prototype={}
+H.aPy.prototype={}
+H.btI.prototype={}
+H.buM.prototype={}
H.bux.prototype={}
-H.buw.prototype={}
-H.buz.prototype={}
-H.buy.prototype={}
-H.buT.prototype={}
-H.buS.prototype={}
-H.but.prototype={}
-H.bus.prototype={}
-H.btO.prototype={}
-H.Vb.prototype={}
+H.bu_.prototype={}
+H.btW.prototype={}
+H.btV.prototype={}
H.btZ.prototype={}
H.btY.prototype={}
-H.bup.prototype={}
-H.buo.prototype={}
-H.btK.prototype={}
-H.btJ.prototype={}
-H.buD.prototype={}
-H.buC.prototype={}
-H.buh.prototype={}
-H.bug.prototype={}
-H.btI.prototype={}
-H.btH.prototype={}
-H.buF.prototype={}
-H.buE.prototype={}
-H.bu0.prototype={}
-H.bu_.prototype={}
-H.buQ.prototype={}
-H.buP.prototype={}
-H.btF.prototype={}
-H.btE.prototype={}
-H.btT.prototype={}
-H.btS.prototype={}
-H.btG.prototype={}
-H.bu9.prototype={}
+H.btu.prototype={}
+H.btt.prototype={}
H.buB.prototype={}
H.buA.prototype={}
-H.buf.prototype={}
-H.bud.prototype={}
-H.btQ.prototype={}
-H.btP.prototype={}
-H.bub.prototype={}
-H.bua.prototype={}
-H.bXt.prototype={}
-H.bu1.prototype={}
+H.buz.prototype={}
+H.buy.prototype={}
+H.buo.prototype={}
H.bun.prototype={}
-H.btV.prototype={}
-H.btU.prototype={}
-H.buv.prototype={}
-H.buu.prototype={}
-H.bur.prototype={}
-H.btL.prototype={}
-H.btN.prototype={}
-H.btM.prototype={}
H.buq.prototype={}
+H.bup.prototype={}
+H.buK.prototype={}
+H.buJ.prototype={}
H.buk.prototype={}
H.buj.prototype={}
-H.bul.prototype={}
-H.bum.prototype={}
-H.buN.prototype={}
-H.buO.prototype={}
-H.bu5.prototype={}
-H.au8.prototype={}
-H.bAQ.prototype={}
-H.bui.prototype={}
-H.buL.prototype={}
-H.buM.prototype={}
-H.buU.prototype={}
-H.buR.prototype={}
+H.btF.prototype={}
+H.Vf.prototype={}
+H.btQ.prototype={}
+H.btP.prototype={}
+H.bug.prototype={}
+H.buf.prototype={}
+H.btB.prototype={}
+H.btA.prototype={}
+H.buu.prototype={}
+H.but.prototype={}
+H.bu8.prototype={}
+H.bu7.prototype={}
+H.btz.prototype={}
+H.bty.prototype={}
+H.buw.prototype={}
+H.buv.prototype={}
+H.btS.prototype={}
+H.btR.prototype={}
+H.buH.prototype={}
+H.buG.prototype={}
+H.btw.prototype={}
+H.btv.prototype={}
+H.btK.prototype={}
+H.btJ.prototype={}
+H.btx.prototype={}
+H.bu0.prototype={}
+H.bus.prototype={}
+H.bur.prototype={}
+H.bu6.prototype={}
+H.bu4.prototype={}
+H.btH.prototype={}
+H.btG.prototype={}
H.bu2.prototype={}
-H.bAR.prototype={}
-H.btX.prototype={}
+H.bu1.prototype={}
+H.bXb.prototype={}
+H.btT.prototype={}
H.bue.prototype={}
-H.btW.prototype={}
+H.btM.prototype={}
+H.btL.prototype={}
+H.bum.prototype={}
+H.bul.prototype={}
+H.bui.prototype={}
+H.btC.prototype={}
+H.btE.prototype={}
+H.btD.prototype={}
+H.buh.prototype={}
+H.bub.prototype={}
+H.bua.prototype={}
H.buc.prototype={}
-H.cMt.prototype={
-fb:function(a){J.d9Z(this.a.a)},
-zN:function(a,b,c){t.qo.a(c)
-J.da_(this.a.a,H.aek(b),c.gqd())},
-fM:function(a){J.d9X(this.a.a)},
-dm:function(a,b,c){J.dac(this.a.a,b,c)},
-l8:function(a,b,c){J.da0(this.a.a,b,c)
+H.bud.prototype={}
+H.buE.prototype={}
+H.buF.prototype={}
+H.btX.prototype={}
+H.aub.prototype={}
+H.bAH.prototype={}
+H.bu9.prototype={}
+H.buC.prototype={}
+H.buD.prototype={}
+H.buL.prototype={}
+H.buI.prototype={}
+H.btU.prototype={}
+H.bAI.prototype={}
+H.btO.prototype={}
+H.bu5.prototype={}
+H.btN.prototype={}
+H.bu3.prototype={}
+H.cLR.prototype={
+fc:function(a){J.d9l(this.a.a)},
+zL:function(a,b,c){t.qo.a(c)
+J.d9m(this.a.a,H.aen(b),c.gqd())},
+fM:function(a){J.d9j(this.a.a)},
+dm:function(a,b,c){J.d9z(this.a.a,b,c)},
+l7:function(a,b,c){J.d9n(this.a.a,b,c)
return null},
-rm:function(a,b){J.d9Y(this.a.a,b*180/3.141592653589793,0,0)},
-b3:function(a,b){J.d8U(this.a.a,H.dHP(H.cKJ(b)))},
-BK:function(a,b,c,d){J.d8R(this.a.a,H.aek(b),$.d5d()[c.a],d)},
-a6P:function(a,b,c){return this.BK(a,b,C.nt,c)},
-ll:function(a,b){return this.BK(a,b,C.nt,!0)},
-Hh:function(a,b,c){J.d8Q(this.a.a,H.cKK(b),$.d0Q(),c)},
+rm:function(a,b){J.d9k(this.a.a,b*180/3.141592653589793,0,0)},
+b4:function(a,b){J.d8g(this.a.a,H.dHa(H.cK7(b)))},
+BJ:function(a,b,c,d){J.d8d(this.a.a,H.aen(b),$.d4E()[c.a],d)},
+a6T:function(a,b,c){return this.BJ(a,b,C.ns,c)},
+lk:function(a,b){return this.BJ(a,b,C.ns,!0)},
+Hh:function(a,b,c){J.d8c(this.a.a,H.cK8(b),$.d0g(),c)},
qJ:function(a,b){return this.Hh(a,b,!0)},
-Hg:function(a,b,c){this.a.aRT(0,b,c)},
-ot:function(a,b){return this.Hg(a,b,!0)},
-qS:function(a,b,c,d){J.d90(this.a.a,b.a,b.b,c.a,c.b,t.qo.a(d).gqd())},
+Hg:function(a,b,c){this.a.aRZ(0,b,c)},
+ov:function(a,b){return this.Hg(a,b,!0)},
+qS:function(a,b,c,d){J.d8n(this.a.a,b.a,b.b,c.a,c.b,t.qo.a(d).gqd())},
hD:function(a,b,c){t.qo.a(c)
-J.d93(this.a.a,H.aek(b),c.gqd())},
+J.d8q(this.a.a,H.aen(b),c.gqd())},
hm:function(a,b,c){t.qo.a(c)
-J.cRV(this.a.a,H.cKK(b),c.gqd())},
-ox:function(a,b,c,d){t.qo.a(d)
-J.d8Z(this.a.a,H.cKK(b),H.cKK(c),d.gqd())},
-ja:function(a,b,c,d){t.qo.a(d)
-J.d8Y(this.a.a,b.a,b.b,c,d.gqd())},
+J.cRk(this.a.a,H.cK8(b),c.gqd())},
+oy:function(a,b,c,d){t.qo.a(d)
+J.d8l(this.a.a,H.cK8(b),H.cK8(c),d.gqd())},
+j8:function(a,b,c,d){t.qo.a(d)
+J.d8k(this.a.a,b.a,b.b,c,d.gqd())},
HV:function(a,b,c,d,e,f){t.qo.a(f)
-J.d8X(this.a.a,H.aek(b),c*57.29577951308232,d*57.29577951308232,!1,f.gqd())},
+J.d8j(this.a.a,H.aen(b),c*57.29577951308232,d*57.29577951308232,!1,f.gqd())},
fe:function(a,b,c){t.E_.a(b)
t.qo.a(c)
-J.d92(this.a.a,b.a,c.gqd())},
-yp:function(a,b,c,d,e){t.qo.a(e)
-J.d9_(this.a.a,t.XY.a(b).a,H.aek(c),H.aek(d),e.gqd(),!1)},
-mi:function(a,b,c){J.d91(this.a.a,t.z7.a(b).gqd(),c.a,c.b)},
-yq:function(a,b,c,d,e){var s
+J.d8p(this.a.a,b.a,c.gqd())},
+yn:function(a,b,c,d,e){t.qo.a(e)
+J.d8m(this.a.a,t.XY.a(b).a,H.aen(c),H.aen(d),e.gqd(),!1)},
+mi:function(a,b,c){J.d8o(this.a.a,t.z7.a(b).gqd(),c.a,c.b)},
+yo:function(a,b,c,d,e){var s
t.E_.a(b)
s=$.cq()
-H.dA_(this.a.a,b,c,d,e,s.gfw(s))}}
-H.au9.prototype={
+H.dzn(this.a.a,b,c,d,e,s.gfw(s))}}
+H.auc.prototype={
gH:function(a){return this.b.c},
F:function(a,b){var s,r=this,q=r.b
-q.Qr(b)
-s=q.guU().aNz()
+q.Qq(b)
+s=q.guU().aNF()
s.toString
r.c.E(0,b,s)
-if(q.c>r.a)H.dgo(r)},
-zb:function(a){var s,r,q,p,o,n,m,l=this.a/2|0
-for(s=this.c,r=this.b,q=r.$ti,p=q.h("Oh<1>"),o=0;or.a)H.dfM(r)},
+z9:function(a){var s,r,q,p,o,n,m,l=this.a/2|0
+for(s=this.c,r=this.b,q=r.$ti,p=q.h("Ok<1>"),o=0;o").a(r.a.a).a31(0);--r.c
-s.P(0,m)
-m.iS(0)
-m.aRU()}}}
-H.cMv.prototype={}
-H.agI.prototype={
-agI:function(a,b){var s={}
+r.b=!0}m=q.h("yp<1>").a(r.a.a).a34(0);--r.c
+s.O(0,m)
+m.iQ(0)
+m.aS_()}}}
+H.cLT.prototype={}
+H.agL.prototype={
+agM:function(a,b){var s={}
s.a=!1
-this.a.zS(0,J.e(a.b,"text")).R(0,new H.aSq(s,b),t.P).a3(new H.aSr(s,b))},
-afa:function(a){this.b.Dx(0).R(0,new H.aSo(a),t.P).a3(new H.aSp(a))}}
-H.aSq.prototype={
+this.a.zQ(0,J.e(a.b,"text")).R(0,new H.aSc(s,b),t.P).a3(new H.aSd(s,b))},
+afe:function(a){this.b.Dw(0).R(0,new H.aSa(a),t.P).a3(new H.aSb(a))}}
+H.aSc.prototype={
$1:function(a){var s=this.b
if(a){s.toString
-s.$1(C.bR.hn([!0]))}else{s.toString
-s.$1(C.bR.hn(["copy_fail","Clipboard.setData failed",null]))
+s.$1(C.bT.hn([!0]))}else{s.toString
+s.$1(C.bT.hn(["copy_fail","Clipboard.setData failed",null]))
this.a.a=!0}},
-$S:308}
-H.aSr.prototype={
+$S:347}
+H.aSd.prototype={
$1:function(a){var s
if(!this.a.a){s=this.b
s.toString
-s.$1(C.bR.hn(["copy_fail","Clipboard.setData failed",null]))}},
+s.$1(C.bT.hn(["copy_fail","Clipboard.setData failed",null]))}},
$S:11}
-H.aSo.prototype={
+H.aSa.prototype={
$1:function(a){var s=P.l(["text",a],t.N,t.z),r=this.a
r.toString
-r.$1(C.bR.hn([s]))},
-$S:594}
-H.aSp.prototype={
+r.$1(C.bT.hn([s]))},
+$S:596}
+H.aSb.prototype={
$1:function(a){var s
P.ar("Could not get text from clipboard: "+H.f(a))
s=this.a
s.toString
-s.$1(C.bR.hn(["paste_fail","Clipboard.getData failed",null]))},
+s.$1(C.bT.hn(["paste_fail","Clipboard.getData failed",null]))},
$S:11}
-H.agH.prototype={
-zS:function(a,b){return this.agH(a,b)},
-agH:function(a,b){var s=0,r=P.X(t.C9),q,p=2,o,n=[],m,l,k,j
-var $async$zS=P.Q(function(c,d){if(c===1){o=d
+H.agK.prototype={
+zQ:function(a,b){return this.agL(a,b)},
+agL:function(a,b){var s=0,r=P.X(t.C9),q,p=2,o,n=[],m,l,k,j
+var $async$zQ=P.Q(function(c,d){if(c===1){o=d
s=p}while(true)switch(s){case 0:p=4
l=window.navigator.clipboard
l.toString
b.toString
s=7
-return P.N(P.vu(l.writeText(b),t.z),$async$zS)
+return P.N(P.vv(l.writeText(b),t.z),$async$zQ)
case 7:p=2
s=6
break
case 4:p=3
j=o
-m=H.J(j)
+m=H.K(j)
P.ar("copy is not successful "+H.f(m))
l=P.fC(!1,t.C9)
q=l
@@ -52163,46 +52079,46 @@ s=1
break
case 1:return P.V(q,r)
case 2:return P.U(o,r)}})
-return P.W($async$zS,r)}}
-H.aSn.prototype={
-Dx:function(a){var s=0,r=P.X(t.N),q
-var $async$Dx=P.Q(function(b,c){if(b===1)return P.U(c,r)
-while(true)switch(s){case 0:q=P.vu(window.navigator.clipboard.readText(),t.N)
+return P.W($async$zQ,r)}}
+H.aS9.prototype={
+Dw:function(a){var s=0,r=P.X(t.N),q
+var $async$Dw=P.Q(function(b,c){if(b===1)return P.U(c,r)
+while(true)switch(s){case 0:q=P.vv(window.navigator.clipboard.readText(),t.N)
s=1
break
case 1:return P.V(q,r)}})
-return P.W($async$Dx,r)}}
-H.akq.prototype={
-zS:function(a,b){return P.fC(this.aCB(b),t.C9)},
-aCB:function(a){var s,r,q,p,o="-99999px",n="transparent",m=document,l=m.createElement("textarea"),k=l.style
+return P.W($async$Dw,r)}}
+H.akt.prototype={
+zQ:function(a,b){return P.fC(this.aCH(b),t.C9)},
+aCH:function(a){var s,r,q,p,o="-99999px",n="transparent",m=document,l=m.createElement("textarea"),k=l.style
k.position="absolute"
k.top=o
k.left=o
-C.x.d7(k,C.x.ce(k,"opacity"),"0","")
+C.x.d5(k,C.x.ce(k,"opacity"),"0","")
k.color=n
k.backgroundColor=n
k.background=n
m.body.appendChild(l)
s=l
s.value=a
-J.d97(s)
-J.da1(s)
+J.d8u(s)
+J.d9o(s)
r=!1
try{r=m.execCommand("copy")
-if(!r)P.ar("copy is not successful")}catch(p){q=H.J(p)
+if(!r)P.ar("copy is not successful")}catch(p){q=H.K(p)
P.ar("copy is not successful "+H.f(q))}finally{J.fJ(s)}return r}}
-H.b06.prototype={
-Dx:function(a){P.ar("Paste is not implemented for this browser.")
-throw H.d(P.ff(null))}}
-H.aZ8.prototype={
-cq:function(a){this.ajw(0)
+H.b_R.prototype={
+Dw:function(a){P.ar("Paste is not implemented for this browser.")
+throw H.d(P.fg(null))}}
+H.aYV.prototype={
+cq:function(a){this.ajA(0)
$.fr().qH(this.a)},
-ll:function(a,b){throw H.d(P.ff(null))},
-qJ:function(a,b){throw H.d(P.ff(null))},
-ot:function(a,b){throw H.d(P.ff(null))},
-qS:function(a,b,c,d){throw H.d(P.ff(null))},
-hD:function(a,b,c){this.a_N(b,c,"draw-rect")},
-a_N:function(a,b,c){var s,r,q,p,o,n,m,l,k,j,i=this,h=W.p2(c,null),g=b.b===C.bL,f=b.c
+lk:function(a,b){throw H.d(P.fg(null))},
+qJ:function(a,b){throw H.d(P.fg(null))},
+ov:function(a,b){throw H.d(P.fg(null))},
+qS:function(a,b,c,d){throw H.d(P.fg(null))},
+hD:function(a,b,c){this.a_M(b,c,"draw-rect")},
+a_M:function(a,b,c){var s,r,q,p,o,n,m,l,k,j,i=this,h=W.p2(c,null),g=b.b===C.bL,f=b.c
if(f==null)f=0
s=a.a
r=a.c
@@ -52217,20 +52133,20 @@ m="translate("+H.f(q-s)+"px, "+H.f(o-s)+"px)"}else m="translate("+H.f(q)+"px, "+
else{s=i.pC$
r=new Float32Array(16)
l=new H.dP(r)
-l.er(s)
+l.eo(s)
if(g){s=f/2
l.dm(0,q-s,o-s)}else l.dm(0,q,o)
-m=H.vr(r)}k=h.style
+m=H.vs(r)}k=h.style
k.position="absolute"
-C.x.d7(k,C.x.ce(k,"transform-origin"),"0 0 0","")
-C.x.d7(k,C.x.ce(k,"transform"),m,"")
+C.x.d5(k,C.x.ce(k,"transform-origin"),"0 0 0","")
+C.x.d5(k,C.x.ce(k,"transform"),m,"")
s=b.r
if(s==null)j="#000000"
else{s=H.jo(s)
s.toString
j=s}s=b.y
if(s!=null){s="blur("+H.f(s.b)+"px)"
-C.x.d7(k,C.x.ce(k,"filter"),s,"")}s=p-q
+C.x.d5(k,C.x.ce(k,"filter"),s,"")}s=p-q
if(g){s=H.f(s-f)+"px"
k.width=s
s=H.f(n-o-f)+"px"
@@ -52240,34 +52156,34 @@ k.border=s}else{s=H.f(s)+"px"
k.width=s
s=H.f(n-o)+"px"
k.height=s
-k.backgroundColor=j}s=i.Cc$;(s.length===0?i.a:C.b.gaS(s)).appendChild(h)
+k.backgroundColor=j}s=i.Cb$;(s.length===0?i.a:C.b.gaS(s)).appendChild(h)
return h},
-hm:function(a,b,c){var s=this.a_N(new P.ax(b.a,b.b,b.c,b.d),c,"draw-rrect").style,r=C.l.e8(b.Q,3)+"px"
+hm:function(a,b,c){var s=this.a_M(new P.ay(b.a,b.b,b.c,b.d),c,"draw-rrect").style,r=C.l.e6(b.Q,3)+"px"
s.toString
-C.x.d7(s,C.x.ce(s,"border-radius"),r,"")},
-ja:function(a,b,c,d){throw H.d(P.ff(null))},
-fe:function(a,b,c){throw H.d(P.ff(null))},
-yq:function(a,b,c,d,e){throw H.d(P.ff(null))},
-yp:function(a,b,c,d,e){throw H.d(P.ff(null))},
-mi:function(a,b,c){var s=H.cZk(b,c,this.pC$),r=this.Cc$;(r.length===0?this.a:C.b.gaS(r)).appendChild(s)},
+C.x.d5(s,C.x.ce(s,"border-radius"),r,"")},
+j8:function(a,b,c,d){throw H.d(P.fg(null))},
+fe:function(a,b,c){throw H.d(P.fg(null))},
+yo:function(a,b,c,d,e){throw H.d(P.fg(null))},
+yn:function(a,b,c,d,e){throw H.d(P.fg(null))},
+mi:function(a,b,c){var s=H.cYL(b,c,this.pC$),r=this.Cb$;(r.length===0?this.a:C.b.gaS(r)).appendChild(s)},
I6:function(){},
-gVo:function(a){return this.a}}
-H.ajP.prototype={
-aQm:function(a){var s=this.r
+gVn:function(a){return this.a}}
+H.ajS.prototype={
+aQs:function(a){var s=this.r
if(a==null?s!=null:a!==s){if(s!=null)J.fJ(s)
this.r=a
s=this.f
s.toString
a.toString
s.appendChild(a)}},
-BQ:function(a,b){var s=document.createElement(b)
+BP:function(a,b){var s=document.createElement(b)
return s},
hV:function(a,b,c){var s
if(c==null)a.style.removeProperty(b)
else{s=a.style
s.toString
-C.x.d7(s,C.x.ce(s,b),c,null)}},
-l0:function(a){var s,r,q,p,o,n,m,l,k=this,j="0",i="none",h={},g=k.c
+C.x.d5(s,C.x.ce(s,b),c,null)}},
+l_:function(a){var s,r,q,p,o,n,m,l,k=this,j="0",i="none",h={},g=k.c
if(g!=null)C.BG.h7(g)
g=document
s=g.createElement("style")
@@ -52277,7 +52193,7 @@ r=t.IP.a(k.c.sheet)
s=H.iz()
q=s===C.bE
s=H.iz()
-p=s===C.jm
+p=s===C.jo
if(p)r.insertRule("flt-ruler-host p, flt-scene p { margin: 0; line-height: 100%;}",r.cssRules.length)
else r.insertRule("flt-ruler-host p, flt-scene p { margin: 0; }",r.cssRules.length)
r.insertRule("flt-semantics input[type=range] {\n appearance: none;\n -webkit-appearance: none;\n width: 100%;\n position: absolute;\n border: none;\n top: 0;\n right: 0;\n bottom: 0;\n left: 0;\n}",r.cssRules.length)
@@ -52287,7 +52203,7 @@ r.insertRule("textarea::-moz-selection { background-color: transparent;}",r.css
r.insertRule("textarea::selection { background-color: transparent;}",r.cssRules.length)}r.insertRule('flt-semantics input,\nflt-semantics textarea,\nflt-semantics [contentEditable="true"] {\n caret-color: transparent;\n}\n',r.cssRules.length)
if(q)r.insertRule("flt-glass-pane * {\n -webkit-tap-highlight-color: transparent;\n}\n",r.cssRules.length)
s=H.iz()
-if(s!==C.fm){s=H.iz()
+if(s!==C.fn){s=H.iz()
s=s===C.bE}else s=!0
if(s)r.insertRule(".transparentTextEditing:-webkit-autofill,\n.transparentTextEditing:-webkit-autofill:hover,\n.transparentTextEditing:-webkit-autofill:focus,\n.transparentTextEditing:-webkit-autofill:active {\n -webkit-transition-delay: 99999s;\n}\n",r.cssRules.length)
s=g.body
@@ -52308,7 +52224,7 @@ k.hV(s,"touch-action",i)
k.hV(s,"font","normal normal 14px sans-serif")
k.hV(s,"color","red")
s.spellcheck=!1
-for(o=t.xl,n=new W.Om(g.head.querySelectorAll('meta[name="viewport"]'),o),o=new H.cZ(n,n.gH(n),o.h("cZ"));o.t();){m=o.d
+for(o=t.xl,n=new W.Op(g.head.querySelectorAll('meta[name="viewport"]'),o),o=new H.d_(n,n.gH(n),o.h("d_"));o.t();){m=o.d
n=m.parentNode
if(n!=null)n.removeChild(m)}o=k.d
if(o!=null)C.alV.h7(o)
@@ -52320,7 +52236,7 @@ k.d=o
g.head.appendChild(o)
o=k.y
if(o!=null)J.fJ(o)
-l=k.y=k.BQ(0,"flt-glass-pane")
+l=k.y=k.BP(0,"flt-glass-pane")
g=l.style
g.position="absolute"
g.top=j
@@ -52328,132 +52244,132 @@ g.right=j
g.bottom=j
g.left=j
s.appendChild(l)
-g=k.BQ(0,"flt-scene-host")
+g=k.BP(0,"flt-scene-host")
k.f=g
g=g.style
g.toString
-C.x.d7(g,C.x.ce(g,"pointer-events"),i,"")
+C.x.d5(g,C.x.ce(g,"pointer-events"),i,"")
g=k.f
g.toString
l.appendChild(g)
-l.insertBefore(H.tS().r.a.abN(),k.f)
-if($.cV2==null){g=new H.arb(l,new H.bj6(P.ab(t.S,t.iT)))
-s=g.aql()
+l.insertBefore(H.tR().r.a.abR(),k.f)
+if($.cUt==null){g=new H.are(l,new H.biY(P.ab(t.S,t.iT)))
+s=g.aqo()
g.e=!0
g.d=s
-$.cV2=g}k.f.setAttribute("aria-hidden","true")
+$.cUt=g}k.f.setAttribute("aria-hidden","true")
if(window.visualViewport==null&&q){g=window.innerWidth
g.toString
h.a=0
-P.DH(C.cw,new H.aZa(h,k,g))}g=k.gayS()
+P.DH(C.cx,new H.aYX(h,k,g))}g=k.gayW()
s=t.Su
if(window.visualViewport!=null){o=window.visualViewport
o.toString
-k.a=W.fg(o,"resize",g,!1,s)}else k.a=W.fg(window,"resize",g,!1,s)
-k.b=W.fg(window,"languagechange",k.gay9(),!1,s)
+k.a=W.fh(o,"resize",g,!1,s)}else k.a=W.fh(window,"resize",g,!1,s)
+k.b=W.fh(window,"languagechange",k.gayd(),!1,s)
g=$.cq()
g.toString
-g.fr=H.cMT()},
-a22:function(a){var s=H.OK()
-if(!J.dZ(C.RT.a,s)&&!$.cq().aM1()&&$.Yo().r){s=$.cq()
-s.a6X()
-s.a9R()}else{s=$.cq()
-s.a_1()
-s.a6X()
-s.a9R()}},
-aya:function(a){var s=$.cq()
+g.fr=H.cMg()},
+a22:function(a){var s=H.OO()
+if(!J.e_(C.RT.a,s)&&!$.cq().aM7()&&$.Yq().r){s=$.cq()
+s.a70()
+s.a9V()}else{s=$.cq()
+s.a_0()
+s.a70()
+s.a9V()}},
+aye:function(a){var s=$.cq()
s.toString
-s.fr=H.cMT()
+s.fr=H.cMg()
s=s.dx
if(s!=null)s.$0()},
qH:function(a){var s,r
for(;s=a.lastChild,s!=null;){r=s.parentNode
if(r!=null)r.removeChild(s)}},
-agU:function(a){var s,r,q,p,o=window.screen.orientation
+agY:function(a){var s,r,q,p,o=window.screen.orientation
if(o!=null){a.toString
q=J.am(a)
if(q.gag(a)){q=o
q.toString
-J.dae(q)
-return P.fC(!0,t.C9)}else{s=H.dc6(q.ga5(a))
+J.d9B(q)
+return P.fC(!0,t.C9)}else{s=H.dbt(q.ga4(a))
if(s!=null){r=new P.b6(new P.aC($.aG,t.tr),t.VY)
-try{P.vu(o.lock(s),t.z).R(0,new H.aZb(r),t.P).a3(new H.aZc(r))}catch(p){H.J(p)
+try{P.vv(o.lock(s),t.z).R(0,new H.aYY(r),t.P).a3(new H.aYZ(r))}catch(p){H.K(p)
q=P.fC(!1,t.C9)
return q}return r.a}}}return P.fC(!1,t.C9)}}
-H.aZa.prototype={
+H.aYX.prototype={
$1:function(a){var s=++this.a.a
-if(this.c!=window.innerWidth){a.bU(0)
-this.b.a22(null)}else if(s>5)a.bU(0)},
-$S:1047}
-H.aZb.prototype={
-$1:function(a){this.a.al(0,!0)},
+if(this.c!=window.innerWidth){a.bV(0)
+this.b.a22(null)}else if(s>5)a.bV(0)},
+$S:1035}
+H.aYY.prototype={
+$1:function(a){this.a.am(0,!0)},
$S:11}
-H.aZc.prototype={
-$1:function(a){this.a.al(0,!1)},
+H.aYZ.prototype={
+$1:function(a){this.a.am(0,!1)},
$S:11}
-H.b_a.prototype={
+H.aZX.prototype={
A:function(a){this.cq(0)}}
-H.aGr.prototype={}
-H.Ow.prototype={}
-H.aGq.prototype={}
-H.ate.prototype={
+H.aGu.prototype={}
+H.Oz.prototype={}
+H.aGt.prototype={}
+H.ath.prototype={
cq:function(a){var s
-C.b.sH(this.SD$,0)
-C.b.sH(this.Cc$,0)
+C.b.sH(this.SC$,0)
+C.b.sH(this.Cb$,0)
s=new H.dP(new Float32Array(16))
s.ft()
this.pC$=s},
-fb:function(a){var s,r,q=this,p=q.Cc$
+fc:function(a){var s,r,q=this,p=q.Cb$
p=p.length===0?q.a:C.b.gaS(p)
s=q.pC$
r=new H.dP(new Float32Array(16))
-r.er(s)
-q.SD$.push(new H.aGq(p,r))},
-fM:function(a){var s,r,q,p=this,o=p.SD$
+r.eo(s)
+q.SC$.push(new H.aGt(p,r))},
+fM:function(a){var s,r,q,p=this,o=p.SC$
if(o.length===0)return
s=o.pop()
p.pC$=s.b
-o=p.Cc$
+o=p.Cb$
r=s.a
q=p.a
while(!0){if(!((o.length===0?q:C.b.gaS(o))!==r))break
o.pop()}},
dm:function(a,b,c){this.pC$.dm(0,b,c)},
-l8:function(a,b,c){this.pC$.l8(0,b,c)},
-rm:function(a,b){this.pC$.acL(0,$.d1w(),b)},
-b3:function(a,b){this.pC$.i5(0,new H.dP(b))}}
-H.mL.prototype={
+l7:function(a,b,c){this.pC$.l7(0,b,c)},
+rm:function(a,b){this.pC$.acP(0,$.d0X(),b)},
+b4:function(a,b){this.pC$.i4(0,new H.dP(b))}}
+H.mK.prototype={
gw:function(a){return this.a}}
-H.agU.prototype={
-aHy:function(){var s,r,q=this,p=q.b
-if(p!=null)for(p=p.gdY(p),p=p.gaH(p);p.t();)for(s=J.a3(p.gC(p));s.t();){r=s.gC(s)
+H.agX.prototype={
+aHE:function(){var s,r,q=this,p=q.b
+if(p!=null)for(p=p.gdY(p),p=p.gaJ(p);p.t();)for(s=J.a2(p.gC(p));s.t();){r=s.gC(s)
r.b.$1(r.a)}q.b=q.a
q.a=null},
-YN:function(a,b){var s,r=this,q=r.a
-if(q==null)q=r.a=P.ab(t.N,r.$ti.h("D>"))
+YM:function(a,b){var s,r=this,q=r.a
+if(q==null)q=r.a=P.ab(t.N,r.$ti.h("D>"))
s=q.i(0,a)
-if(s==null){s=H.a([],r.$ti.h("Y>"))
+if(s==null){s=H.a([],r.$ti.h("Z>"))
q.E(0,a,s)
q=s}else q=s
q.push(b)},
-aQC:function(a){var s,r,q=this.b
+aQI:function(a){var s,r,q=this.b
if(q==null)return null
s=q.i(0,a)
if(s==null||s.length===0)return null
-r=(s&&C.b).f1(s,0)
-this.YN(a,r)
+r=(s&&C.b).f2(s,0)
+this.YM(a,r)
return r.a}}
-H.WJ.prototype={
+H.WM.prototype={
gw:function(a){return this.a}}
-H.bww.prototype={
-fb:function(a){var s=this.a
-s.a.WP()
+H.bwn.prototype={
+fc:function(a){var s=this.a
+s.a.WO()
s.c.push(C.DL);++s.r},
-zN:function(a,b,c){var s=this.a
+zL:function(a,b,c){var s=this.a
t.Vh.a(c)
s.d=!0
s.c.push(C.DL)
-s.a.WP();++s.r},
+s.a.WO();++s.r},
fM:function(a){var s,r,q=this.a
if(!q.f&&q.r>1){s=q.a
s.z=s.r.pop()
@@ -52463,16 +52379,16 @@ s.cx=r.b
s.cy=r.c
s.db=r.d
s.Q=!0}else if(s.Q)s.Q=!1}s=q.c
-if(s.length!==0&&C.b.gaS(s) instanceof H.a2A)s.pop()
+if(s.length!==0&&C.b.gaS(s) instanceof H.a2C)s.pop()
else s.push(C.X7);--q.r},
dm:function(a,b,c){var s=this.a,r=s.a
if(b!==0||c!==0)r.y=!1
r.z.dm(0,b,c)
-s.c.push(new H.aqG(b,c))},
-l8:function(a,b,c){var s=this.a,r=s.a
+s.c.push(new H.aqJ(b,c))},
+l7:function(a,b,c){var s=this.a,r=s.a
if(b!==1||c!==1)r.y=!1
-r.z.l8(0,b,c)
-s.c.push(new H.aqE(b,c))
+r.z.l7(0,b,c)
+s.c.push(new H.aqH(b,c))
return null},
rm:function(a,b){var s,r,q,p,o,n,m,l,k,j,i,h=this.a,g=h.a
if(b!==0)g.y=!1
@@ -52497,36 +52413,36 @@ g[4]=q*i+p*s
g[5]=o*i+n*s
g[6]=m*i+l*s
g[7]=k*i+j*s
-h.c.push(new H.aqD(b))},
-b3:function(a,b){var s=H.cKJ(b),r=this.a,q=r.a
-q.z.i5(0,new H.dP(s))
+h.c.push(new H.aqG(b))},
+b4:function(a,b){var s=H.cK7(b),r=this.a,q=r.a
+q.z.i4(0,new H.dP(s))
q.y=q.z.IL(0)
-r.c.push(new H.aqF(s))},
-BK:function(a,b,c,d){var s=this.a,r=new H.aqs(b,-1/0,-1/0,1/0,1/0)
-switch(c){case C.nt:s.a.R6(0,b,r)
+r.c.push(new H.aqI(s))},
+BJ:function(a,b,c,d){var s=this.a,r=new H.aqv(b,-1/0,-1/0,1/0,1/0)
+switch(c){case C.ns:s.a.R5(0,b,r)
break
case C.XI:break
default:H.b(H.M(u.I))}s.d=!0
s.c.push(r)},
-a6P:function(a,b,c){return this.BK(a,b,C.nt,c)},
-ll:function(a,b){return this.BK(a,b,C.nt,!0)},
-Hh:function(a,b,c){var s=this.a,r=new H.aqr(b,-1/0,-1/0,1/0,1/0)
-s.a.R6(0,new P.ax(b.a,b.b,b.c,b.d),r)
+a6T:function(a,b,c){return this.BJ(a,b,C.ns,c)},
+lk:function(a,b){return this.BJ(a,b,C.ns,!0)},
+Hh:function(a,b,c){var s=this.a,r=new H.aqu(b,-1/0,-1/0,1/0,1/0)
+s.a.R5(0,new P.ay(b.a,b.b,b.c,b.d),r)
s.d=!0
s.c.push(r)},
qJ:function(a,b){return this.Hh(a,b,!0)},
Hg:function(a,b,c){var s,r=this.a
t.Ci.a(b)
-s=new H.aqq(b,-1/0,-1/0,1/0,1/0)
-r.a.R6(0,b.lB(0),s)
+s=new H.aqt(b,-1/0,-1/0,1/0,1/0)
+r.a.R5(0,b.lA(0),s)
r.d=!0
r.c.push(s)},
-ot:function(a,b){return this.Hg(a,b,!0)},
+ov:function(a,b){return this.Hg(a,b,!0)},
qS:function(a,b,c,d){var s,r,q,p,o,n,m=this.a
t.Vh.a(d)
-s=Math.max(H.ae0(d),1)
+s=Math.max(H.ae3(d),1)
d.b=!0
-r=new H.aqw(b,c,d.a,-1/0,-1/0,1/0,1/0)
+r=new H.aqz(b,c,d.a,-1/0,-1/0,1/0,1/0)
q=b.a
p=c.a
o=b.b
@@ -52536,67 +52452,67 @@ m.e=m.d=!0
m.c.push(r)},
hD:function(a,b,c){this.a.hD(0,b,t.Vh.a(c))},
hm:function(a,b,c){this.a.hm(0,b,t.Vh.a(c))},
-ox:function(a,b,c,d){this.a.ox(0,b,c,t.Vh.a(d))},
-ja:function(a,b,c,d){var s,r,q,p,o,n=this.a
+oy:function(a,b,c,d){this.a.oy(0,b,c,t.Vh.a(d))},
+j8:function(a,b,c,d){var s,r,q,p,o,n=this.a
t.Vh.a(d)
n.e=n.d=!0
-s=H.ae0(d)
+s=H.ae3(d)
d.b=!0
-r=new H.aqt(b,c,d.a,-1/0,-1/0,1/0,1/0)
+r=new H.aqw(b,c,d.a,-1/0,-1/0,1/0,1/0)
q=c+s
p=b.a
o=b.b
n.a.wk(p-q,o-q,p+q,o+q,r)
n.c.push(r)},
HV:function(a,b,c,d,e,f){var s,r=P.dk()
-if(d<=-6.283185307179586){r.xO(0,b,c,-3.141592653589793,!0)
+if(d<=-6.283185307179586){r.xM(0,b,c,-3.141592653589793,!0)
c-=3.141592653589793
-r.xO(0,b,c,-3.141592653589793,!1)
+r.xM(0,b,c,-3.141592653589793,!1)
c-=3.141592653589793
d+=6.283185307179586
s=!1}else s=!0
-for(;d>=6.283185307179586;s=!1){r.xO(0,b,c,3.141592653589793,s)
+for(;d>=6.283185307179586;s=!1){r.xM(0,b,c,3.141592653589793,s)
c+=3.141592653589793
-r.xO(0,b,c,3.141592653589793,!1)
+r.xM(0,b,c,3.141592653589793,!1)
c+=3.141592653589793
-d-=6.283185307179586}r.xO(0,b,c,d,s)
+d-=6.283185307179586}r.xM(0,b,c,d,s)
this.a.fe(0,r,t.Vh.a(f))},
fe:function(a,b,c){this.a.fe(0,b,t.Vh.a(c))},
-yp:function(a,b,c,d,e){var s,r=this.a
+yn:function(a,b,c,d,e){var s,r=this.a
t.Vh.a(e)
e.b=r.e=r.d=!0
-s=new H.aqv(b,c,d,e.a,-1/0,-1/0,1/0,1/0)
-r.a.zK(d,s)
+s=new H.aqy(b,c,d,e.a,-1/0,-1/0,1/0,1/0)
+r.a.zI(d,s)
r.c.push(s)},
mi:function(a,b,c){this.a.mi(0,b,c)},
-yq:function(a,b,c,d,e){var s,r,q=this.a
+yo:function(a,b,c,d,e){var s,r,q=this.a
q.e=q.d=!0
-s=H.dyw(b.lB(0),d)
-r=new H.aqB(t.Ci.a(b),c,d,e,-1/0,-1/0,1/0,1/0)
-q.a.zK(s,r)
+s=H.dxU(b.lA(0),d)
+r=new H.aqE(t.Ci.a(b),c,d,e,-1/0,-1/0,1/0,1/0)
+q.a.zI(s,r)
q.c.push(r)}}
-H.WT.prototype={
-gnm:function(){return this.iD$},
+H.WW.prototype={
+gnm:function(){return this.iC$},
fG:function(a){var s=this.tr("flt-clip"),r=s.style
r.overflow="hidden"
r.zIndex="0"
r=W.p2("flt-clip-interior",null)
-this.iD$=r
+this.iC$=r
r=r.style
r.position="absolute"
-r=this.iD$
+r=this.iC$
r.toString
s.appendChild(r)
return s}}
-H.aqW.prototype={
-nP:function(){var s=this
+H.aqZ.prototype={
+nQ:function(){var s=this
s.f=s.e.f
s.x=s.fy
s.r=s.y=null},
fG:function(a){var s=this.LU(0)
s.setAttribute("clip-type","rect")
return s},
-lj:function(){var s,r=this.d.style,q=this.fy,p=q.a,o=H.f(p)+"px"
+li:function(){var s,r=this.d.style,q=this.fy,p=q.a,o=H.f(p)+"px"
r.left=o
o=q.b
s=H.f(o)+"px"
@@ -52605,24 +52521,24 @@ s=H.f(q.c-p)+"px"
r.width=s
q=H.f(q.d-o)+"px"
r.height=q
-r=this.iD$.style
+r=this.iC$.style
p=H.f(-p)+"px"
r.left=p
q=H.f(-o)+"px"
r.top=q},
-dR:function(a,b){this.ui(0,b)
-if(!J.j(this.fy,b.fy))this.lj()},
-$icMz:1}
-H.aqV.prototype={
-nP:function(){var s,r=this
+dS:function(a,b){this.ui(0,b)
+if(!J.j(this.fy,b.fy))this.li()},
+$icLX:1}
+H.aqY.prototype={
+nQ:function(){var s,r=this
r.f=r.e.f
s=r.fy
-r.x=new P.ax(s.a,s.b,s.c,s.d)
+r.x=new P.ay(s.a,s.b,s.c,s.d)
r.r=r.y=null},
fG:function(a){var s=this.LU(0)
s.setAttribute("clip-type","rrect")
return s},
-lj:function(){var s,r=this.d.style,q=this.fy,p=q.a,o=H.f(p)+"px"
+li:function(){var s,r=this.d.style,q=this.fy,p=q.a,o=H.f(p)+"px"
r.left=o
o=q.b
s=H.f(o)+"px"
@@ -52632,51 +52548,51 @@ r.width=s
s=H.f(q.d-o)+"px"
r.height=s
s=H.f(q.e)+"px"
-C.x.d7(r,C.x.ce(r,"border-top-left-radius"),s,"")
+C.x.d5(r,C.x.ce(r,"border-top-left-radius"),s,"")
s=H.f(q.r)+"px"
-C.x.d7(r,C.x.ce(r,"border-top-right-radius"),s,"")
+C.x.d5(r,C.x.ce(r,"border-top-right-radius"),s,"")
s=H.f(q.y)+"px"
-C.x.d7(r,C.x.ce(r,"border-bottom-right-radius"),s,"")
+C.x.d5(r,C.x.ce(r,"border-bottom-right-radius"),s,"")
q=H.f(q.Q)+"px"
-C.x.d7(r,C.x.ce(r,"border-bottom-left-radius"),q,"")
-q=this.iD$.style
+C.x.d5(r,C.x.ce(r,"border-bottom-left-radius"),q,"")
+q=this.iC$.style
p=H.f(-p)+"px"
q.left=p
r=H.f(-o)+"px"
q.top=r},
-dR:function(a,b){this.ui(0,b)
-if(!J.j(this.fy,b.fy))this.lj()},
-$icMy:1}
-H.a2K.prototype={
-nP:function(){var s,r,q,p,o=this
+dS:function(a,b){this.ui(0,b)
+if(!J.j(this.fy,b.fy))this.li()},
+$icLW:1}
+H.a2M.prototype={
+nQ:function(){var s,r,q,p,o=this
o.f=o.e.f
s=o.fy
r=s.a
-q=r.db?r.NH():null
-if(q!=null)o.x=new P.ax(q.a,q.b,q.c,q.d)
+q=r.db?r.NG():null
+if(q!=null)o.x=new P.ay(q.a,q.b,q.c,q.d)
else{s=s.a
-p=s.dx?s.NI():null
+p=s.dx?s.NH():null
if(p!=null)o.x=p
else o.x=null}o.r=o.y=null},
-YZ:function(){var s,r,q,p=this,o="box-shadow",n=p.d,m=H.d_k(p.go,p.id)
+YY:function(){var s,r,q,p=this,o="box-shadow",n=p.d,m=H.cZL(p.go,p.id)
if(m==null){n=n.style
n.toString
-C.x.d7(n,C.x.ce(n,o),"none","")}else{s=H.d0E(p.k2)
+C.x.d5(n,C.x.ce(n,o),"none","")}else{s=H.d04(p.k2)
n=n.style
r=m.b
q=s.a
q=H.f(r.a)+"px "+H.f(r.b)+"px "+H.f(m.a)+"px 0px rgba("+((16711680&q)>>>16)+", "+((65280&q)>>>8)+", "+((255&q)>>>0)+", "+H.f(((4278190080&q)>>>24)/255)+")"
n.toString
-C.x.d7(n,C.x.ce(n,o),q,"")}},
+C.x.d5(n,C.x.ce(n,o),q,"")}},
fG:function(a){var s=this.LU(0)
s.setAttribute("clip-type","physical-shape")
return s},
-lj:function(){var s=this,r=s.d.style,q=H.jo(s.k1)
+li:function(){var s=this,r=s.d.style,q=H.jo(s.k1)
r.toString
r.backgroundColor=q==null?"":q
-s.YZ()
-s.Z_()},
-Z_:function(){var s,r,q,p,o,n,m,l,k,j,i,h,g,f=this,e=null,d="border-radius",c="hidden",b=f.fy,a=b.a,a0=a.db?a.NH():e
+s.YY()
+s.YZ()},
+YZ:function(){var s,r,q,p,o,n,m,l,k,j,i,h,g,f=this,e=null,d="border-radius",c="hidden",b=f.fy,a=b.a,a0=a.db?a.NG():e
if(a0!=null){s=H.f(a0.e)+"px "+H.f(a0.r)+"px "+H.f(a0.y)+"px "+H.f(a0.Q)+"px"
r=f.d.style
b=a0.a
@@ -52689,15 +52605,15 @@ q=H.f(a0.c-b)+"px"
r.width=q
q=H.f(a0.d-a)+"px"
r.height=q
-C.x.d7(r,C.x.ce(r,d),s,"")
-q=f.iD$.style
+C.x.d5(r,C.x.ce(r,d),s,"")
+q=f.iC$.style
b=H.f(-b)+"px"
q.left=b
b=H.f(-a)+"px"
q.top=b
if(f.k3!==C.n)r.overflow=c
return}else{a=b.a
-p=a.dx?a.NI():e
+p=a.dx?a.NH():e
if(p!=null){r=f.d.style
b=p.a
a=H.f(b)+"px"
@@ -52709,15 +52625,15 @@ q=H.f(p.c-b)+"px"
r.width=q
q=H.f(p.d-a)+"px"
r.height=q
-C.x.d7(r,C.x.ce(r,d),"","")
-q=f.iD$.style
+C.x.d5(r,C.x.ce(r,d),"","")
+q=f.iC$.style
b=H.f(-b)+"px"
q.left=b
b=H.f(-a)+"px"
q.top=b
if(f.k3!==C.n)r.overflow=c
return}else{a=b.a
-o=(a.cy?a.fr:-1)===-1?e:a.lB(0)
+o=(a.cy?a.fr:-1)===-1?e:a.lA(0)
if(o!=null){b=o.c
a=o.a
n=(b-a)/2
@@ -52734,8 +52650,8 @@ b=H.f(n*2)+"px"
r.width=b
b=H.f(m*2)+"px"
r.height=b
-C.x.d7(r,C.x.ce(r,d),s,"")
-b=f.iD$.style
+C.x.d5(r,C.x.ce(r,d),s,"")
+b=f.iC$.style
a=H.f(-a)+"px"
b.left=a
a=H.f(-q)+"px"
@@ -52746,10 +52662,10 @@ q=a.a
l=a.b
k=a.c-q
a=a.d-l
-j=H.cZN(b,-q,-l,1/k,1/a)
+j=H.cZd(b,-q,-l,1/k,1/a)
b=f.k4
if(b!=null)J.fJ(b)
-b=W.ak1(j,new H.Xv(),e)
+b=W.ak4(j,new H.Xy(),e)
f.k4=b
i=$.fr()
h=f.d
@@ -52759,10 +52675,10 @@ i.toString
h.appendChild(b)
b=f.d
b.toString
-i.hV(b,"clip-path","url(#svgClip"+$.adX+")")
+i.hV(b,"clip-path","url(#svgClip"+$.ae_+")")
b=f.d
b.toString
-i.hV(b,"-webkit-clip-path","url(#svgClip"+$.adX+")")
+i.hV(b,"-webkit-clip-path","url(#svgClip"+$.ae_+")")
g=f.d.style
g.overflow=""
b=H.f(q)+"px"
@@ -52773,19 +52689,19 @@ b=H.f(k)+"px"
g.width=b
b=H.f(a)+"px"
g.height=b
-C.x.d7(g,C.x.ce(g,d),"","")
-b=f.iD$.style
+C.x.d5(g,C.x.ce(g,d),"","")
+b=f.iC$.style
q="-"+H.f(q)+"px"
b.left=q
a="-"+H.f(l)+"px"
b.top=a},
-dR:function(a,b){var s,r,q,p=this
+dS:function(a,b){var s,r,q,p=this
p.ui(0,b)
s=p.k1
if(!b.k1.B(0,s)){r=p.d.style
s=H.jo(s)
r.toString
-r.backgroundColor=s==null?"":s}if(b.id!=p.id||!b.k2.B(0,p.k2))p.YZ()
+r.backgroundColor=s==null?"":s}if(b.id!=p.id||!b.k2.B(0,p.k2))p.YY()
s=b.fy
r=b.k4
if(s!=p.fy){if(r!=null)J.fJ(r)
@@ -52800,21 +52716,21 @@ s.hV(r,"clip-path","")
r=p.d
r.toString
s.hV(r,"-webkit-clip-path","")
-p.Z_()}else{p.k4=r
+p.YZ()}else{p.k4=r
if(r!=null){s=$.fr()
q=p.d
q.toString
s.toString
q.appendChild(r)}b.k4=null}},
-$icNI:1}
-H.aqU.prototype={
+$icN5:1}
+H.aqX.prototype={
fG:function(a){return this.tr("flt-clippath")},
-nP:function(){var s=this
-s.aiT()
-if(s.x==null)s.x=s.fy.lB(0)},
-lj:function(){var s,r,q=this,p=q.id
+nQ:function(){var s=this
+s.aiX()
+if(s.x==null)s.x=s.fy.lA(0)},
+li:function(){var s,r,q=this,p=q.id
if(p!=null)J.fJ(p)
-p=W.ak1(H.d_u(t.py.a(q.d),q.fy),new H.Xv(),null)
+p=W.ak4(H.cZU(t.py.a(q.d),q.fy),new H.Xy(),null)
q.id=p
s=$.fr()
r=q.d
@@ -52822,123 +52738,123 @@ r.toString
p.toString
s.toString
r.appendChild(p)},
-dR:function(a,b){var s,r=this
+dS:function(a,b){var s,r=this
r.ui(0,b)
if(b.fy!=r.fy){r.x=null
s=b.id
if(s!=null)J.fJ(s)
-r.lj()}else r.id=b.id
+r.li()}else r.id=b.id
b.id=null},
px:function(){var s=this.id
if(s!=null)J.fJ(s)
this.id=null
this.Ep()},
-$icMx:1}
-H.a2I.prototype={
-nP:function(){var s,r,q=this,p=q.e.f
+$icLV:1}
+H.a2K.prototype={
+nQ:function(){var s,r,q=this,p=q.e.f
q.f=p
s=q.fy
if(s!==0||q.go!==0){p.toString
r=new H.dP(new Float32Array(16))
-r.er(p)
+r.eo(p)
q.f=r
r.dm(0,s,q.go)}q.y=q.r=null},
-gCx:function(){var s=this,r=s.y
-return r==null?s.y=H.cNw(-s.fy,-s.go,0):r},
+gCw:function(){var s=this,r=s.y
+return r==null?s.y=H.cMU(-s.fy,-s.go,0):r},
fG:function(a){var s=this.tr("flt-offset"),r=s.style
r.toString
-C.x.d7(r,C.x.ce(r,"transform-origin"),"0 0 0","")
+C.x.d5(r,C.x.ce(r,"transform-origin"),"0 0 0","")
return s},
-lj:function(){var s=this.d.style,r="translate("+H.f(this.fy)+"px, "+H.f(this.go)+"px)"
+li:function(){var s=this.d.style,r="translate("+H.f(this.fy)+"px, "+H.f(this.go)+"px)"
s.toString
-C.x.d7(s,C.x.ce(s,"transform"),r,"")},
-dR:function(a,b){var s=this
+C.x.d5(s,C.x.ce(s,"transform"),r,"")},
+dS:function(a,b){var s=this
s.ui(0,b)
-if(b.fy!==s.fy||b.go!==s.go)s.lj()},
-$icNE:1}
-H.a2J.prototype={
-nP:function(){var s,r,q,p=this,o=p.e.f
+if(b.fy!==s.fy||b.go!==s.go)s.li()},
+$icN1:1}
+H.a2L.prototype={
+nQ:function(){var s,r,q,p=this,o=p.e.f
p.f=o
s=p.go
r=s.a
q=s.b
if(r!==0||q!==0){o.toString
s=new H.dP(new Float32Array(16))
-s.er(o)
+s.eo(o)
p.f=s
s.dm(0,r,q)}p.r=p.y=null},
-gCx:function(){var s=this.y
+gCw:function(){var s=this.y
if(s==null){s=this.go
-s=this.y=H.cNw(-s.a,-s.b,0)}return s},
+s=this.y=H.cMU(-s.a,-s.b,0)}return s},
fG:function(a){var s=this.tr("flt-opacity"),r=s.style
r.toString
-C.x.d7(r,C.x.ce(r,"transform-origin"),"0 0 0","")
+C.x.d5(r,C.x.ce(r,"transform-origin"),"0 0 0","")
return s},
-lj:function(){var s=this,r=s.d.style,q=H.f(s.fy/255)
+li:function(){var s=this,r=s.d.style,q=H.f(s.fy/255)
r.toString
-C.x.d7(r,C.x.ce(r,"opacity"),q,"")
+C.x.d5(r,C.x.ce(r,"opacity"),q,"")
q=s.d.style
r=s.go
r="translate("+H.f(r.a)+"px, "+H.f(r.b)+"px)"
q.toString
-C.x.d7(q,C.x.ce(q,"transform"),r,"")},
-dR:function(a,b){var s=this
+C.x.d5(q,C.x.ce(q,"transform"),r,"")},
+dS:function(a,b){var s=this
s.ui(0,b)
-if(s.fy!=b.fy||!s.go.B(0,b.go))s.lj()},
-$icNF:1}
+if(s.fy!=b.fy||!s.go.B(0,b.go))s.li()},
+$icN2:1}
H.cE.prototype={
-saGr:function(a){var s=this
+saGx:function(a){var s=this
if(s.b){s.a=s.a.fV(0)
s.b=!1}s.a.a=a},
gfk:function(a){var s=this.a.b
-return s==null?C.bZ:s},
+return s==null?C.c_:s},
sfk:function(a,b){var s=this
if(s.b){s.a=s.a.fV(0)
s.b=!1}s.a.b=b},
-gjr:function(){var s=this.a.c
+gjp:function(){var s=this.a.c
return s==null?0:s},
-sjr:function(a){var s=this
+sjp:function(a){var s=this
if(s.b){s.a=s.a.fV(0)
s.b=!1}s.a.c=a},
-gwy:function(){var s=this.a.d
-return s==null?C.n5:s},
-swy:function(a){var s=this
+gwx:function(){var s=this.a.d
+return s==null?C.n4:s},
+swx:function(a){var s=this
if(s.b){s.a=s.a.fV(0)
s.b=!1}s.a.d=a},
sLs:function(a){var s=this
if(s.b){s.a=s.a.fV(0)
s.b=!1}s.a.e=a},
-sCr:function(a){var s=this
+sCq:function(a){var s=this
if(s.b){s.a=s.a.fV(0)
s.b=!1}s.a.f=a},
gc6:function(a){var s=this.a.r
-return s==null?C.Z:s},
+return s==null?C.Y:s},
sc6:function(a,b){var s,r=this
if(r.b){r.a=r.a.fV(0)
r.b=!1}s=r.a
-s.r=J.bk(b)===C.arA?b:new P.a4((b.gw(b)&4294967295)>>>0)},
-sTh:function(a){},
+s.r=J.bk(b)===C.arA?b:new P.a3((b.gw(b)&4294967295)>>>0)},
+sTg:function(a){},
srD:function(a){var s=this
if(s.b){s.a=s.a.fV(0)
s.b=!1}s.a.x=a},
-sTL:function(a){var s=this
+sTK:function(a){var s=this
if(s.b){s.a=s.a.fV(0)
s.b=!1}s.a.y=a},
-sSF:function(a){var s=this
+sSE:function(a){var s=this
if(s.b){s.a=s.a.fV(0)
s.b=!1}s.a.z=a},
-saHv:function(a){var s=this
+saHB:function(a){var s=this
if(s.b){s.a=s.a.fV(0)
s.b=!1}s.a.Q=a},
j:function(a){var s,r,q=this
if(q.gfk(q)===C.bL){s="Paint("+q.gfk(q).j(0)
-s=q.gjr()!==0?s+(" "+H.f(q.gjr())):s+" hairline"
-if(q.gwy()!==C.n5)s+=" "+q.gwy().j(0)
+s=q.gjp()!==0?s+(" "+H.f(q.gjp())):s+" hairline"
+if(q.gwx()!==C.n4)s+=" "+q.gwx().j(0)
r="; "}else{r=""
s="Paint("}if(!q.a.f){s+=r+"antialias off"
-r="; "}s=(!q.gc6(q).B(0,C.Z)?s+(r+q.gc6(q).j(0)):s)+")"
+r="; "}s=(!q.gc6(q).B(0,C.Y)?s+(r+q.gc6(q).j(0)):s)+")"
return s.charCodeAt(0)==0?s:s},
-$ideH:1}
+$ide4:1}
H.cH.prototype={
fV:function(a){var s=this,r=new H.cH()
r.a=s.a
@@ -52956,10 +52872,10 @@ return r},
j:function(a){var s=this.fE(0)
return s}}
H.nP.prototype={
-ad8:function(){var s,r,q,p,o,n,m,l,k,j=this,i=H.a([],t.yv),h=j.aqg(0.25),g=C.e.t5(1,h)
+adc:function(){var s,r,q,p,o,n,m,l,k,j=this,i=H.a([],t.yv),h=j.aqj(0.25),g=C.e.t5(1,h)
i.push(new P.a_(j.a,j.b))
-if(h===5){s=new H.aAy()
-j.ZB(s)
+if(h===5){s=new H.aAB()
+j.ZA(s)
r=s.a
r.toString
q=s.b
@@ -52972,7 +52888,7 @@ i.push(o)
i.push(new P.a_(q.e,q.f))
g=2
n=!0}else n=!1}else n=!1
-if(!n)H.cMD(j,h,i)
+if(!n)H.cM0(j,h,i)
m=2*g+1
k=0
while(!0){if(!(k=0)s.d=-r
s.f=s.e=-1},
-ol:function(a,b){this.a5W(b,0,0)},
+on:function(a,b){this.a6_(b,0,0)},
Fp:function(){var s,r=this.a,q=r.x
for(r=r.r,s=0;s0?0:1
g=c0/2
f=(c2.d-c2.b)/2
-e=c2.gef().a+g*Math.cos(p)
-d=c2.gef().b+f*Math.sin(p)
-if(o===m&&n===l){if(c5)b9.f9(0,e,d)
-else b9.Ox(e,d)
+e=c2.ged().a+g*Math.cos(p)
+d=c2.ged().b+f*Math.sin(p)
+if(o===m&&n===l){if(c5)b9.fa(0,e,d)
+else b9.Ow(e,d)
return}c=o*m+n*l
b=o*l-n*m
if(Math.abs(b)<=0.000244140625)if(c>0)if(!(b>=0&&h===0))c0=b<=0&&h===1
else c0=!0
else c0=!1
else c0=!1
-if(c0){if(c5)b9.f9(0,e,d)
-else b9.Ox(e,d)
+if(c0){if(c5)b9.fa(0,e,d)
+else b9.Ow(e,d)
return}c0=h===1
if(c0)b=-b
if(0===b)a=2
@@ -53167,10 +53083,10 @@ else{r=b<0
a=r?2:0
if(c<0!==r)++a}a0=H.a([],t.td)
for(a1=0;a10)a7-=6.283185307179586
if(Math.abs(a7)<0.0000031415926535897933){c2.dB(0,n,m)
-return}a8=C.e.eV(C.N.jx(Math.abs(a7/2.0943951023931953)))
+return}a8=C.e.eV(C.M.jw(Math.abs(a7/2.0943951023931953)))
a9=a7/a8
b0=Math.tan(a9/2)
if(!isFinite(b0))return
@@ -53271,15 +53187,15 @@ c0=Math.floor(c0+0.5)
c1=Math.floor(c1+0.5)}c2.mg(0,b8,b9,c0,c1,b1)}},
td:function(a,b){this.M5(b,0,0)},
M5:function(a,b,c){var s,r=this,q=r.Fp(),p=a.a,o=a.c,n=(p+o)/2,m=a.b,l=a.d,k=(m+l)/2
-if(b===0){r.f9(0,o,k)
+if(b===0){r.fa(0,o,k)
r.mg(0,o,l,n,l,0.707106781)
r.mg(0,p,l,p,k,0.707106781)
r.mg(0,p,m,n,m,0.707106781)
-r.mg(0,o,m,o,k,0.707106781)}else{r.f9(0,o,k)
+r.mg(0,o,m,o,k,0.707106781)}else{r.fa(0,o,k)
r.mg(0,o,m,n,m,0.707106781)
r.mg(0,p,m,p,k,0.707106781)
r.mg(0,p,l,n,l,0.707106781)
-r.mg(0,o,l,o,k,0.707106781)}r.dD(0)
+r.mg(0,o,l,o,k,0.707106781)}r.dC(0)
s=r.a
s.cy=q
s.dy=b===1
@@ -53294,27 +53210,27 @@ if(Math.abs(s-r-0)<0.000244140625){q=r+1
if(q<0)q+=4
p=d>0?0:1
this.M5(b,p,C.l.eV(q))
-return}}this.xO(0,b,c,d,!0)},
-a5U:function(a,b){var s,r,q,p,o,n=this,m=a.length
+return}}this.xM(0,b,c,d,!0)},
+a5Y:function(a,b){var s,r,q,p,o,n=this,m=a.length
if(m<=0)return
-s=n.a.nS(0,0)
+s=n.a.nU(0,0)
n.d=s+1
r=n.a
q=a[0]
-r.lE(s,q.a,q.b)
-n.a.afN(1,m-1)
+r.lD(s,q.a,q.b)
+n.a.afR(1,m-1)
for(r=n.a.f,p=1;ps.c||q>s.d)return!1
p=a3.a
-o=new H.bgN(p,r,q,new Float32Array(18))
-o.aFs()
+o=new H.bgE(p,r,q,new Float32Array(18))
+o.aFy()
n=C.PJ===a3.b
m=o.d
if((n?m&1:m)!==0)return!0
l=o.e
-if(l<=1)return C.bb.amI(l!==0,!1)
+if(l<=1)return C.bb.amM(l!==0,!1)
p=l&1
if(p!==0||n)return p!==0
-k=H.cUX(a3.a,!0)
+k=H.cUn(a3.a,!0)
j=new Float32Array(18)
i=H.a([],t.yv)
p=k.a
h=!1
do{g=i.length
switch(k.vN(0,j)){case 0:case 5:break
-case 1:H.dGP(j,r,q,i)
+case 1:H.dGa(j,r,q,i)
break
-case 2:H.dGQ(j,r,q,i)
+case 2:H.dGb(j,r,q,i)
break
case 3:f=k.f
-H.dGN(j,r,q,p.z[f],i)
+H.dG8(j,r,q,p.z[f],i)
break
-case 4:H.dGO(j,r,q,i)
+case 4:H.dG9(j,r,q,i)
break
case 6:h=!0
break}f=i.length
@@ -53380,7 +53296,7 @@ if(f>g){e=f-1
d=i[e]
c=d.a
b=d.b
-if(Math.abs(c*c+b*b-0)<0.000244140625)C.b.P(i,e)
+if(Math.abs(c*c+b*b-0)<0.000244140625)C.b.O(i,e)
else for(a=0;a0?1:0
f=f<=0}else f=!1}else f=!1
-if(f){a2=C.b.f1(i,e)
+if(f){a2=C.b.f2(i,e)
if(a!==i.length)i[a]=a2
break}}}}while(!h)
return i.length!==0||!1},
-fD:function(a){var s,r=a.a,q=a.b,p=this.a,o=H.deI(p,r,q),n=p.e,m=new Uint8Array(n)
-C.aH.X5(m,0,p.r)
-o=new H.SW(o,m)
+fD:function(a){var s,r=a.a,q=a.b,p=this.a,o=H.de5(p,r,q),n=p.e,m=new Uint8Array(n)
+C.aH.X4(m,0,p.r)
+o=new H.T_(o,m)
n=p.y
o.y=n
o.Q=p.Q
@@ -53405,7 +53321,7 @@ if(p.z!=null){n=new Float32Array(n)
o.z=n
s=p.z
s.toString
-C.alZ.X5(n,0,s)}o.e=p.e
+C.alZ.X4(n,0,s)}o.e=p.e
o.x=p.x
o.c=p.c
o.d=p.d
@@ -53420,19 +53336,19 @@ o.db=p.db
o.dx=p.dx
o.dy=p.dy
o.fr=p.fr
-r=new H.Mz(o,C.oB)
-r.a_8(this)
+r=new H.MB(o,C.oB)
+r.a_7(this)
return r},
-lB:function(e2){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d,c,b,a,a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,b0,b1,b2,b3,b4,b5,b6,b7,b8,b9,c0,c1,c2,c3,c4,c5,c6,c7,c8,c9,d0,d1,d2,d3,d4,d5,d6,d7,d8,d9,e0=this,e1=e0.a
+lA:function(e2){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d,c,b,a,a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,b0,b1,b2,b3,b4,b5,b6,b7,b8,b9,c0,c1,c2,c3,c4,c5,c6,c7,c8,c9,d0,d1,d2,d3,d4,d5,d6,d7,d8,d9,e0=this,e1=e0.a
if((e1.db?e1.fr:-1)===-1)s=(e1.cy?e1.fr:-1)!==-1
else s=!0
-if(s)return e1.lB(0)
+if(s)return e1.lA(0)
if(!e1.ch&&e1.b!=null){e1=e1.b
e1.toString
-return e1}r=new H.SX(e1)
+return e1}r=new H.T0(e1)
r.Ew(e1)
q=e0.a.f
-for(p=!1,o=0,n=0,m=0,l=0,k=0,j=0,i=0,h=0,g=null,f=null,e=null;d=r.aNA(),d!==6;){c=r.e
+for(p=!1,o=0,n=0,m=0,l=0,k=0,j=0,i=0,h=0,g=null,f=null,e=null;d=r.aNG(),d!==6;){c=r.e
switch(d){case 0:j=q[c]
h=q[c+1]
i=h
@@ -53443,7 +53359,7 @@ h=q[c+3]
i=h
k=j
break
-case 2:if(f==null)f=new H.c00()
+case 2:if(f==null)f=new H.c_J()
b=c+1
a=q[c]
a0=b+1
@@ -53495,7 +53411,7 @@ k=s}else{h=a8
j=a7
i=a6
k=s}break
-case 3:if(e==null)e=new H.bJX()
+case 3:if(e==null)e=new H.bJB()
s=e1.z[r.b]
b=c+1
a=q[c]
@@ -53511,7 +53427,7 @@ e.a=Math.min(a,a4)
e.b=Math.min(a1,a5)
e.c=Math.max(a,a4)
e.d=Math.max(a1,a5)
-c0=new H.yy()
+c0=new H.yx()
c1=a4-a
c2=s*(a2-a)
if(c0.tx(s*c1-c1,c1-2*c2,c2)!==0){a6=c0.a
@@ -53543,7 +53459,7 @@ i=e.b
j=e.c
h=e.d
break
-case 4:if(g==null)g=new H.bKn()
+case 4:if(g==null)g=new H.bK1()
b=c+1
c7=q[c]
a0=b+1
@@ -53623,30 +53539,30 @@ o=k
p=!0}else{o=Math.min(o,k)
m=Math.max(m,j)
n=Math.min(n,i)
-l=Math.max(l,h)}}d9=p?new P.ax(o,n,m,l):C.cq
-e0.a.lB(0)
+l=Math.max(l,h)}}d9=p?new P.ay(o,n,m,l):C.cr
+e0.a.lA(0)
return e0.a.b=d9},
gag:function(a){return 0===this.a.x},
j:function(a){var s=this.fE(0)
return s},
-$iaqL:1}
-H.c28.prototype={
-a8B:function(a){return(this.a*a+this.c)*a+this.e},
-a8C:function(a){return(this.b*a+this.d)*a+this.f}}
-H.SW.prototype={
-lE:function(a,b,c){var s=a*2,r=this.f
+$iaqO:1}
+H.c1R.prototype={
+a8F:function(a){return(this.a*a+this.c)*a+this.e},
+a8G:function(a){return(this.b*a+this.d)*a+this.f}}
+H.T_.prototype={
+lD:function(a,b,c){var s=a*2,r=this.f
r[s]=b
r[s+1]=c},
-BA:function(a){var s=this.f,r=a*2
+Bz:function(a){var s=this.f,r=a*2
return new P.a_(s[r],s[r+1])},
-lB:function(a){var s
-if(this.ch)this.MQ()
+lA:function(a){var s
+if(this.ch)this.MP()
s=this.a
s.toString
return s},
-NI:function(){var s=this
-return new P.ax(s.BA(0).a,s.BA(0).b,s.BA(1).a,s.BA(2).b)},
-NH:function(){var s,r,q,p,o,n,m,l,k,j,i,h,g=this.lB(0),f=H.a([],t.kG),e=new H.SX(this)
+NH:function(){var s=this
+return new P.ay(s.Bz(0).a,s.Bz(0).b,s.Bz(1).a,s.Bz(2).b)},
+NG:function(){var s,r,q,p,o,n,m,l,k,j,i,h,g=this.lA(0),f=H.a([],t.kG),e=new H.T0(this)
e.Ew(this)
s=new Float32Array(8)
e.vN(0,s)
@@ -53661,12 +53577,12 @@ i=Math.abs(k-o)}else{i=Math.abs(m)
j=m!==0?Math.abs(l-p):Math.abs(n)}f.push(new P.dy(j,i));++r}l=f[0]
k=f[1]
h=f[2]
-return P.a33(g,f[3],h,l,k)},
+return P.a36(g,f[3],h,l,k)},
B:function(a,b){if(b==null)return!1
if(this===b)return!0
if(J.bk(b)!==H.aY(this))return!1
-return this.aJW(t.vI.a(b))},
-aJW:function(a){var s,r,q,p,o,n,m,l=this
+return this.aK1(t.vI.a(b))},
+aK1:function(a){var s,r,q,p,o,n,m,l=this
if(l.fx!==a.fx)return!1
s=l.d
if(s!==a.d)return!1
@@ -53680,29 +53596,29 @@ for(o=0;oq.c){s=a+10
q.c=s
r=new Float32Array(s*2)
r.set.apply(r,[q.f])
q.f=r}q.d=a},
-a3j:function(a){var s,r,q=this
+a3m:function(a){var s,r,q=this
if(a>q.e){s=a+8
q.e=s
r=new Uint8Array(s)
r.set.apply(r,[q.r])
q.r=r}q.x=a},
-a3h:function(a){var s,r,q=this
+a3k:function(a){var s,r,q=this
if(a>q.y){s=a+4
q.y=s
r=new Float32Array(s)
s=q.z
if(s!=null)r.set.apply(r,[s])
q.z=r}q.Q=a},
-MQ:function(){var s,r,q,p,o,n,m,l,k,j,i=this,h=i.d
+MP:function(){var s,r,q,p,o,n,m,l,k,j,i=this,h=i.d
i.ch=!1
i.b=null
-if(h===0){i.a=C.cq
+if(h===0){i.a=C.cr
i.cx=!0}else{s=i.f
r=s[0]
q=s[1]
@@ -53713,10 +53629,10 @@ p=p*k*j
m=Math.min(m,k)
n=Math.min(n,j)
r=Math.max(r,k)
-q=Math.max(q,j)}if(p*0===0){i.a=new P.ax(m,n,r,q)
-i.cx=!0}else{i.a=C.cq
+q=Math.max(q,j)}if(p*0===0){i.a=new P.ay(m,n,r,q)
+i.cx=!0}else{i.a=C.cr
i.cx=!1}}},
-nS:function(a,b){var s,r,q,p,o,n=this
+nU:function(a,b){var s,r,q,p,o,n=this
switch(a){case 0:s=1
r=0
break
@@ -53744,14 +53660,14 @@ break}n.fx|=r
n.ch=!0
n.Ln()
q=n.x
-n.a3j(q+1)
+n.a3m(q+1)
n.r[q]=a
if(3===a){p=n.Q
-n.a3h(p+1)
+n.a3k(p+1)
n.z[p]=b}o=n.d
-n.a3i(o+s)
+n.a3l(o+s)
return o},
-afN:function(a,b){var s,r,q,p,o,n,m=this
+afR:function(a,b){var s,r,q,p,o,n,m=this
m.Ln()
switch(a){case 0:s=b
r=0
@@ -53779,24 +53695,24 @@ r=0
break}m.fx|=r
m.ch=!0
m.Ln()
-if(3===a)m.a3h(m.Q+b)
+if(3===a)m.a3k(m.Q+b)
q=m.x
-m.a3j(q+b)
+m.a3m(q+b)
for(p=m.r,o=0;om){l.a=m
l.b=s}else if(s===m)return 1}return o}}
-H.bgN.prototype={
-aFs:function(){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e=this,d=e.a,c=H.cUX(d,!0)
+H.bgE.prototype={
+aFy:function(){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e=this,d=e.a,c=H.cUn(d,!0)
for(s=e.f,r=t.td;q=c.vN(0,s),q!==6;)switch(q){case 0:case 5:break
-case 1:e.aqd()
+case 1:e.aqg()
break
-case 2:p=!H.cUZ(s)?H.deJ(s):0
-o=e.a_0(s[0],s[1],s[2],s[3],s[4],s[5])
-e.d+=p>0?o+e.a_0(s[4],s[5],s[6],s[7],s[8],s[9]):o
+case 2:p=!H.cUp(s)?H.de6(s):0
+o=e.a__(s[0],s[1],s[2],s[3],s[4],s[5])
+e.d+=p>0?o+e.a__(s[4],s[5],s[6],s[7],s[8],s[9]):o
break
case 3:n=d.z[c.f]
m=s[0]
@@ -53924,15 +53840,15 @@ k=s[2]
j=s[3]
i=s[4]
h=s[5]
-g=H.cUZ(s)
+g=H.cUp(s)
f=H.a([],r)
-new H.nP(m,l,k,j,i,h,n).aHc(f)
-e.a__(f[0])
-if(!g&&f.length===2)e.a__(f[1])
+new H.nP(m,l,k,j,i,h,n).aHi(f)
+e.ZZ(f[0])
+if(!g&&f.length===2)e.ZZ(f[1])
break
-case 4:e.aqb()
+case 4:e.aqe()
break}},
-aqd:function(){var s,r,q,p,o,n=this,m=n.f,l=m[0],k=m[1],j=m[2],i=m[3]
+aqg:function(){var s,r,q,p,o,n=this,m=n.f,l=m[0],k=m[1],j=m[2],i=m[3]
if(k>i){s=k
r=i
q=-1}else{s=i
@@ -53940,13 +53856,13 @@ r=k
q=1}m=n.c
if(ms)return
p=n.b
-if(H.bgO(p,m,l,k,j,i)){++n.e
+if(H.bgF(p,m,l,k,j,i)){++n.e
return}if(m===s)return
o=(j-l)*(m-k)-(i-k)*(p-l)
if(o===0){if(p!==j||m!==i)++n.e
-q=0}else if(H.dg7(o)===q)q=0
+q=0}else if(H.dfv(o)===q)q=0
n.d+=q},
-a_0:function(a,b,c,d,e,f){var s,r,q,p,o,n,m,l,k=this
+a__:function(a,b,c,d,e,f){var s,r,q,p,o,n,m,l,k=this
if(b>f){s=b
r=f
q=-1}else{s=f
@@ -53954,15 +53870,15 @@ r=b
q=1}p=k.c
if(ps)return 0
o=k.b
-if(H.bgO(o,p,a,b,e,f)){++k.e
+if(H.bgF(o,p,a,b,e,f)){++k.e
return 0}if(p===s)return 0
-n=new H.yy()
+n=new H.yx()
if(0===n.tx(b-2*d+f,2*(d-b),b-p))m=q===1?a:e
else{l=n.a
l.toString
m=((e-2*c+a)*l+2*(c-a))*l+a}if(Math.abs(m-o)<0.000244140625)if(o!==e||p!==f){++k.e
return 0}return mg){s=h
r=g
q=-1}else{s=g
@@ -53970,20 +53886,20 @@ r=h
q=1}p=i.c
if(ps)return
o=i.b
-if(H.bgO(o,p,a.a,h,a.e,g)){++i.e
+if(H.bgF(o,p,a.a,h,a.e,g)){++i.e
return}if(p===s)return
n=a.r
m=a.d*n-p*n+p
-l=new H.yy()
+l=new H.yx()
if(0===l.tx(g+(h-2*m),2*(m-h),h-p))k=q===1?a.a:a.e
else{j=l.a
j.toString
-k=H.dmc(a.a,a.c,a.e,n,j)/H.dmb(n,j)}if(Math.abs(k-o)<0.000244140625)if(o!==a.e||p!==a.f){++i.e
+k=H.dlA(a.a,a.c,a.e,n,j)/H.dlz(n,j)}if(Math.abs(k-o)<0.000244140625)if(o!==a.e||p!==a.f){++i.e
return}p=i.d
i.d=p+(kp)return
l=g.b
-if(H.bgO(l,m,d,b,r,q)){++g.e
+if(H.bgF(l,m,d,b,r,q)){++g.e
return}if(m===p)return
k=Math.min(d,Math.min(a,Math.min(s,r)))
j=Math.max(d,Math.max(a,Math.max(s,r)))
if(lj){g.d+=n
-return}i=H.cZ8(f,a0,m)
+return}i=H.cYz(f,a0,m)
if(i==null)return
-h=H.cZn(d,a,s,r,i)
+h=H.cYO(d,a,s,r,i)
if(Math.abs(h-l)<0.000244140625)if(l!==r||m!==q){++g.e
return}f=g.d
g.d=f+(h1,o=null,n=1/0,m=0;m<$.ae4.length;++m){l=$.ae4[m]
+s.push(new H.EA(new P.aZ(r.c-r.a,r.d-r.b),new H.biv(q)))}},
+ast:function(a){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d=a.c-a.a,c=a.d-a.b
+for(s=d+1,r=c+1,q=d*c,p=q>1,o=null,n=1/0,m=0;m<$.ae7.length;++m){l=$.ae7[m]
k=window.devicePixelRatio
j=k==null||k===0?1:k
if(l.z!==j)continue
@@ -54266,41 +54182,41 @@ i=j.c-j.a
j=j.d-j.b
h=i*j
k=window.devicePixelRatio
-if(l.r>=C.l.jx(s*(k==null||k===0?1:k))+2){k=window.devicePixelRatio
-g=l.x>=C.l.jx(r*(k==null||k===0?1:k))+2}else g=!1
+if(l.r>=C.l.jw(s*(k==null||k===0?1:k))+2){k=window.devicePixelRatio
+g=l.x>=C.l.jw(r*(k==null||k===0?1:k))+2}else g=!1
f=h4)){if(i===d&&j===c){o=l
break}n=h
-o=l}}if(o!=null){C.b.P($.ae4,o)
-o.sa6B(0,a)
+o=l}}if(o!=null){C.b.O($.ae7,o)
+o.sa6F(0,a)
o.b=this.k3
-return o}e=H.daw(a)
+return o}e=H.d9T(a)
e.b=this.k3
return e},
-Z0:function(){var s=this.d.style,r="translate("+H.f(this.fy)+"px, "+H.f(this.go)+"px)"
+Z_:function(){var s=this.d.style,r="translate("+H.f(this.fy)+"px, "+H.f(this.go)+"px)"
s.toString
-C.x.d7(s,C.x.ce(s,"transform"),r,"")},
-lj:function(){this.Z0()
+C.x.d5(s,C.x.ce(s,"transform"),r,"")},
+li:function(){this.Z_()
this.EC(null)},
-p:function(a){this.MR(null)
-this.Y6(0)},
-dR:function(a,b){var s,r=this
+p:function(a){this.MQ(null)
+this.Y5(0)},
+dS:function(a,b){var s,r=this
r.LH(0,b)
r.k3=b.k3
-if(r.fy!=b.fy||r.go!=b.go)r.Z0()
-s=r.MR(b)
+if(r.fy!=b.fy||r.go!=b.go)r.Z_()
+s=r.MQ(b)
if(r.id==b.id)if(s)r.EC(b)
else r.fx=b.fx
else r.EC(b)},
tW:function(){var s=this
-s.Y8()
-if(s.MR(s))s.EC(s)},
-px:function(){H.clv(this.fx)
-this.Y7()}}
-H.biE.prototype={
+s.Y7()
+if(s.MQ(s))s.EC(s)},
+px:function(){H.cl3(this.fx)
+this.Y6()}}
+H.biv.prototype={
$0:function(){var s,r=this.a,q=r.k4
q.toString
-r.fx=r.asq(q)
+r.fx=r.ast(q)
q=$.fr()
s=r.d
s.toString
@@ -54308,79 +54224,79 @@ q.qH(s)
s=r.d
s.toString
q=r.fx
-s.appendChild(q.gVo(q))
+s.appendChild(q.gVn(q))
r.fx.cq(0)
q=r.id.a
q.toString
s=r.fx
s.toString
-q.QA(s,r.k4)},
+q.Qz(s,r.k4)},
$S:0}
-H.a2L.prototype={
-ga43:function(){return this.k3?this.k2:H.b(H.R("Field '_shadowRoot' has not been initialized."))},
+H.a2N.prototype={
+ga47:function(){return this.k3?this.k2:H.b(H.R("Field '_shadowRoot' has not been initialized."))},
fG:function(a){var s,r,q=this,p=q.tr("flt-platform-view"),o=p.style
o.toString
-C.x.d7(o,C.x.ce(o,"pointer-events"),"auto","")
+C.x.d5(o,C.x.ce(o,"pointer-events"),"auto","")
o=p.style
o.overflow="hidden"
o=t.N
-o=p.attachShadow(P.d_m(P.l(["mode","open"],o,o)))
+o=p.attachShadow(P.cZN(P.l(["mode","open"],o,o)))
q.k3=!0
q.k2=o
s=document.createElement("style")
-C.BG.Xc(s," :host {\n all: initial;\n }")
-q.ga43().appendChild(s)
+C.BG.Xb(s," :host {\n all: initial;\n }")
+q.ga47().appendChild(s)
o=q.fx
-r=$.aew().b.i(0,o)
-if(r!=null)q.ga43().appendChild(r)
+r=$.aez().b.i(0,o)
+if(r!=null)q.ga47().appendChild(r)
else{window
o="No platform view created for id "+H.f(o)
if(typeof console!="undefined")window.console.warn(o)}return p},
-lj:function(){var s,r,q,p=this,o=p.d.style,n="translate("+H.f(p.fy)+"px, "+H.f(p.go)+"px)"
+li:function(){var s,r,q,p=this,o=p.d.style,n="translate("+H.f(p.fy)+"px, "+H.f(p.go)+"px)"
o.toString
-C.x.d7(o,C.x.ce(o,"transform"),n,"")
+C.x.d5(o,C.x.ce(o,"transform"),n,"")
n=p.id
s=H.f(n)+"px"
o.width=s
s=p.k1
r=H.f(s)+"px"
o.height=r
-q=$.aew().b.i(0,p.fx)
+q=$.aez().b.i(0,p.fx)
if(q!=null){o=q.style
n=H.f(n)+"px"
o.width=n
n=H.f(s)+"px"
o.height=n}},
-Ha:function(a){if(this.aiU(a))return this.fx==t.w7.a(a).fx
+Ha:function(a){if(this.aiY(a))return this.fx==t.w7.a(a).fx
return!1},
J3:function(a){return a.fx==this.fx?0:1},
-dR:function(a,b){var s=this
+dS:function(a,b){var s=this
s.LH(0,b)
-if(s.fy!=b.fy||s.go!=b.go||s.id!==b.id||s.k1!==b.k1)s.lj()}}
-H.bn_.prototype={
-QA:function(a,b){var s,r,q,p,o,n,m,l
+if(s.fy!=b.fy||s.go!=b.go||s.id!==b.id||s.k1!==b.k1)s.li()}}
+H.bmQ.prototype={
+Qz:function(a,b){var s,r,q,p,o,n,m,l
try{b.toString
m=this.b
m.toString
-if(H.d0w(b,m))for(s=0,m=this.c,r=m.length;sq||l>p||k>o||j>n)return
f.e=f.d=!0
-i=H.ae0(a4)
+i=H.ae3(a4)
a4.b=!0
-h=new H.aqu(a2,a3,a4.a,-1/0,-1/0,1/0,1/0)
+h=new H.aqx(a2,a3,a4.a,-1/0,-1/0,1/0,1/0)
g=P.dk()
-g.saKk(C.PJ)
-g.lK(a2)
-g.lK(a3)
-g.dD(0)
+g.saKq(C.PJ)
+g.lJ(a2)
+g.lJ(a3)
+g.dC(0)
h.y=g
f.a.wk(d-i,c-i,b+i,a+i,h)
f.c.push(h)},
fe:function(a,b,c){var s,r,q,p,o,n,m,l,k,j=this
if(c.a.x==null){t.Ci.a(b)
s=b.a
-r=s.dx?s.NI():null
+r=s.dx?s.NH():null
if(r!=null){j.hD(0,r,c)
return}s=b.a
-q=s.db?s.NH():null
+q=s.db?s.NG():null
if(q!=null){j.hm(0,q,c)
return}}t.Ci.a(b)
if(b.a.x!==0){j.e=j.d=!0
-p=b.lB(0)
-o=H.ae0(c)
+p=b.lA(0)
+o=H.ae3(c)
if(o!==0)p=p.kl(o)
s=b.a
-n=new H.SW(s.f,s.r)
+n=new H.T_(s.f,s.r)
n.e=s.e
n.x=s.x
n.c=s.c
@@ -54450,11 +54366,11 @@ n.db=s.db
n.dx=s.dx
n.dy=s.dy
n.fr=s.fr
-l=new H.Mz(n,C.oB)
-l.a_8(b)
+l=new H.MB(n,C.oB)
+l.a_7(b)
c.b=!0
-k=new H.aqy(l,c.a,-1/0,-1/0,1/0,1/0)
-j.a.zK(p,k)
+k=new H.aqB(l,c.a,-1/0,-1/0,1/0,1/0)
+j.a.zI(p,k)
l.b=b.b
j.c.push(k)}},
mi:function(a,b,c){var s,r,q,p=this
@@ -54464,96 +54380,96 @@ p.e=!0
if(b.b.ch!=null)p.d=!0
s=c.a
r=c.b
-q=new H.aqx(b,c,-1/0,-1/0,1/0,1/0)
-p.a.wk(s,r,s+b.geI(b),r+b.gey(b),q)
+q=new H.aqA(b,c,-1/0,-1/0,1/0,1/0)
+p.a.wk(s,r,s+b.geF(b),r+b.gew(b),q)
p.c.push(q)}}
-H.i7.prototype={}
-H.a_r.prototype={
-aLZ:function(a){var s=this
+H.i6.prototype={}
+H.a_t.prototype={
+aM4:function(a){var s=this
if(s.a)return!0
return s.ea.d||s.da.c}}
-H.a2A.prototype={
-jV:function(a){a.fb(0)},
-j:function(a){var s=this.fE(0)
-return s}}
-H.aqC.prototype={
-jV:function(a){a.fM(0)},
-j:function(a){var s=this.fE(0)
-return s}}
-H.aqG.prototype={
-jV:function(a){a.dm(0,this.a,this.b)},
-j:function(a){var s=this.fE(0)
-return s}}
-H.aqE.prototype={
-jV:function(a){a.l8(0,this.a,this.b)},
-j:function(a){var s=this.fE(0)
-return s}}
-H.aqD.prototype={
-jV:function(a){a.rm(0,this.a)},
+H.a2C.prototype={
+jT:function(a){a.fc(0)},
j:function(a){var s=this.fE(0)
return s}}
H.aqF.prototype={
-jV:function(a){a.b3(0,this.a)},
+jT:function(a){a.fM(0)},
j:function(a){var s=this.fE(0)
return s}}
-H.aqs.prototype={
-jV:function(a){a.ll(0,this.f)},
+H.aqJ.prototype={
+jT:function(a){a.dm(0,this.a,this.b)},
j:function(a){var s=this.fE(0)
return s}}
-H.aqr.prototype={
-jV:function(a){a.qJ(0,this.f)},
+H.aqH.prototype={
+jT:function(a){a.l7(0,this.a,this.b)},
j:function(a){var s=this.fE(0)
return s}}
-H.aqq.prototype={
-jV:function(a){a.ot(0,this.f)},
+H.aqG.prototype={
+jT:function(a){a.rm(0,this.a)},
j:function(a){var s=this.fE(0)
return s}}
-H.aqw.prototype={
-jV:function(a){a.qS(0,this.f,this.r,this.x)},
-j:function(a){var s=this.fE(0)
-return s}}
-H.aqA.prototype={
-jV:function(a){a.hD(0,this.f,this.r)},
-j:function(a){var s=this.fE(0)
-return s}}
-H.aqz.prototype={
-jV:function(a){a.hm(0,this.f,this.r)},
-j:function(a){var s=this.fE(0)
-return s}}
-H.aqu.prototype={
-jV:function(a){a.fe(0,this.y,this.x)},
-j:function(a){var s=this.fE(0)
-return s}}
-H.aqt.prototype={
-jV:function(a){a.ja(0,this.f,this.r,this.x)},
-j:function(a){var s=this.fE(0)
-return s}}
-H.aqy.prototype={
-jV:function(a){a.fe(0,this.f,this.r)},
-j:function(a){var s=this.fE(0)
-return s}}
-H.aqB.prototype={
-jV:function(a){var s=this
-a.yq(0,s.f,s.r,s.x,s.y)},
+H.aqI.prototype={
+jT:function(a){a.b4(0,this.a)},
j:function(a){var s=this.fE(0)
return s}}
H.aqv.prototype={
-jV:function(a){var s=this
-a.yp(0,s.f,s.r,s.x,s.y)},
+jT:function(a){a.lk(0,this.f)},
+j:function(a){var s=this.fE(0)
+return s}}
+H.aqu.prototype={
+jT:function(a){a.qJ(0,this.f)},
+j:function(a){var s=this.fE(0)
+return s}}
+H.aqt.prototype={
+jT:function(a){a.ov(0,this.f)},
+j:function(a){var s=this.fE(0)
+return s}}
+H.aqz.prototype={
+jT:function(a){a.qS(0,this.f,this.r,this.x)},
+j:function(a){var s=this.fE(0)
+return s}}
+H.aqD.prototype={
+jT:function(a){a.hD(0,this.f,this.r)},
+j:function(a){var s=this.fE(0)
+return s}}
+H.aqC.prototype={
+jT:function(a){a.hm(0,this.f,this.r)},
j:function(a){var s=this.fE(0)
return s}}
H.aqx.prototype={
-jV:function(a){a.mi(0,this.f,this.r)},
+jT:function(a){a.fe(0,this.y,this.x)},
j:function(a){var s=this.fE(0)
return s}}
-H.bXZ.prototype={
-R6:function(a,b,c){var s,r,q,p,o=this,n=b.a,m=b.b,l=b.c,k=b.d
-if(!o.y){s=$.cQZ()
+H.aqw.prototype={
+jT:function(a){a.j8(0,this.f,this.r,this.x)},
+j:function(a){var s=this.fE(0)
+return s}}
+H.aqB.prototype={
+jT:function(a){a.fe(0,this.f,this.r)},
+j:function(a){var s=this.fE(0)
+return s}}
+H.aqE.prototype={
+jT:function(a){var s=this
+a.yo(0,s.f,s.r,s.x,s.y)},
+j:function(a){var s=this.fE(0)
+return s}}
+H.aqy.prototype={
+jT:function(a){var s=this
+a.yn(0,s.f,s.r,s.x,s.y)},
+j:function(a){var s=this.fE(0)
+return s}}
+H.aqA.prototype={
+jT:function(a){a.mi(0,this.f,this.r)},
+j:function(a){var s=this.fE(0)
+return s}}
+H.bXT.prototype={
+R5:function(a,b,c){var s,r,q,p,o=this,n=b.a,m=b.b,l=b.c,k=b.d
+if(!o.y){s=$.cQo()
s[0]=n
s[1]=m
s[2]=l
s[3]=k
-H.cQb(o.z,s)
+H.cPA(o.z,s)
n=s[0]
m=s[1]
l=s[2]
@@ -54578,15 +54494,15 @@ else{c.b=s
c.c=p
c.d=q
c.e=r}},
-zK:function(a,b){this.wk(a.a,a.b,a.c,a.d,b)},
+zI:function(a,b){this.wk(a.a,a.b,a.c,a.d,b)},
wk:function(a,b,c,d,e){var s,r,q,p,o,n,m,l,k,j=this
if(a==c||b==d){e.a=!0
-return}if(!j.y){s=$.cQZ()
+return}if(!j.y){s=$.cQo()
s[0]=a
s[1]=b
s[2]=c
s[3]=d
-H.cQb(j.z,s)
+H.cPA(j.z,s)
r=s[0]
q=s[1]
p=s[2]
@@ -54615,13 +54531,13 @@ j.f=Math.max(Math.max(j.f,H.aq(q)),H.aq(o))}else{j.c=Math.min(H.aq(r),H.aq(p))
j.e=Math.max(H.aq(r),H.aq(p))
j.d=Math.min(H.aq(q),H.aq(o))
j.f=Math.max(H.aq(q),H.aq(o))}j.b=!0},
-WP:function(){var s=this,r=s.z,q=new H.dP(new Float32Array(16))
-q.er(r)
+WO:function(){var s=this,r=s.z,q=new H.dP(new Float32Array(16))
+q.eo(r)
s.r.push(q)
-r=s.Q?new P.ax(s.ch,s.cx,s.cy,s.db):null
+r=s.Q?new P.ay(s.ch,s.cx,s.cy,s.db):null
s.x.push(r)},
-aHG:function(){var s,r,q,p,o,n,m,l,k,j,i=this
-if(!i.b)return C.cq
+aHM:function(){var s,r,q,p,o,n,m,l,k,j,i=this
+if(!i.b)return C.cr
s=i.a
r=s.a
r.toString
@@ -54647,26 +54563,26 @@ r=i.d
s=i.f
k=Math.min(r,s)
j=Math.max(r,s)
-if(l>>0),new P.a4((r&4294967295)>>>0),a,null,p,o,C.du)))},
-aFS:function(a){var s
+return t.K2.a(this.uN(new H.a2M(e,q,c,new P.a3((s&4294967295)>>>0),new P.a3((r&4294967295)>>>0),a,null,p,o,C.du)))},
+aFY:function(a){var s
t.zM.a(a)
-if(a.c===C.cl)a.c=C.lo
+if(a.c===C.ck)a.c=C.ln
else a.K1()
s=C.b.gaS(this.a)
s.z.push(a)
a.e=s},
dM:function(a){this.a.pop()},
-aFP:function(a,b){if(!$.cVQ){$.cVQ=!0
+aFV:function(a,b){if(!$.cVg){$.cVg=!0
window
if(typeof console!="undefined")window.console.warn("The performance overlay isn't supported on the web")}},
-aFQ:function(a,b,c,d){var s,r
+aFW:function(a,b,c,d){var s,r
c
t.S9.a(b)
s=b.a.b
-r=new H.mL(null,t.Nh)
+r=new H.mK(null,t.Nh)
$.tj.push(r)
-r=new H.aqZ(a.a,a.b,b,s,new H.agU(t.eN),r,C.du)
+r=new H.ar1(a.a,a.b,b,s,new H.agX(t.eN),r,C.du)
s=C.b.gaS(this.a)
s.z.push(r)
r.e=s},
-aFR:function(a,b,c,d){var s,r=new H.mL(null,t.Nh)
+aFX:function(a,b,c,d){var s,r=new H.mK(null,t.Nh)
$.tj.push(r)
-r=new H.a2L(a,c.a,c.b,d,b,r,C.du)
+r=new H.a2N(a,c.a,c.b,d,b,r,C.du)
s=C.b.gaS(this.a)
s.z.push(r)
r.e=s},
-agV:function(a){},
-agE:function(a){},
-agD:function(a){},
-p:function(a){H.dpO()
-H.dpR()
-H.d0C("preroll_frame",new H.bwz(this))
-return H.d0C("apply_frame",new H.bwA(this))}}
-H.bwz.prototype={
+agZ:function(a){},
+agI:function(a){},
+agH:function(a){},
+p:function(a){H.dpb()
+H.dpe()
+H.d02("preroll_frame",new H.bwq(this))
+return H.d02("apply_frame",new H.bwr(this))}}
+H.bwq.prototype={
$0:function(){for(var s=this.a.a;s.length>1;)s.pop()
-t.IF.a(C.b.ga5(s)).JH()},
+t.IF.a(C.b.ga4(s)).JH()},
$S:0}
-H.bwA.prototype={
+H.bwr.prototype={
$0:function(){var s,r,q=t.IF,p=this.a.a
-if($.bwy==null)q.a(C.b.ga5(p)).p(0)
-else{s=q.a(C.b.ga5(p))
-r=$.bwy
+if($.bwp==null)q.a(C.b.ga4(p)).p(0)
+else{s=q.a(C.b.ga4(p))
+r=$.bwp
r.toString
-s.dR(0,r)}H.dy4(q.a(C.b.ga5(p)))
-$.bwy=q.a(C.b.ga5(p))
-return new H.Vw(q.a(C.b.ga5(p)).d)},
-$S:1066}
-H.a_z.prototype={}
-H.alj.prototype={
-aIj:function(a){var s,r,q,p,o,n=this,m=n.f,l=n.a,k=n.b,j=l.a,i=k.a
+s.dS(0,r)}H.dxs(q.a(C.b.ga4(p)))
+$.bwp=q.a(C.b.ga4(p))
+return new H.VA(q.a(C.b.ga4(p)).d)},
+$S:1061}
+H.a_B.prototype={}
+H.alm.prototype={
+aIp:function(a){var s,r,q,p,o,n=this,m=n.f,l=n.a,k=n.b,j=l.a,i=k.a
l=l.b
k=k.b
if(m!=null){s=(j+i)/2
r=(l+k)/2
-m.aR7(0,j-s,l-r)
+m.aRd(0,j-s,l-r)
l=m.b
j=m.c
-m.aR7(0,i-s,k-r)
+m.aRd(0,i-s,k-r)
q=a.createLinearGradient(l+s,j+r,m.b+s,m.c+r)}else q=a.createLinearGradient(j,l,i,k)
p=n.d
if(p==null){l=n.c
@@ -54794,34 +54710,34 @@ return q}for(l=n.c,o=0;o=0;--r,o=m){a.toString
@@ -54948,18 +54864,18 @@ n=C.b.fh(a,r)!==-1&&C.b.I(l,r)
m=p.a(s[r].d)
if(!n)if(o==null)q.appendChild(m)
else q.insertBefore(m,o)}},
-ayE:function(a0){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e=this.z,d=e.length,c=a0.z,b=c.length,a=H.a([],t.cD)
+ayI:function(a0){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e=this.z,d=e.length,c=a0.z,b=c.length,a=H.a([],t.cD)
for(s=0;s0?3:4
break
case 3:s=5
@@ -55228,67 +55144,67 @@ m.toString
m.rl(0,J.e(n,"state"),"flutter",p.gqN())
case 1:return P.V(q,r)}})
return P.W($async$rn,r)},
-gzl:function(){return this.d}}
-H.bfg.prototype={
+gzj:function(){return this.d}}
+H.bf2.prototype={
$1:function(a){},
-$S:187}
-H.a4g.prototype={
-ana:function(a){var s,r=this,q=r.d
+$S:188}
+H.a4j.prototype={
+ane:function(a){var s,r=this,q=r.d
if(q==null)return
-r.a42(q)
+r.a46(q)
s=r.gqN()
if(!r.a1B(new P.t7([],[]).qL(window.history.state,!0))){q.rl(0,P.l(["origin",!0,"state",r.gbJ()],t.N,t.z),"origin","")
-r.Pk(q,s,!1)}},
+r.Pj(q,s,!1)}},
a1B:function(a){return t.LX.b(a)&&J.j(J.e(a,"flutter"),!0)},
-E6:function(a,b){var s=this.d
-if(s!=null)this.Pk(s,a,!0)},
-Xh:function(a){return this.E6(a,null)},
-Ub:function(a,b){var s,r=this,q="flutter/navigation",p=new P.t7([],[]).qL(b.state,!0)
+E5:function(a,b){var s=this.d
+if(s!=null)this.Pj(s,a,!0)},
+Xg:function(a){return this.E5(a,null)},
+Ua:function(a,b){var s,r=this,q="flutter/navigation",p=new P.t7([],[]).qL(b.state,!0)
if(t.LX.b(p)&&J.j(J.e(p,"origin"),!0)){p=r.d
p.toString
-r.aCJ(p)
+r.aCP(p)
p=$.cq()
-if(p.y1!=null)p.r4(q,C.dc.pA(C.alW),new H.bty())}else if(r.a1B(new P.t7([],[]).qL(b.state,!0))){p=r.f
+if(p.y1!=null)p.r4(q,C.dc.pA(C.alW),new H.btp())}else if(r.a1B(new P.t7([],[]).qL(b.state,!0))){p=r.f
p.toString
r.f=null
s=$.cq()
-if(s.y1!=null)s.r4(q,C.dc.pA(new H.rc("pushRoute",p)),new H.btz())}else{r.f=r.gqN()
+if(s.y1!=null)s.r4(q,C.dc.pA(new H.rc("pushRoute",p)),new H.btq())}else{r.f=r.gqN()
r.d.u8(0,-1)}},
-Pk:function(a,b,c){var s
+Pj:function(a,b,c){var s
if(b==null)b=this.gqN()
s=this.e
if(c)a.rl(0,s,"flutter",b)
-else a.D_(0,s,"flutter",b)},
-aCJ:function(a){return this.Pk(a,null,!1)},
+else a.CZ(0,s,"flutter",b)},
+aCP:function(a){return this.Pj(a,null,!1)},
rn:function(){var s=0,r=P.X(t.n),q,p=this,o
var $async$rn=P.Q(function(a,b){if(a===1)return P.U(b,r)
while(true)switch(s){case 0:if(p.c||p.d==null){s=1
break}p.c=!0
-p.a5_()
+p.a53()
o=p.d
s=3
return P.N(o.u8(0,-1),$async$rn)
case 3:o.rl(0,J.e(t.LX.a(p.gbJ()),"state"),"flutter",p.gqN())
case 1:return P.V(q,r)}})
return P.W($async$rn,r)},
-gzl:function(){return this.d}}
-H.bty.prototype={
+gzj:function(){return this.d}}
+H.btp.prototype={
$1:function(a){},
-$S:187}
-H.btz.prototype={
+$S:188}
+H.btq.prototype={
$1:function(a){},
-$S:187}
-H.JL.prototype={}
-H.bB3.prototype={}
-H.b4O.prototype={
-Bs:function(a,b){C.en.tb(window,"popstate",b)
-return new H.b4S(this,b)},
-DM:function(a){var s=window.location.hash
+$S:188}
+H.JM.prototype={}
+H.bAV.prototype={}
+H.b4E.prototype={
+Bq:function(a,b){C.ep.tb(window,"popstate",b)
+return new H.b4I(this,b)},
+DL:function(a){var s=window.location.hash
if(s==null)s=""
if(s.length===0||s==="#")return"/"
-return C.d.eD(s,1)},
-DP:function(a){return new P.t7([],[]).qL(window.history.state,!0)},
-abO:function(a,b){var s,r
+return C.d.eA(s,1)},
+DO:function(a){return new P.t7([],[]).qL(window.history.state,!0)},
+abS:function(a,b){var s,r
if(b.length===0){s=window.location.pathname
s.toString
r=window.location.search
@@ -55296,103 +55212,103 @@ r.toString
r=s+r
s=r}else s="#"+b
return s},
-D_:function(a,b,c,d){var s=this.abO(0,d),r=window.history
+CZ:function(a,b,c,d){var s=this.abS(0,d),r=window.history
r.toString
-r.pushState(new P.aHe([],[]).rr(b),c,s)},
-rl:function(a,b,c,d){var s=this.abO(0,d),r=window.history
+r.pushState(new P.aHh([],[]).rr(b),c,s)},
+rl:function(a,b,c,d){var s=this.abS(0,d),r=window.history
r.toString
-r.replaceState(new P.aHe([],[]).rr(b),c,s)},
+r.replaceState(new P.aHh([],[]).rr(b),c,s)},
u8:function(a,b){window.history.go(b)
-return this.aFr()},
-aFr:function(){var s={},r=new P.aC($.aG,t.D4)
+return this.aFx()},
+aFx:function(){var s={},r=new P.aC($.aG,t.D4)
s.a=null
s.b=!1
-new H.b4Q(s).$1(this.Bs(0,new H.b4R(new H.b4P(s),new P.b6(r,t.gR))))
+new H.b4G(s).$1(this.Bq(0,new H.b4H(new H.b4F(s),new P.b6(r,t.gR))))
return r}}
-H.b4S.prototype={
-$0:function(){C.en.JT(window,"popstate",this.b)
+H.b4I.prototype={
+$0:function(){C.ep.JT(window,"popstate",this.b)
return null},
$C:"$0",
$R:0,
$S:1}
-H.b4Q.prototype={
+H.b4G.prototype={
$1:function(a){var s=this.a
s.b=!0
return s.a=a},
-$S:1029}
-H.b4P.prototype={
+$S:1019}
+H.b4F.prototype={
$0:function(){var s=this.a
return s.b?s.a:H.b(H.R("Local 'unsubscribe' has not been initialized."))},
-$S:1034}
-H.b4R.prototype={
+$S:1022}
+H.b4H.prototype={
$1:function(a){this.a.$0().$0()
this.b.fF(0)},
-$S:31}
-H.aVP.prototype={
-Bs:function(a,b){return J.d8K(this.a,b)},
-DM:function(a){return J.d9D(this.a)},
-DP:function(a){return J.d9F(this.a)},
-D_:function(a,b,c,d){return J.d9R(this.a,b,c,d)},
-rl:function(a,b,c,d){return J.d9V(this.a,b,c,d)},
-u8:function(a,b){return J.d9H(this.a,b)}}
-H.biR.prototype={}
-H.aOp.prototype={}
-H.akc.prototype={
-ga7G:function(){return this.c?this.b:H.b(H.R("Field 'cullRect' has not been initialized."))},
-a6z:function(a,b){var s,r,q,p,o,n=this
+$S:33}
+H.aVA.prototype={
+Bq:function(a,b){return J.d86(this.a,b)},
+DL:function(a){return J.d9_(this.a)},
+DO:function(a){return J.d91(this.a)},
+CZ:function(a,b,c,d){return J.d9d(this.a,b,c,d)},
+rl:function(a,b,c,d){return J.d9h(this.a,b,c,d)},
+u8:function(a,b){return J.d93(this.a,b)}}
+H.biI.prototype={}
+H.aOs.prototype={}
+H.akf.prototype={
+ga7K:function(){return this.c?this.b:H.b(H.R("Field 'cullRect' has not been initialized."))},
+a6D:function(a,b){var s,r,q,p,o,n=this
n.c=!0
n.b=b
n.d=!0
-s=n.ga7G()
+s=n.ga7K()
r=H.a([],t.EO)
if(s==null)s=C.Bj
q=H.a([],t.rE)
p=H.a([],t.cC)
o=new H.dP(new Float32Array(16))
o.ft()
-return n.a=new H.bn_(new H.bXZ(s,q,p,o),r)},
-a8w:function(){var s,r=this
-if(!r.d)r.a6z(0,C.Bj)
+return n.a=new H.bmQ(new H.bXT(s,q,p,o),r)},
+a8A:function(){var s,r=this
+if(!r.d)r.a6D(0,C.Bj)
r.d=!1
s=r.a
-s.b=s.a.aHG()
+s.b=s.a.aHM()
s.f=!0
s=r.a
-r.ga7G()
-return new H.akb(s)}}
-H.akb.prototype={
+r.ga7K()
+return new H.ake(s)}}
+H.ake.prototype={
A:function(a){}}
-H.arb.prototype={
-aql:function(){var s,r=this
-if("PointerEvent" in window){s=new H.bZG(P.ab(t.S,t.ZW),r.a,r.gON(),r.c)
-s.zV()
-return s}if("TouchEvent" in window){s=new H.c5i(P.dN(t.S),r.a,r.gON(),r.c)
-s.zV()
-return s}if("MouseEvent" in window){s=new H.bXk(new H.Ob(),r.a,r.gON(),r.c)
-s.zV()
+H.are.prototype={
+aqo:function(){var s,r=this
+if("PointerEvent" in window){s=new H.bZA(P.ab(t.S,t.ZW),r.a,r.gOM(),r.c)
+s.zT()
+return s}if("TouchEvent" in window){s=new H.c50(P.dN(t.S),r.a,r.gOM(),r.c)
+s.zT()
+return s}if("MouseEvent" in window){s=new H.bX2(new H.Oe(),r.a,r.gOM(),r.c)
+s.zT()
return s}throw H.d(P.z("This browser does not support pointer, touch, or mouse events."))},
-azH:function(a){var s=H.a(a.slice(0),H.a0(a).h("Y<1>")),r=$.cq(),q=r.k3
-if(q!=null)H.cP8(q,r.k4,new P.T7(s),t.kf)}}
-H.bjc.prototype={
+azM:function(a){var s=H.a(a.slice(0),H.a0(a)),r=$.cq(),q=r.k3
+if(q!=null)H.cOw(q,r.k4,new P.Tb(s),t.kf)}}
+H.bj3.prototype={
j:function(a){return"pointers:"+("PointerEvent" in window)+", touch:"+("TouchEvent" in window)+", mouse:"+("MouseEvent" in window)}}
-H.bGC.prototype={
-Qq:function(a,b,c,d){var s=new H.bGD(this,d,c)
-$.di5.E(0,b,s)
-C.en.Br(window,b,s,!0)},
-tb:function(a,b,c){return this.Qq(a,b,c,!1)}}
-H.bGD.prototype={
+H.bGi.prototype={
+Qp:function(a,b,c,d){var s=new H.bGj(this,d,c)
+$.dht.E(0,b,s)
+C.ep.Bp(window,b,s,!0)},
+tb:function(a,b,c){return this.Qp(a,b,c,!1)}}
+H.bGj.prototype={
$1:function(a){var s,r
-if(!this.b&&!this.a.a.contains(t.Vk.a(J.cM5(a))))return
-s=H.tS()
-if(C.b.I(C.a7y,J.cM6(a))){r=s.at2()
+if(!this.b&&!this.a.a.contains(t.Vk.a(J.cLt(a))))return
+s=H.tR()
+if(C.b.I(C.a7z,J.cLu(a))){r=s.at5()
r.toString
-r.saIx(J.fI(s.f.$0(),C.dG))
-if(s.z!==C.qQ){s.z=C.qQ
-s.a2g()}}if(s.r.a.ahd(a))this.c.$1(a)},
-$S:31}
-H.aIY.prototype={
-a_7:function(a){var s,r,q,p,o,n,m,l=(a&&C.Cr).gaIW(a),k=C.Cr.gaIX(a)
-switch(C.Cr.gaIV(a)){case 1:l*=32
+r.saID(J.fI(s.f.$0(),C.dG))
+if(s.z!==C.qP){s.z=C.qP
+s.a2g()}}if(s.r.a.ahh(a))this.c.$1(a)},
+$S:33}
+H.aJ0.prototype={
+a_6:function(a){var s,r,q,p,o,n,m,l=(a&&C.Cr).gaJ1(a),k=C.Cr.gaJ2(a)
+switch(C.Cr.gaJ0(a)){case 1:l*=32
k*=32
break
case 2:s=$.cq()
@@ -55402,7 +55318,7 @@ break
case 0:default:break}r=H.a([],t.D9)
s=a.timeStamp
s.toString
-s=H.WE(s)
+s=H.WH(s)
q=a.clientX
a.clientY
q.toString
@@ -55414,46 +55330,46 @@ n.toString
p=p.gfw(p)
m=a.buttons
m.toString
-this.c.aHQ(r,m,C.iO,-1,C.dx,q*o,n*p,1,1,0,l,k,C.AZ,s)
+this.c.aHW(r,m,C.iQ,-1,C.dx,q*o,n*p,1,1,0,l,k,C.AZ,s)
return r},
-YO:function(a){var s,r={},q=P.ae8(new H.c78(a))
-$.di6.E(0,"wheel",q)
+YN:function(a){var s,r={},q=P.aeb(new H.c6R(a))
+$.dhu.E(0,"wheel",q)
r.passive=!1
s=this.a
s.addEventListener.apply(s,["wheel",q,r])}}
-H.c78.prototype={
+H.c6R.prototype={
$1:function(a){return this.a.$1(a)},
-$S:162}
+$S:160}
H.te.prototype={
j:function(a){return H.aY(this).j(0)+"(change: "+this.a.j(0)+", buttons: "+this.b+")"}}
-H.Ob.prototype={
-WL:function(a,b){var s
-if(this.a!==0)return this.DU(b)
-s=(b===0&&a>-1?H.dyy(a):b)&1073741823
+H.Oe.prototype={
+WK:function(a,b){var s
+if(this.a!==0)return this.DT(b)
+s=(b===0&&a>-1?H.dxW(a):b)&1073741823
this.a=s
-return new H.te(C.uQ,s)},
-DU:function(a){var s=a&1073741823,r=this.a,q=r===0
-if(!q&&s===0)return new H.te(C.iP,r)
-if(q&&s!==0)return new H.te(C.iO,r)
+return new H.te(C.uP,s)},
+DT:function(a){var s=a&1073741823,r=this.a,q=r===0
+if(!q&&s===0)return new H.te(C.iR,r)
+if(q&&s!==0)return new H.te(C.iQ,r)
this.a=s
-return new H.te(s===0?C.iO:C.iP,s)},
-WM:function(){if(this.a===0)return null
+return new H.te(s===0?C.iQ:C.iR,s)},
+WL:function(){if(this.a===0)return null
this.a=0
-return new H.te(C.uR,0)}}
-H.bZG.prototype={
-a00:function(a){return this.d.eH(0,a,new H.bZI())},
-a39:function(a){if(a.pointerType==="touch")this.d.P(0,a.pointerId)},
-M7:function(a,b,c){this.Qq(0,a,new H.bZH(b),c)},
-YM:function(a,b){return this.M7(a,b,!1)},
-zV:function(){var s=this
-s.YM("pointerdown",new H.bZK(s))
-s.M7("pointermove",new H.bZL(s),!0)
-s.M7("pointerup",new H.bZM(s),!0)
-s.YM("pointercancel",new H.bZN(s))
-s.YO(new H.bZO(s))},
+return new H.te(C.uQ,0)}}
+H.bZA.prototype={
+a0_:function(a){return this.d.eE(0,a,new H.bZC())},
+a3c:function(a){if(a.pointerType==="touch")this.d.O(0,a.pointerId)},
+M7:function(a,b,c){this.Qp(0,a,new H.bZB(b),c)},
+YL:function(a,b){return this.M7(a,b,!1)},
+zT:function(){var s=this
+s.YL("pointerdown",new H.bZE(s))
+s.M7("pointermove",new H.bZF(s),!0)
+s.M7("pointerup",new H.bZG(s),!0)
+s.YL("pointercancel",new H.bZH(s))
+s.YN(new H.bZI(s))},
rT:function(a,b,c){var s,r,q,p,o,n,m,l,k=c.pointerType
k.toString
-s=this.aAP(k)
+s=this.aAV(k)
if(s===C.dx)r=-1
else{k=c.pointerId
k.toString
@@ -55464,7 +55380,7 @@ q.toString
if(!(Math.abs(k)>Math.abs(q)))k=q
q=c.timeStamp
q.toString
-p=H.WE(q)
+p=H.WH(q)
q=b.a
o=c.clientX
c.clientY
@@ -55475,60 +55391,60 @@ c.clientX
l=c.clientY
l.toString
n=n.gfw(n)
-this.c.aHP(a,b.b,q,r,s,o*m,l*n,c.pressure,1,0,C.h6,k/180*3.141592653589793,p)},
-as5:function(a){var s
-if("getCoalescedEvents" in a){s=J.vw(a.getCoalescedEvents(),t.W2)
+this.c.aHV(a,b.b,q,r,s,o*m,l*n,c.pressure,1,0,C.h4,k/180*3.141592653589793,p)},
+as8:function(a){var s
+if("getCoalescedEvents" in a){s=J.vx(a.getCoalescedEvents(),t.W2)
if(s.gca(s))return s}return H.a([a],t.Y2)},
-aAP:function(a){switch(a){case"mouse":return C.dx
-case"pen":return C.h5
+aAV:function(a){switch(a){case"mouse":return C.dx
+case"pen":return C.h3
case"touch":return C.dw
-default:return C.iQ}}}
-H.bZI.prototype={
-$0:function(){return new H.Ob()},
-$S:1048}
-H.bZH.prototype={
+default:return C.iS}}}
+H.bZC.prototype={
+$0:function(){return new H.Oe()},
+$S:1044}
+H.bZB.prototype={
$1:function(a){return this.a.$1(t.W2.a(a))},
-$S:162}
-H.bZK.prototype={
+$S:160}
+H.bZE.prototype={
$1:function(a){var s,r,q,p,o=a.pointerId
o.toString
s=H.a([],t.D9)
r=this.a
-o=r.a00(o)
+o=r.a0_(o)
q=a.button
p=a.buttons
p.toString
-r.rT(s,o.WL(q,p),a)
+r.rT(s,o.WK(q,p),a)
r.b.$1(s)},
-$S:228}
-H.bZL.prototype={
+$S:222}
+H.bZF.prototype={
$1:function(a){var s,r,q,p,o,n=a.pointerId
n.toString
s=this.a
-r=s.a00(n)
+r=s.a0_(n)
q=H.a([],t.D9)
-p=J.fj(s.as5(a),new H.bZJ(r),t.tA)
-for(n=new H.cZ(p,p.gH(p),p.$ti.h("cZ"));n.t();){o=n.d
+p=J.fd(s.as8(a),new H.bZD(r),t.tA)
+for(n=new H.d_(p,p.gH(p),p.$ti.h("d_"));n.t();){o=n.d
s.rT(q,o,a)}s.b.$1(q)},
-$S:228}
-H.bZJ.prototype={
+$S:222}
+H.bZD.prototype={
$1:function(a){var s=a.buttons
s.toString
-return this.a.DU(s)},
-$S:1080}
-H.bZM.prototype={
+return this.a.DT(s)},
+$S:1068}
+H.bZG.prototype={
$1:function(a){var s,r,q,p=a.pointerId
p.toString
s=H.a([],t.D9)
r=this.a
p=r.d.i(0,p)
p.toString
-q=p.WM()
-r.a39(a)
+q=p.WL()
+r.a3c(a)
if(q!=null)r.rT(s,q,a)
r.b.$1(s)},
-$S:228}
-H.bZN.prototype={
+$S:222}
+H.bZH.prototype={
$1:function(a){var s,r,q=a.pointerId
q.toString
s=H.a([],t.D9)
@@ -55536,42 +55452,42 @@ r=this.a
q=r.d.i(0,q)
q.toString
q.a=0
-r.a39(a)
+r.a3c(a)
r.rT(s,new H.te(C.p3,0),a)
r.b.$1(s)},
-$S:228}
-H.bZO.prototype={
+$S:222}
+H.bZI.prototype={
$1:function(a){var s,r=this.a
t.V6.a(a)
-s=r.a_7(a)
+s=r.a_6(a)
r.b.$1(s)
a.preventDefault()},
-$S:31}
-H.c5i.prototype={
-EB:function(a,b){this.tb(0,a,new H.c5j(b))},
-zV:function(){var s=this
-s.EB("touchstart",new H.c5k(s))
-s.EB("touchmove",new H.c5l(s))
-s.EB("touchend",new H.c5m(s))
-s.EB("touchcancel",new H.c5n(s))},
+$S:33}
+H.c50.prototype={
+EB:function(a,b){this.tb(0,a,new H.c51(b))},
+zT:function(){var s=this
+s.EB("touchstart",new H.c52(s))
+s.EB("touchmove",new H.c53(s))
+s.EB("touchend",new H.c54(s))
+s.EB("touchcancel",new H.c55(s))},
EJ:function(a,b,c,d,e){var s,r,q,p,o,n=e.identifier
n.toString
-s=C.l.aY(e.clientX)
-C.l.aY(e.clientY)
+s=C.l.aZ(e.clientX)
+C.l.aZ(e.clientY)
r=$.cq()
q=r.gfw(r)
-C.l.aY(e.clientX)
-p=C.l.aY(e.clientY)
+C.l.aZ(e.clientX)
+p=C.l.aZ(e.clientY)
r=r.gfw(r)
o=c?1:0
-this.c.a72(b,o,a,n,C.dw,s*q,p*r,1,1,0,C.h6,d)}}
-H.c5j.prototype={
+this.c.a76(b,o,a,n,C.dw,s*q,p*r,1,1,0,C.h4,d)}}
+H.c51.prototype={
$1:function(a){return this.a.$1(t.wv.a(a))},
-$S:162}
-H.c5k.prototype={
+$S:160}
+H.c52.prototype={
$1:function(a){var s,r,q,p,o,n,m,l,k=a.timeStamp
k.toString
-s=H.WE(k)
+s=H.WH(k)
r=H.a([],t.D9)
for(k=a.changedTouches,q=k.length,p=this.a,o=p.d,n=0;nq){r.d=q+1
r=$.cq()
-H.yI(r.rx,r.ry,this.b.go,C.RE,null)}else if(sq){s=s.b
s.toString
if((s&32)!==0||(s&16)!==0){s=$.cq()
-H.yI(s.rx,s.ry,p,C.p9,n)}else{s=$.cq()
-H.yI(s.rx,s.ry,p,C.pb,n)}}else{s=s.b
+H.yH(s.rx,s.ry,p,C.p9,n)}else{s=$.cq()
+H.yH(s.rx,s.ry,p,C.pb,n)}}else{s=s.b
s.toString
if((s&32)!==0||(s&16)!==0){s=$.cq()
-H.yI(s.rx,s.ry,p,C.pa,n)}else{s=$.cq()
-H.yI(s.rx,s.ry,p,C.pc,n)}}}},
+H.yH(s.rx,s.ry,p,C.pa,n)}else{s=$.cq()
+H.yH(s.rx,s.ry,p,C.pc,n)}}}},
rq:function(a){var s,r,q,p=this
if(p.d==null){s=p.b
r=s.k1
q=r.style
q.toString
-C.x.d7(q,C.x.ce(q,"touch-action"),"none","")
-p.a0l()
+C.x.d5(q,C.x.ce(q,"touch-action"),"none","")
+p.a0k()
s=s.id
-s.d.push(new H.bs4(p))
-q=new H.bs5(p)
+s.d.push(new H.brW(p))
+q=new H.brX(p)
p.c=q
s.ch.push(q)
-q=new H.bs6(p)
+q=new H.brY(p)
p.d=q
-J.cLY(r,"scroll",q)}},
-ga_J:function(){var s=this.b,r=s.b
+J.cLl(r,"scroll",q)}},
+ga_I:function(){var s=this.b,r=s.b
r.toString
r=(r&32)!==0||(r&16)!==0
s=s.k1
-if(r)return C.l.aY(s.scrollTop)
-else return C.l.aY(s.scrollLeft)},
+if(r)return C.l.aZ(s.scrollTop)
+else return C.l.aZ(s.scrollLeft)},
a2d:function(){var s=this.b,r=s.k1,q=s.b
q.toString
if((q&32)!==0||(q&16)!==0){r.scrollTop=10
-s.r2=this.e=C.l.aY(r.scrollTop)
+s.r2=this.e=C.l.aZ(r.scrollTop)
s.rx=0}else{r.scrollLeft=10
-q=C.l.aY(r.scrollLeft)
+q=C.l.aZ(r.scrollLeft)
this.e=q
s.r2=0
s.rx=q}},
-a0l:function(){var s="overflow-y",r="overflow-x",q=this.b,p=q.k1
-switch(q.id.z){case C.eH:q=q.b
+a0k:function(){var s="overflow-y",r="overflow-x",q=this.b,p=q.k1
+switch(q.id.z){case C.eI:q=q.b
q.toString
if((q&32)!==0||(q&16)!==0){q=p.style
q.toString
-C.x.d7(q,C.x.ce(q,s),"scroll","")}else{q=p.style
+C.x.d5(q,C.x.ce(q,s),"scroll","")}else{q=p.style
q.toString
-C.x.d7(q,C.x.ce(q,r),"scroll","")}break
-case C.qQ:q=q.b
+C.x.d5(q,C.x.ce(q,r),"scroll","")}break
+case C.qP:q=q.b
q.toString
if((q&32)!==0||(q&16)!==0){q=p.style
q.toString
-C.x.d7(q,C.x.ce(q,s),"hidden","")}else{q=p.style
+C.x.d5(q,C.x.ce(q,s),"hidden","")}else{q=p.style
q.toString
-C.x.d7(q,C.x.ce(q,r),"hidden","")}break
+C.x.d5(q,C.x.ce(q,r),"hidden","")}break
default:throw H.d(H.M(u.I))}},
A:function(a){var s,r=this,q=r.b,p=q.k1,o=p.style
o.removeProperty("overflowY")
o.removeProperty("overflowX")
o.removeProperty("touch-action")
s=r.d
-if(s!=null)J.cSa(p,"scroll",s)
-C.b.P(q.id.ch,r.c)
+if(s!=null)J.cRA(p,"scroll",s)
+C.b.O(q.id.ch,r.c)
r.c=null}}
-H.bs4.prototype={
+H.brW.prototype={
$0:function(){this.a.a2d()},
$C:"$0",
$R:0,
$S:0}
-H.bs5.prototype={
-$1:function(a){this.a.a0l()},
-$S:492}
-H.bs6.prototype={
-$1:function(a){this.a.aBk()},
-$S:31}
-H.bsw.prototype={
+H.brX.prototype={
+$1:function(a){this.a.a0k()},
+$S:499}
+H.brY.prototype={
+$1:function(a){this.a.aBq()},
+$S:33}
+H.bsn.prototype={
A:function(a){}}
-H.atS.prototype={
+H.atV.prototype={
ga_:function(a){return this.a},
gw:function(a){return this.dy}}
H.rt.prototype={
j:function(a){return this.b}}
-H.cCW.prototype={
-$1:function(a){return H.dd8(a)},
-$S:1547}
-H.cCX.prototype={
-$1:function(a){return new H.UV(a)},
-$S:1609}
-H.cCY.prototype={
-$1:function(a){return new H.RX(a)},
-$S:1826}
-H.cCZ.prototype={
-$1:function(a){return new H.VB(a)},
-$S:1822}
-H.cD_.prototype={
-$1:function(a){var s,r,q,p=new H.VL(a),o=a.a
+H.cCp.prototype={
+$1:function(a){return H.dcv(a)},
+$S:1522}
+H.cCq.prototype={
+$1:function(a){return new H.UZ(a)},
+$S:1560}
+H.cCs.prototype={
+$1:function(a){return new H.S0(a)},
+$S:1878}
+H.cCt.prototype={
+$1:function(a){return new H.VF(a)},
+$S:1838}
+H.cCu.prototype={
+$1:function(a){var s,r,q,p=new H.VO(a),o=a.a
o.toString
-s=(o&524288)!==0?document.createElement("textarea"):W.b6s()
-o=new H.bsv($.Yo(),H.a([],t.Iu))
-o.aii(s)
+s=(o&524288)!==0?document.createElement("textarea"):W.b6i()
+o=new H.bsm($.Yq(),H.a([],t.Iu))
+o.aim(s)
p.c=o
r=o.c
r.spellcheck=!1
@@ -56082,36 +55998,36 @@ o=o.c
o.toString
a.k1.appendChild(o)
o=H.iz()
-switch(o){case C.fm:case C.Dz:case C.pU:case C.jm:case C.pU:case C.DA:p.axJ()
+switch(o){case C.fn:case C.Dz:case C.pU:case C.jo:case C.pU:case C.DA:p.axN()
break
-case C.bE:p.axK()
+case C.bE:p.axO()
break
default:H.b(H.M(u.I))}return p},
-$S:1727}
-H.cD0.prototype={
-$1:function(a){return new H.Q5(H.dlx(a),a)},
-$S:1285}
-H.cD1.prototype={
-$1:function(a){return new H.RJ(a)},
-$S:694}
-H.cD2.prototype={
-$1:function(a){return new H.S7(a)},
-$S:640}
+$S:1824}
+H.cCv.prototype={
+$1:function(a){return new H.Q9(H.dkV(a),a)},
+$S:1476}
+H.cCw.prototype={
+$1:function(a){return new H.RN(a)},
+$S:790}
+H.cCx.prototype={
+$1:function(a){return new H.Sb(a)},
+$S:648}
H.oK.prototype={}
-H.hz.prototype={
+H.hy.prototype={
LZ:function(a,b){var s=this.k1,r=s.style
r.position="absolute"
if(this.go===0){r=s.style
r.toString
-C.x.d7(r,C.x.ce(r,"filter"),"opacity(0%)","")
+C.x.d5(r,C.x.ce(r,"filter"),"opacity(0%)","")
s=s.style
s.color="rgba(0,0,0,0)"}},
-gT0:function(){var s=this.Q
+gT_:function(){var s=this.Q
return s!=null&&s.length!==0},
gw:function(a){return this.cx},
-gaLl:function(){var s=this.cx
+gaLr:function(){var s=this.cx
return s!=null&&s.length!==0},
-Wx:function(){var s,r=this
+Ww:function(){var s,r=this
if(r.k3==null){s=W.p2("flt-semantics-container",null)
r.k3=s
s=s.style
@@ -56119,39 +56035,39 @@ s.position="absolute"
s=r.k3
s.toString
r.k1.appendChild(s)}return r.k3},
-gyz:function(a){var s=this.fr
+gyx:function(a){var s=this.fr
return s!=null&&!C.am_.gag(s)},
-gaa6:function(){var s,r=this.a
+gaaa:function(){var s,r=this.a
r.toString
if((r&16384)!==0){s=this.b
s.toString
r=(s&1)===0&&(r&8)===0}else r=!1
return r},
-a8v:function(){var s=this.a
+a8z:function(){var s=this.a
s.toString
if((s&64)!==0)if((s&128)!==0)return C.a2o
-else return C.x6
+else return C.x5
else return C.a2n},
n0:function(a,b){var s
if(b)this.k1.setAttribute("role",a)
else{s=this.k1
if(s.getAttribute("role")===a)s.removeAttribute("role")}},
t9:function(a,b){var s=this.r1,r=s.i(0,a)
-if(b){if(r==null){r=$.d5a().i(0,a).$1(this)
+if(b){if(r==null){r=$.d4B().i(0,a).$1(this)
s.E(0,a,r)}r.rq(0)}else if(r!=null){r.A(0)
-s.P(0,a)}},
-ac6:function(){var s,r,q,p,o,n,m,l,k=this,j="transform-origin",i="transform",h={},g=k.k1,f=g.style,e=k.z
+s.O(0,a)}},
+aca:function(){var s,r,q,p,o,n,m,l,k=this,j="transform-origin",i="transform",h={},g=k.k1,f=g.style,e=k.z
e=H.f(e.c-e.a)+"px"
f.width=e
e=k.z
e=H.f(e.d-e.b)+"px"
f.height=e
-s=k.gyz(k)?k.Wx():null
+s=k.gyx(k)?k.Ww():null
f=k.z
r=f.b===0&&f.a===0
q=k.dy
f=q==null
-p=f||H.d0G(q)===C.SJ
+p=f||H.d06(q)===C.SJ
if(r&&p&&k.r2===0&&k.rx===0){h=g.style
h.removeProperty(j)
h.removeProperty(i)
@@ -56159,25 +56075,25 @@ if(s!=null){h=s.style
h.removeProperty(j)
h.removeProperty(i)}return}h.a=null
h.b=!1
-e=new H.bso(h)
-h=new H.bsp(h)
+e=new H.bsf(h)
+h=new H.bsg(h)
if(!r)if(f){f=k.z
o=f.a
n=f.b
-h.$1(H.cNw(o,n,0))
+h.$1(H.cMU(o,n,0))
m=o===0&&n===0}else{f=new H.dP(new Float32Array(16))
-f.er(new H.dP(q))
+f.eo(new H.dP(q))
l=k.z
-f.VG(0,l.a,l.b,0)
+f.VF(0,l.a,l.b,0)
h.$1(f)
-m=J.d9J(e.$0())}else if(!p){q.toString
+m=J.d95(e.$0())}else if(!p){q.toString
h.$1(new H.dP(q))
m=!1}else m=!0
if(!m){h=g.style
h.toString
-C.x.d7(h,C.x.ce(h,j),"0 0 0","")
-e=H.vr(e.$0().a)
-C.x.d7(h,C.x.ce(h,i),e,"")}else{h=g.style
+C.x.d5(h,C.x.ce(h,j),"0 0 0","")
+e=H.vs(e.$0().a)
+C.x.d5(h,C.x.ce(h,i),e,"")}else{h=g.style
h.removeProperty(j)
h.removeProperty(i)}if(s!=null)if(!r||k.r2!==0||k.rx!==0){h=k.z
g=h.a
@@ -56186,12 +56102,12 @@ h=h.b
e=k.r2
l=s.style
l.toString
-C.x.d7(l,C.x.ce(l,j),"0 0 0","")
+C.x.d5(l,C.x.ce(l,j),"0 0 0","")
e="translate("+H.f(-g+f)+"px, "+H.f(-h+e)+"px)"
-C.x.d7(l,C.x.ce(l,i),e,"")}else{h=s.style
+C.x.d5(l,C.x.ce(l,i),e,"")}else{h=s.style
h.removeProperty(j)
h.removeProperty(i)}},
-aEK:function(){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d,c,b,a,a0,a1=this,a2="flt-semantics",a3=a1.fr
+aEQ:function(){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d,c,b,a,a0,a1=this,a2="flt-semantics",a3=a1.fr
if(a3==null||a3.length===0){s=a1.ry
if(s==null||s.length===0){a1.ry=a3
return}r=s.length
@@ -56202,12 +56118,12 @@ a3.toString
J.fJ(a3)
a1.k3=null
a1.ry=a1.fr
-return}o=a1.Wx()
+return}o=a1.Ww()
a3=a1.ry
if(a3==null||a3.length===0){a3=a1.ry=a1.fr
for(s=a3.length,n=a1.id,m=n.a,l=t.Sp,k=t.bk,j=0;j=0;--q){a0=a1.fr[q]
p=s.i(0,a0)
-if(p==null){p=new H.hz(a0,a3,W.p2(a2,null),P.ab(n,m))
+if(p==null){p=new H.hy(a0,a3,W.p2(a2,null),P.ab(n,m))
p.LZ(a0,a3)
s.E(0,a0,p)}if(!C.b.I(b,a0)){l=p.k1
if(a==null)o.appendChild(l)
@@ -56240,26 +56156,26 @@ a3.b.E(0,p.go,a1)}a=p.k1}a1.ry=a1.fr},
j:function(a){var s=this.fE(0)
return s},
ga_:function(a){return this.go}}
-H.bsp.prototype={
+H.bsg.prototype={
$1:function(a){var s=this.a
s.b=!0
return s.a=a},
-$S:645}
-H.bso.prototype={
+$S:642}
+H.bsf.prototype={
$0:function(){var s=this.a
return s.b?s.a:H.b(H.R("Local 'effectiveTransform' has not been initialized."))},
-$S:660}
-H.aL4.prototype={
+$S:658}
+H.aL7.prototype={
j:function(a){return this.b}}
-H.J7.prototype={
+H.J8.prototype={
j:function(a){return this.b}}
-H.b_e.prototype={
-amT:function(){$.tk.push(new H.b_f(this))},
-asi:function(){var s,r,q,p,o,n,m,l=this
+H.b_0.prototype={
+amX:function(){$.tk.push(new H.b_1(this))},
+asl:function(){var s,r,q,p,o,n,m,l=this
for(s=l.c,r=s.length,q=l.a,p=0;p=20)return q.d=!0
if(q.a!=null)return!1
s=s.gmq(a)
r=q.b
-if(s==null?r==null:s===r){q.a=P.eM(C.bT,new H.aXO(q))
+if(s==null?r==null:s===r){q.a=P.eM(C.bV,new H.aXA(q))
return!1}return!0},
-abN:function(){var s,r=this.b=W.p2("flt-semantics-placeholder",null)
-J.aez(r,"click",new H.aXN(this),!0)
+abR:function(){var s,r=this.b=W.p2("flt-semantics-placeholder",null)
+J.aeC(r,"click",new H.aXz(this),!0)
r.setAttribute("role","button")
r.setAttribute("aria-live","true")
r.setAttribute("tabindex","0")
@@ -56430,36 +56346,36 @@ s.top="-1px"
s.width="1px"
s.height="1px"
return r}}
-H.aXO.prototype={
-$0:function(){H.tS().sX1(!0)
+H.aXA.prototype={
+$0:function(){H.tR().sX0(!0)
this.a.d=!0},
$C:"$0",
$R:0,
$S:0}
-H.aXN.prototype={
+H.aXz.prototype={
$1:function(a){this.a.Kg(a)},
-$S:31}
-H.bf2.prototype={
-gaa7:function(){return this.b!=null},
+$S:33}
+H.beP.prototype={
+gaab:function(){return this.b!=null},
Kg:function(a){var s,r,q,p,o,n,m,l,k,j,i,h=this
if(h.d){s=H.iz()
-if(s!==C.bE||J.cM6(a)==="touchend"){s=h.b
+if(s!==C.bE||J.cLu(a)==="touchend"){s=h.b
s.toString
J.fJ(s)
-h.a=h.b=null}return!0}if(H.tS().x)return!0
+h.a=h.b=null}return!0}if(H.tR().x)return!0
if(++h.c>=20)return h.d=!0
s=J.aK(a)
-if(!J.dZ(C.anv.a,s.giI(a)))return!0
+if(!J.e_(C.anv.a,s.giG(a)))return!0
if(h.a!=null)return!1
r=H.iz()
-q=r===C.fm&&H.tS().z===C.eH
+q=r===C.fn&&H.tR().z===C.eI
r=H.iz()
-if(r===C.bE){switch(s.giI(a)){case"click":p=s.gfi(t.Tl.a(a))
+if(r===C.bE){switch(s.giG(a)){case"click":p=s.gfi(t.Tl.a(a))
break
case"touchstart":case"touchend":s=t.wv.a(a).changedTouches
s.toString
-s=C.pj.ga5(s)
-p=new P.bS(C.l.aY(s.clientX),C.l.aY(s.clientY),t.OB)
+s=C.pj.ga4(s)
+p=new P.bS(C.l.aZ(s.clientX),C.l.aZ(s.clientY),t.OB)
break
default:return!0}o=$.fr().y.getBoundingClientRect()
s=o.left
@@ -56477,10 +56393,10 @@ s=p.b
s.toString
j=s-(n+(m-n)/2)
i=k*k+j*j<1&&!0}else i=!1
-if(q||i){h.a=P.eM(C.bT,new H.bf4(h))
+if(q||i){h.a=P.eM(C.bV,new H.beR(h))
return!1}return!0},
-abN:function(){var s,r=this.b=W.p2("flt-semantics-placeholder",null)
-J.aez(r,"click",new H.bf3(this),!0)
+abR:function(){var s,r=this.b=W.p2("flt-semantics-placeholder",null)
+J.aeC(r,"click",new H.beQ(this),!0)
r.setAttribute("role","button")
r.setAttribute("aria-label","Enable accessibility")
s=r.style
@@ -56490,113 +56406,113 @@ s.top="0"
s.right="0"
s.bottom="0"
return r}}
-H.bf4.prototype={
-$0:function(){H.tS().sX1(!0)
+H.beR.prototype={
+$0:function(){H.tR().sX0(!0)
this.a.d=!0},
$C:"$0",
$R:0,
$S:0}
-H.bf3.prototype={
+H.beQ.prototype={
$1:function(a){this.a.Kg(a)},
-$S:31}
-H.VB.prototype={
+$S:33}
+H.VF.prototype={
rq:function(a){var s=this,r=s.b,q=r.k1,p=r.a
p.toString
r.n0("button",(p&8)!==0)
-if(r.a8v()===C.x6){p=r.a
+if(r.a8z()===C.x5){p=r.a
p.toString
p=(p&8)!==0}else p=!1
if(p){q.setAttribute("aria-disabled","true")
-s.Ps()}else{p=r.b
+s.Pr()}else{p=r.b
p.toString
if((p&1)!==0){r=r.a
r.toString
r=(r&16)===0}else r=!1
-if(r){if(s.c==null){r=new H.bwY(s)
+if(r){if(s.c==null){r=new H.bwP(s)
s.c=r
-J.cLY(q,"click",r)}}else s.Ps()}},
-Ps:function(){var s=this.c
+J.cLl(q,"click",r)}}else s.Pr()}},
+Pr:function(){var s=this.c
if(s==null)return
-J.cSa(this.b.k1,"click",s)
+J.cRA(this.b.k1,"click",s)
this.c=null},
-A:function(a){this.Ps()
+A:function(a){this.Pr()
this.b.n0("button",!1)}}
-H.bwY.prototype={
+H.bwP.prototype={
$1:function(a){var s,r=this.a.b
-if(r.id.z!==C.eH)return
+if(r.id.z!==C.eI)return
s=$.cq()
-H.yI(s.rx,s.ry,r.go,C.ha,null)},
-$S:31}
-H.bsv.prototype={
+H.yH(s.rx,s.ry,r.go,C.h8,null)},
+$S:33}
+H.bsm.prototype={
ts:function(a){this.c.blur()},
IG:function(){},
-yH:function(a,b,c){var s=this
+yF:function(a,b,c){var s=this
s.e=s.b=!0
s.d=a
s.y=c
s.z=b
s.c.focus()},
-E3:function(a){this.aij(a)
+E2:function(a){this.aio(a)
this.c.focus()}}
-H.VL.prototype={
-axJ:function(){var s=this.c.c
+H.VO.prototype={
+axN:function(){var s=this.c.c
s.toString
-J.cLY(s,"focus",new H.bz6(this))},
-axK:function(){var s,r=this,q={}
+J.cLl(s,"focus",new H.byY(this))},
+axO:function(){var s,r=this,q={}
q.a=q.b=null
s=r.c.c
s.toString
-J.aez(s,"touchstart",new H.bz7(q,r),!0)
+J.aeC(s,"touchstart",new H.byZ(q,r),!0)
s=r.c.c
s.toString
-J.aez(s,"touchend",new H.bz8(q,r),!0)},
+J.aeC(s,"touchend",new H.bz_(q,r),!0)},
rq:function(a){},
A:function(a){var s=this.c.c
s.toString
J.fJ(s)
-$.Yo().VS(null)}}
-H.bz6.prototype={
+$.Yq().VR(null)}}
+H.byY.prototype={
$1:function(a){var s=this.a,r=s.b
-if(r.id.z!==C.eH)return
-$.Yo().VS(s.c)
+if(r.id.z!==C.eI)return
+$.Yq().VR(s.c)
s=$.cq()
-H.yI(s.rx,s.ry,r.go,C.ha,null)},
-$S:31}
-H.bz7.prototype={
+H.yH(s.rx,s.ry,r.go,C.h8,null)},
+$S:33}
+H.byZ.prototype={
$1:function(a){var s,r
-$.Yo().VS(this.b.c)
+$.Yq().VR(this.b.c)
t.wv.a(a)
s=a.changedTouches
s.toString
s=C.pj.gaS(s)
-r=C.l.aY(s.clientX)
-C.l.aY(s.clientY)
+r=C.l.aZ(s.clientX)
+C.l.aZ(s.clientY)
s=this.a
s.b=r
r=a.changedTouches
r.toString
r=C.pj.gaS(r)
-C.l.aY(r.clientX)
-s.a=C.l.aY(r.clientY)},
-$S:31}
-H.bz8.prototype={
+C.l.aZ(r.clientX)
+s.a=C.l.aZ(r.clientY)},
+$S:33}
+H.bz_.prototype={
$1:function(a){var s,r,q,p
t.wv.a(a)
s=this.a
if(s.b!=null){r=a.changedTouches
r.toString
r=C.pj.gaS(r)
-q=C.l.aY(r.clientX)
-C.l.aY(r.clientY)
+q=C.l.aZ(r.clientX)
+C.l.aZ(r.clientY)
r=a.changedTouches
r.toString
r=C.pj.gaS(r)
-C.l.aY(r.clientX)
-p=C.l.aY(r.clientY)
+C.l.aZ(r.clientX)
+p=C.l.aZ(r.clientY)
if(q*q+p*p<324){r=$.cq()
-H.yI(r.rx,r.ry,this.b.b.go,C.ha,null)}}s.a=s.b=null},
-$S:31}
-H.vo.prototype={
+H.yH(r.rx,r.ry,this.b.b.go,C.h8,null)}}s.a=s.b=null},
+$S:33}
+H.vp.prototype={
gH:function(a){return this.b},
i:function(a,b){if(b>=this.b)throw H.d(P.fv(b,this,null,null,null))
return this.a[b]},
@@ -56610,42 +56526,42 @@ else q=p.EL(b)
C.aH.fC(q,0,p.b,p.a)
p.a=q}}p.b=b},
ka:function(a,b){var s=this,r=s.b
-if(r===s.a.length)s.a0R(r)
+if(r===s.a.length)s.a0Q(r)
s.a[s.b++]=b},
F:function(a,b){var s=this,r=s.b
-if(r===s.a.length)s.a0R(r)
+if(r===s.a.length)s.a0Q(r)
s.a[s.b++]=b},
-qy:function(a,b,c,d){P.iw(c,"start")
+qy:function(a,b,c,d){P.iv(c,"start")
if(d!=null&&c>d)throw H.d(P.ee(d,c,null,"end",null))
-this.anM(b,c,d)},
+this.anQ(b,c,d)},
V:function(a,b){return this.qy(a,b,0,null)},
-anM:function(a,b,c){var s,r,q,p=this
-if(H.F(p).h("D").b(a))c=c==null?a.length:c
-if(c!=null){p.axS(p.b,a,b,c)
-return}for(s=J.a3(a),r=0;s.t();){q=s.gC(s)
+anQ:function(a,b,c){var s,r,q,p=this
+if(H.F(p).h("D").b(a))c=c==null?a.length:c
+if(c!=null){p.axW(p.b,a,b,c)
+return}for(s=J.a2(a),r=0;s.t();){q=s.gC(s)
if(r>=b)p.ka(0,q);++r}if(ro.gH(b)||d>o.gH(b))throw H.d(P.bg("Too few elements"))
s=d-c
r=p.b+s
-p.arU(r)
+p.arX(r)
o=p.a
q=a+s
-C.aH.dS(o,q,p.b+s,o,a)
-C.aH.dS(p.a,a,q,b,c)
+C.aH.dT(o,q,p.b+s,o,a)
+C.aH.dT(p.a,a,q,b,c)
p.b=r},
hg:function(a,b,c){var s,r,q,p=this
if(b<0||b>p.b)throw H.d(P.ee(b,0,p.b,null,null))
s=p.b
r=p.a
-if(ss)throw H.d(P.ee(c,0,s,null,null))
s=this.a
-if(H.F(this).h("vo").b(d))C.aH.dS(s,b,c,d.a,e)
-else C.aH.dS(s,b,c,d,e)},
-fC:function(a,b,c,d){return this.dS(a,b,c,d,0)}}
-H.aD8.prototype={}
-H.avv.prototype={}
+if(H.F(this).h("vp").b(d))C.aH.dT(s,b,c,d.a,e)
+else C.aH.dT(s,b,c,d,e)},
+fC:function(a,b,c,d){return this.dT(a,b,c,d,0)}}
+H.aDb.prototype={}
+H.avy.prototype={}
H.rc.prototype={
j:function(a){return H.aY(this).j(0)+"("+this.a+", "+H.f(this.b)+")"}}
-H.bbQ.prototype={
-hn:function(a){return H.wP(C.fq.ew(C.F.c_(a)).buffer,0,null)},
+H.bbC.prototype={
+hn:function(a){return H.wP(C.fr.eu(C.E.c_(a)).buffer,0,null)},
np:function(a){if(a==null)return a
-return C.F.fv(0,C.na.ew(H.hR(a.buffer,0,null)))}}
-H.bbS.prototype={
-pA:function(a){return C.bR.hn(P.l(["method",a.a,"args",a.b],t.N,t.z))},
-ow:function(a){var s,r,q,p=null,o=C.bR.np(a)
+return C.E.fv(0,C.n9.eu(H.hP(a.buffer,0,null)))}}
+H.bbE.prototype={
+pA:function(a){return C.bT.hn(P.l(["method",a.a,"args",a.b],t.N,t.z))},
+ox:function(a){var s,r,q,p=null,o=C.bT.np(a)
if(!t.LX.b(o))throw H.d(P.cN("Expected method call Map, got "+H.f(o),p,p))
s=J.am(o)
r=s.i(o,"method")
q=s.i(o,"args")
if(typeof r=="string")return new H.rc(r,q)
throw H.d(P.cN("Invalid method call: "+H.f(o),p,p))}}
-H.auG.prototype={
-hn:function(a){var s=H.cOn()
+H.auJ.prototype={
+hn:function(a){var s=H.cNL()
this.k9(0,s,!0)
return s.tu()},
np:function(a){var s,r
if(a==null)return null
-s=new H.arI(a)
-r=this.nO(0,s)
+s=new H.arL(a)
+r=this.nP(0,s)
if(s.b2e6){s.c.fF(0)
-throw H.d(P.Rj("Timed out trying to load font: "+H.f(s.e)))}else P.eM(C.nF,s)},
+throw H.d(P.Rn("Timed out trying to load font: "+H.f(s.e)))}else P.eM(C.nE,s)},
$C:"$0",
$R:0,
$S:1}
-H.bZS.prototype={
+H.bZM.prototype={
$1:function(a){return H.f(a)+": "+H.f(this.a.i(0,a))+";"},
-$S:133}
-H.er.prototype={
+$S:132}
+H.eq.prototype={
j:function(a){return this.b}}
-H.a14.prototype={
+H.a16.prototype={
j:function(a){return this.b}}
-H.mQ.prototype={
+H.mP.prototype={
gG:function(a){var s=this
-return P.bC(s.a,s.b,s.c,s.d,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
+return P.bB(s.a,s.b,s.c,s.d,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
B:function(a,b){var s=this
if(b==null)return!1
if(s===b)return!0
if(J.bk(b)!==H.aY(s))return!1
-return b instanceof H.mQ&&b.a===s.a&&b.b===s.b&&b.c===s.c&&b.d===s.d},
+return b instanceof H.mP&&b.a===s.a&&b.b===s.b&&b.c===s.c&&b.d===s.d},
j:function(a){var s=this.fE(0)
return s}}
-H.at1.prototype={
-aC5:function(){if(!this.d){this.d=!0
-P.jT(new H.brc(this))}},
+H.at4.prototype={
+aCb:function(){if(!this.d){this.d=!0
+P.jT(new H.br3(this))}},
A:function(a){J.fJ(this.b)},
-as0:function(){this.c.L(0,new H.brb())
+as3:function(){this.c.L(0,new H.br2())
this.c=P.ab(t.UY,t.R3)},
-aHg:function(){var s,r,q,p,o=this,n=$.cq().gtR()
-if(n.gag(n)){o.as0()
+aHm:function(){var s,r,q,p,o=this,n=$.cq().gtR()
+if(n.gag(n)){o.as3()
return}n=o.c
s=o.a
if(n.gH(n)>s){n=o.c
n=n.gdY(n)
r=P.v(n,!0,H.F(n).h("P.E"))
-C.b.bY(r,new H.brd())
+C.b.bY(r,new H.br4())
o.c=P.ab(t.UY,t.R3)
for(q=0;ql)l=h
-o.dR(0,j)
+o.dS(0,j)
if(j.d===C.nV)n=!0}b=p.d
g=b.length
r=a1.gvG()
-f=r.gey(r)
+f=r.gew(r)
e=g*f
d=s.x
c=d==null?e:Math.min(g,d)*f
-return H.cNz(q,a1.gv2(a1),c,a1.gv2(a1)*1.1662499904632568,g===1,f,b,o.d,l,e,H.a([],t.Lx),a.e,a.f,q)},
-yU:function(a,b,c){var s,r,q=a.c
+return H.cMX(q,a1.gv2(a1),c,a1.gv2(a1)*1.1662499904632568,g===1,f,b,o.d,l,e,H.a([],t.Lx),a.e,a.f,q)},
+yS:function(a,b,c){var s,r,q=a.c
q.toString
s=a.b
r=this.b
-r.font=s.gRE()
-return H.OJ(r,s,q,b,c)},
-WF:function(a,b,c){return C.aor},
-ga9S:function(){return!0}}
-H.bcV.prototype={
-ga_V:function(){var s=this,r=s.x
+r.font=s.gRD()
+return H.ON(r,s,q,b,c)},
+WE:function(a,b,c){return C.aor},
+ga9W:function(){return!0}}
+H.bcH.prototype={
+ga_U:function(){var s=this,r=s.x
if(r==null){r=s.b.b.ch
r.toString
-r=s.x=C.l.aY(s.a.measureText(r).width*100)/100}return r},
-dR:function(a2,a3){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d=this,c=a3.d,b=c===C.nU||c===C.nV,a=a3.a,a0=a3.b,a1=a3.c
+r=s.x=C.l.aZ(s.a.measureText(r).width*100)/100}return r},
+dS:function(a2,a3){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d=this,c=a3.d,b=c===C.nU||c===C.nV,a=a3.a,a0=a3.b,a1=a3.c
for(c=d.b,s=c.b,r=s.ch,q=r!=null,p=d.c,o=d.a,n=c.c,m=s.x,l=m==null,k=d.d;!d.r;){j=d.f
n.toString
-if(H.OJ(o,s,n,j.a,a1)<=p)break
+if(H.ON(o,s,n,j.a,a1)<=p)break
j=d.e
i=d.f.a
h=q&&l||k.length+1===m
d.r=h
-if(h&&q){g=d.a8V(a1,p-d.ga_V(),d.f.a)
-f=H.OJ(o,s,n,d.f.a,g)+d.ga_V()
-e=H.cOZ(f,p,c)
+if(h&&q){g=d.a8Z(a1,p-d.ga_U(),d.f.a)
+f=H.ON(o,s,n,d.f.a,g)+d.ga_U()
+e=H.cOm(f,p,c)
j=d.f.a
-k.push(new H.Rg(C.d.b2(n,j,g)+r,j,a,a0,!1,f,f,e,k.length))}else if(j.a===i){g=d.a8V(a1,p,i)
+k.push(new H.Rk(C.d.b3(n,j,g)+r,j,a,a0,!1,f,f,e,k.length))}else if(j.a===i){g=d.a8Z(a1,p,i)
if(g===a1)break
-d.M3(new H.mQ(g,g,g,C.hQ))}else d.M3(j)}if(d.r)return
+d.M3(new H.mP(g,g,g,C.hS))}else d.M3(j)}if(d.r)return
if(b)d.M3(a3)
d.e=a3},
M3:function(a){var s,r,q,p,o=this,n=o.d,m=n.length,l=o.f,k=o.a,j=o.b,i=j.b,h=j.c
h.toString
-s=H.OJ(k,i,h,l.a,a.c)
+s=H.ON(k,i,h,l.a,a.c)
l=a.b
-r=H.OJ(k,i,h,o.f.a,l)
-q=H.cOZ(s,o.c,j)
+r=H.ON(k,i,h,o.f.a,l)
+q=H.cOm(s,o.c,j)
k=a.d
p=k===C.nU||k===C.nV
k=o.f.a
-n.push(H.cTu(C.d.b2(h,k,l),a.a,l,p,q,m,k,s,r))
+n.push(H.cSU(C.d.b3(h,k,l),a.a,l,p,q,m,k,s,r))
o.f=o.e=a
if(n.length===i.x)o.r=!0},
-a8V:function(a,b,c){var s,r,q,p=this.b,o=p.b,n=o.ch!=null?c:c+1,m=this.a
+a8Z:function(a,b,c){var s,r,q,p=this.b,o=p.b,n=o.ch!=null?c:c+1,m=this.a
p=p.c
s=a
do{r=C.e.dn(n+s,2)
p.toString
-q=H.OJ(m,o,p,c,r)
+q=H.ON(m,o,p,c,r)
if(qb?n:r
s=r}}while(s-n>1)
return n}}
-H.bed.prototype={
-dR:function(a,b){var s,r=this
-if(b.d===C.hQ)return
-s=H.OJ(r.a,r.c,r.b,r.e,b.b)
+H.be_.prototype={
+dS:function(a,b){var s,r=this
+if(b.d===C.hS)return
+s=H.ON(r.a,r.c,r.b,r.e,b.b)
if(s>r.d)r.d=s
r.e=b.a},
gw:function(a){return this.d}}
-H.Rg.prototype={
+H.Rk.prototype={
gG:function(a){var s=this
-return P.bC(s.a,s.b,s.c,s.e,1/0,1/0,1/0,1/0,s.z,s.ch,1/0,s.cy,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
+return P.bB(s.a,s.b,s.c,s.e,1/0,1/0,1/0,1/0,s.z,s.ch,1/0,s.cy,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
B:function(a,b){var s,r=this
if(b==null)return!1
if(r===b)return!0
if(J.bk(b)!==H.aY(r))return!1
-if(b instanceof H.Rg)if(b.a===r.a)if(b.b===r.b)if(b.c===r.c)if(b.e===r.e)if(b.z==r.z)if(b.ch===r.ch)s=b.cy===r.cy
+if(b instanceof H.Rk)if(b.a===r.a)if(b.b===r.b)if(b.c===r.c)if(b.e===r.e)if(b.z==r.z)if(b.ch===r.ch)s=b.cy===r.cy
else s=!1
else s=!1
else s=!1
@@ -57268,22 +57184,22 @@ else s=!1
return s},
j:function(a){var s=this.fE(0)
return s}}
-H.H2.prototype={
+H.H3.prototype={
gFo:function(){var s=this.y
return(s==null?null:s.Q)!=null},
-geI:function(a){var s=this.y
+geF:function(a){var s=this.y
s=s==null?null:s.c
return s==null?-1:s},
-gey:function(a){var s=this.y
+gew:function(a){var s=this.y
s=s==null?null:s.d
return s==null?0:s},
gFD:function(a){var s=this.y
s=s==null?null:s.f
return s==null?0:s},
-gTG:function(){var s,r,q,p,o
+gTF:function(){var s,r,q,p,o
if(this.gFo()){for(s=this.y.Q,r=s.length,q=0,p=0;pr.gey(r)}else r.z=!1
-if(r.y.b)switch(r.e){case C.c4:r.ch=(q-r.gvL())/2
+r.z=s>r.gew(r)}else r.z=!1
+if(r.y.b)switch(r.e){case C.c5:r.ch=(q-r.gvL())/2
break
-case C.ff:r.ch=q-r.gvL()
+case C.fg:r.ch=q-r.gvL()
break
case C.u:r.ch=r.f===C.S?q-r.gvL():0
break
-case C.c5:r.ch=r.f===C.R?q-r.gvL():0
+case C.c0:r.ch=r.f===C.Q?q-r.gvL():0
break
default:r.ch=0
break}},
-af3:function(){return this.y.ch},
-garj:function(){var s,r=this
+af7:function(){return this.y.ch},
+garm:function(){var s,r=this
if(!r.gFo())return!1
-if(H.VN(r).ga9S()?!0:r.b.ch==null){s=r.b
+if(H.VQ(r).ga9W()?!0:r.b.ch==null){s=r.b
s=s.Q==null&&s.z==null&&!0}else s=!1
return s},
Kw:function(a,b,c,a0){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d=this
@@ -57329,22 +57245,22 @@ s=d.c
if(s==null)return H.a([new P.rI(0,0,0,d.gFD(d),d.f)],t.Lx)
r=s.length
if(a>r||b>r)return H.a([],t.Lx)
-if(!d.gFo()){H.VN(d)
+if(!d.gFo()){H.VQ(d)
q=d.Q
q.toString
p=d.ch
-return $.VO.Ik(d.b).aNq(s,q,p,b,a,d.f)}s=d.y.Q
+return $.VR.Ik(d.b).aNw(s,q,p,b,a,d.f)}s=d.y.Q
s.toString
if(a>=C.b.gaS(s).c)return H.a([],t.Lx)
-o=d.a0A(a)
-n=d.a0A(b)
+o=d.a0z(a)
+n=d.a0z(b)
if(b===n.b)n=s[n.cy-1]
m=H.a([],t.Lx)
for(l=o.cy,q=n.cy,p=d.f;l<=q;++l){k=s[l]
j=k.b
-i=a<=j?0:H.VN(d).yU(d,j,a)
+i=a<=j?0:H.VQ(d).yS(d,j,a)
j=k.d
-h=b>=j?0:H.VN(d).yU(d,b,j)
+h=b>=j?0:H.VQ(d).yS(d,b,j)
j=d.y
g=j==null
f=g?null:j.f
@@ -57354,46 +57270,46 @@ f=k.ch
j=g?null:j.f
if(j==null)j=0
m.push(new P.rI(f+i,e,f+k.Q-h,e+j,p))}return m},
-We:function(a,b,c){return this.Kw(a,b,c,C.nn)},
+Wd:function(a,b,c){return this.Kw(a,b,c,C.nm)},
rv:function(a){var s,r,q,p,o,n,m,l,k,j,i,h,g=this,f=g.y.Q
-if(!g.gFo())return H.VN(g).WF(g,g.Q,a)
+if(!g.gFo())return H.VQ(g).WE(g,g.Q,a)
s=a.b
-if(s<0)return new P.fZ(0,C.aV)
+if(s<0)return new P.fZ(0,C.aW)
r=g.y.f
r.toString
-q=C.l.j_(s,r)
-if(q>=f.length)return new P.fZ(g.c.length,C.hc)
+q=C.l.iY(s,r)
+if(q>=f.length)return new P.fZ(g.c.length,C.ha)
p=f[q]
o=p.ch
s=a.a
-if(s<=o)return new P.fZ(p.b,C.aV)
-if(s>=o+p.z)return new P.fZ(p.d,C.hc)
+if(s<=o)return new P.fZ(p.b,C.aW)
+if(s>=o+p.z)return new P.fZ(p.d,C.ha)
n=s-o
-m=H.VN(g)
+m=H.VQ(g)
l=p.b
k=p.d
j=l
do{i=C.e.dn(j+k,2)
-h=m.yU(g,l,i)
+h=m.yS(g,l,i)
if(hn?j:i
k=i}}while(k-j>1)
-if(j===k)return new P.fZ(k,C.hc)
-if(n-m.yU(g,l,j)=q.b&&a=o.length){o=b8.a
-H.cOW(o,!1,b3)
+H.cOj(o,!1,b3)
n=t.aE
-return new H.H2(o,new H.wW(c0.gAx(),c0.gAw(),c1,c2,c3,s,k,c0.e,i,j,H.cPh(e,g),c0.Q,b9),"",n.a(b4),r,q,n.a(b3.fr),0)}if(typeof o[c]!="string")return b9
+return new H.H3(o,new H.wW(c0.gAv(),c0.gAu(),c1,c2,c3,s,k,c0.e,i,j,H.cOF(e,g),c0.Q,b9),"",n.a(b4),r,q,n.a(b3.fr),0)}if(typeof o[c]!="string")return b9
b5=new P.eK("")
n=""
while(!0){if(!(c"));s.t();){p=s.d
+for(s=new H.d_(r,r.gH(r),s.h("d_"));s.t();){p=s.d
o=p.getBoundingClientRect()
n=o.left
n.toString
@@ -57695,11 +57611,11 @@ l.toString
k=o.bottom
k.toString
q.push(new P.rI(n,m,l,k,this.db.f))}return q},
-T4:function(a,b){var s,r,q,p,o,n,m,l,k=this
-k.aaR(a)
+T3:function(a,b){var s,r,q,p,o,n,m,l,k=this
+k.aaV(a)
s=k.z.a
r=H.a([],t.f2)
-k.ZL(s.childNodes,r)
+k.ZK(s.childNodes,r)
for(q=r.length-1,p=t.lU;q>=0;--q){o=p.a(r[q].parentNode).getBoundingClientRect()
n=b.a
m=b.b
@@ -57712,25 +57628,25 @@ l.toString
if(m>=l){l=o.bottom
l.toString
l=m"),p=P.v(new H.dd(a,q),!0,q.h("al.E"))
+C.b.V(s,p.childNodes)}this.ZK(s,b)},
+aqn:function(a,b){var s,r,q=H.c2(a).h("dd"),p=P.v(new H.dd(a,q),!0,q.h("al.E"))
for(s=0;!0;){r=C.b.kq(p)
q=r.childNodes
C.b.V(p,new H.dd(q,H.c2(q).h("dd")))
if(r===b)break
if(r.nodeType===3)s+=r.textContent.length}return s},
-S3:function(){var s,r=this
+S2:function(){var s,r=this
if(r.db.c==null){s=$.fr()
s.qH(r.f.a)
s.qH(r.x.a)
s.qH(r.z.a)}r.db=null},
-aNq:function(a,b,c,a0,a1,a2){var s,r,q,p,o,n,m,l,k,j,i,h=J.dB(a).b2(a,0,a1),g=C.d.b2(a,a1,a0),f=C.d.eD(a,a0),e=document,d=e.createElement("span")
+aNw:function(a,b,c,a0,a1,a2){var s,r,q,p,o,n,m,l,k,j,i,h=J.dB(a).b3(a,0,a1),g=C.d.b3(a,a1,a0),f=C.d.eA(a,a0),e=document,d=e.createElement("span")
d.textContent=g
s=this.z
r=s.a
@@ -57738,24 +57654,24 @@ $.fr().qH(r)
r.appendChild(e.createTextNode(h))
r.appendChild(d)
r.appendChild(e.createTextNode(f))
-s.adl(b.a,null)
+s.adp(b.a,null)
q=d.getClientRects()
if(q.prototype==null)q.prototype=Object.create(null)
p=H.a([],t.Lx)
e=this.a.x
if(e==null)o=1/0
else{s=this.gvG()
-o=e*s.gey(s)}for(e=q.length,n=null,m=0;m=o)break
k=s.gvE(l)
k.toString
j=s.gro(l)
i=s.gK2(l)
i.toString
-p.push(new P.rI(k+c,j,i+c,s.gQP(l),a2))
+p.push(new P.rI(k+c,j,i+c,s.gQO(l),a2))
n=l}$.fr().qH(r)
return p},
A:function(a){var s,r=this
@@ -57764,15 +57680,15 @@ C.qf.h7(r.r)
C.qf.h7(r.y)
s=r.Q
if(s!=null)C.qf.h7(s)},
-aGY:function(a,b){var s,r,q=a.c,p=this.dx,o=p.i(0,q)
+aH3:function(a,b){var s,r,q=a.c,p=this.dx,o=p.i(0,q)
if(o==null){o=H.a([],t.Rl)
p.E(0,q,o)}o.push(b)
-if(o.length>8)C.b.f1(o,0)
+if(o.length>8)C.b.f2(o,0)
s=this.dy
s.push(q)
-if(s.length>2400){for(r=0;r<100;++r)p.P(0,s[r])
+if(s.length>2400){for(r=0;r<100;++r)p.O(0,s[r])
C.b.w3(s,0,100)}},
-aGX:function(a,b){var s,r,q,p,o,n,m,l=a.c
+aH2:function(a,b){var s,r,q,p,o,n,m,l=a.c
if(l==null)return null
s=this.dx.i(0,l)
if(s==null)return null
@@ -57780,68 +57696,68 @@ r=s.length
for(q=b.a,p=a.e,o=a.f,n=0;nthis.b)return C.UR
return C.UQ}}
-H.avy.prototype={
-Ii:function(a,b,c){var s=H.cGh(b,c)
-return s==null?this.b:this.Ce(s)},
-Ce:function(a){var s,r,q,p,o=this
+H.avB.prototype={
+Ii:function(a,b,c){var s=H.cFM(b,c)
+return s==null?this.b:this.Cd(s)},
+Cd:function(a){var s,r,q,p,o=this
if(a==null)return o.b
s=o.c
r=s.i(0,a)
if(r!=null)return r
-q=o.anx(a)
+q=o.anB(a)
p=q===-1?o.b:o.a[q].c
s.E(0,a,p)
return p},
-anx:function(a){var s,r,q=this.a,p=q.length
+anB:function(a){var s,r,q=this.a,p=q.length
for(s=0;ss&&rp&&q>>0))
+r.head.appendChild(l)}r=H.jo(new P.a3((q&4294967295)>>>0))
r.toString
l.content=r
-a0.mC(a3,C.bR.hn([!0]))
+a0.mC(a3,C.bT.hn([!0]))
return
-case"SystemChrome.setPreferredOrientations":$.fr().agU(s.b).R(0,new H.b_r(a0,a3),t.P)
+case"SystemChrome.setPreferredOrientations":$.fr().agY(s.b).R(0,new H.b_d(a0,a3),t.P)
return
-case"SystemSound.play":a0.mC(a3,C.bR.hn([!0]))
+case"SystemSound.play":a0.mC(a3,C.bT.hn([!0]))
return
-case"Clipboard.setData":r=window.navigator.clipboard!=null?new H.agH():new H.akq()
-new H.agI(r,H.cUV()).agI(s,a3)
+case"Clipboard.setData":r=window.navigator.clipboard!=null?new H.agK():new H.akt()
+new H.agL(r,H.cUl()).agM(s,a3)
return
-case"Clipboard.getData":r=window.navigator.clipboard!=null?new H.agH():new H.akq()
-new H.agI(r,H.cUV()).afa(a3)
+case"Clipboard.getData":r=window.navigator.clipboard!=null?new H.agK():new H.akt()
+new H.agL(r,H.cUl()).afe(a3)
return}break
case"flutter/service_worker":r=window
k=document.createEvent("Event")
-J.d8I(k,"flutter-first-frame",!0,!0)
+J.d84(k,"flutter-first-frame",!0,!0)
r.dispatchEvent(k)
return
-case"flutter/textinput":r=$.Yo()
+case"flutter/textinput":r=$.Yq()
r=r.gHe(r)
r.toString
-j=C.dc.ow(a2)
+j=C.dc.ox(a2)
q=j.a
switch(q){case"TextInput.setClient":r=r.a
q=j.b
m=J.am(q)
i=m.i(q,0)
-q=H.cU0(m.i(q,1))
+q=H.cTr(m.i(q,1))
m=r.f
if(m!=null&&m!==i&&r.r){r.r=!1
r.gpz().ts(0)}r.f=i
r.y=!0
r.x=q
break
-case"TextInput.updateConfig":h=H.cU0(j.b)
+case"TextInput.updateConfig":h=H.cTr(j.b)
r=r.a
r.y=!0
r.x=h
-r.gpz().YX(r.ga_2())
+r.gpz().YW(r.ga_1())
break
-case"TextInput.setEditingState":q=H.cTp(j.b)
-r.a.gpz().E3(q)
+case"TextInput.setEditingState":q=H.cSP(j.b)
+r.a.gpz().E2(q)
break
case"TextInput.show":r=r.a
-if(!r.r)r.aDe()
+if(!r.r)r.aDk()
break
case"TextInput.setEditableSizeAndTransform":q=j.b
m=J.am(q)
g=P.v(m.i(q,"transform"),!0,t.Y)
i=m.i(q,"width")
q=m.i(q,"height")
-m=new Float32Array(H.vp(g))
-r.a.gpz().ado(new H.aZA(i,q,m))
+m=new Float32Array(H.vq(g))
+r.a.gpz().ads(new H.aZm(i,q,m))
break
case"TextInput.setStyle":q=j.b
m=J.am(q)
f=m.i(q,"textAlignIndex")
e=m.i(q,"textDirectionIndex")
d=m.i(q,"fontWeightIndex")
-c=d!=null?H.d_D(d):"normal"
-q=new H.aZN(m.i(q,"fontSize"),c,m.i(q,"fontFamily"),C.abu[f],C.aaS[e])
+c=d!=null?H.d_2(d):"normal"
+q=new H.aZz(m.i(q,"fontSize"),c,m.i(q,"fontFamily"),C.abv[f],C.aaT[e])
r=r.a.gpz()
r.r=q
if(r.b){r=r.c
@@ -58649,15 +58565,15 @@ r.gpz().ts(0)}break
case"TextInput.requestAutofill":break
case"TextInput.finishAutofillContext":b=H.aV(j.b)
r.a.L3()
-if(b)r.agc()
-r.aHf()
+if(b)r.agg()
+r.aHl()
break
case"TextInput.setMarkedTextRect":break
-default:H.b(P.bg("Unsupported method call on the flutter/textinput channel: "+q))}$.cq().mC(a3,C.bR.hn([!0]))
+default:H.b(P.bg("Unsupported method call on the flutter/textinput channel: "+q))}$.cq().mC(a3,C.bT.hn([!0]))
return
-case"flutter/mousecursor":s=C.np.ow(a2)
+case"flutter/mousecursor":s=C.no.ox(a2)
n=s.b
-switch(s.a){case"activateSystemCursor":$.cNB.toString
+switch(s.a){case"activateSystemCursor":$.cMZ.toString
n.toString
r=J.e(n,"kind")
q=$.fr()
@@ -58666,25 +58582,25 @@ m.toString
r=C.alp.i(0,r)
q.hV(m,"cursor",r==null?"default":r)
break}return
-case"flutter/web_test_e2e":a0.mC(a3,C.bR.hn([H.dq4(C.dc,a2)]))
+case"flutter/web_test_e2e":a0.mC(a3,C.bT.hn([H.dps(C.dc,a2)]))
return
case"flutter/platform_views":a2.toString
a3.toString
-P.dBU(a2,a3)
+P.dBh(a2,a3)
return
-case"flutter/accessibility":a=new H.auG()
-$.d5o().aL9(a,a2)
+case"flutter/accessibility":a=new H.auJ()
+$.d4P().aLf(a,a2)
a0.mC(a3,a.hn(!0))
return
-case"flutter/navigation":a0.Fk(a2,a3).R(0,new H.b_s(a3),t.P)
+case"flutter/navigation":a0.Fk(a2,a3).R(0,new H.b_e(a3),t.P)
a0.y="/"
-return}r=$.d0j
+return}r=$.d_K
if(r!=null){r.$3(a1,a2,a3)
return}a0.mC(a3,null)},
-Fk:function(a,b){return this.avT(a,b)},
-avT:function(a,b){var s=0,r=P.X(t.C9),q,p=this,o,n,m
+Fk:function(a,b){return this.avW(a,b)},
+avW:function(a,b){var s=0,r=P.X(t.C9),q,p=this,o,n,m
var $async$Fk=P.Q(function(c,d){if(c===1)return P.U(d,r)
-while(true)switch(s){case 0:n=C.dc.ow(a)
+while(true)switch(s){case 0:n=C.dc.ox(a)
m=n.b
case 3:switch(n.a){case"routeUpdated":s=5
break
@@ -58694,14 +58610,14 @@ default:s=4
break}break
case 5:s=7
return P.N(p.Gs(),$async$Fk)
-case 7:p.gH7().Xh(J.e(m,"routeName"))
-p.mC(b,C.bR.hn([!0]))
+case 7:p.gH7().Xg(J.e(m,"routeName"))
+p.mC(b,C.bT.hn([!0]))
q=!0
s=1
break
case 6:o=J.am(m)
-p.gH7().E6(o.i(m,"location"),o.i(m,"state"))
-p.mC(b,C.bR.hn([!0]))
+p.gH7().E5(o.i(m,"location"),o.i(m,"state"))
+p.mC(b,C.bT.hn([!0]))
q=!0
s=1
break
@@ -58710,158 +58626,158 @@ s=1
break
case 1:return P.V(q,r)}})
return P.W($async$Fk,r)},
-at3:function(a){switch(a){case"HapticFeedbackType.lightImpact":return 10
+at6:function(a){switch(a){case"HapticFeedbackType.lightImpact":return 10
case"HapticFeedbackType.mediumImpact":return 20
case"HapticFeedbackType.heavyImpact":return 30
case"HapticFeedbackType.selectionClick":return 10
default:return 50}},
-mC:function(a,b){P.cTR(C.b5,null,t.n).R(0,new H.b_n(a,b),t.P)},
-a5i:function(a){var s=this,r=s.O
-s.O=a
-if(r!==a&&s.ch!=null)H.ciV(s.ch,s.cx)},
-anN:function(){var s,r=this,q=r.a6
-r.a5i(q.matches?C.aR:C.aU)
-s=new H.b_j(r)
+mC:function(a,b){P.cTh(C.b5,null,t.n).R(0,new H.b_9(a,b),t.P)},
+a5m:function(a){var s=this,r=s.P
+s.P=a
+if(r!==a&&s.ch!=null)H.cit(s.ch,s.cx)},
+anR:function(){var s,r=this,q=r.a5
+r.a5m(q.matches?C.aR:C.aU)
+s=new H.b_5(r)
r.a0=s
C.Pi.dw(q,s)
-$.tk.push(new H.b_k(r))},
-ao1:function(){self._flutter_web_set_location_strategy=P.ae8(new H.b_l(this))
-$.tk.push(new H.b_m())},
-gac1:function(){var s=this
-if(!s.au){s.a4=null
-s.au=!0}return s.a4},
-aOh:function(a,b,c){return this.gaOg().$3(a,b,c)}}
-H.b_t.prototype={
+$.tk.push(new H.b_6(r))},
+ao5:function(){self._flutter_web_set_location_strategy=P.aeb(new H.b_7(this))
+$.tk.push(new H.b_8())},
+gac5:function(){var s=this
+if(!s.ad){s.ae=null
+s.ad=!0}return s.ae},
+aOn:function(a,b,c){return this.gaOm().$3(a,b,c)}}
+H.b_f.prototype={
$1:function(a){this.a.w8(this.b,a,t.CD)},
-$S:187}
-H.b_o.prototype={
+$S:188}
+H.b_a.prototype={
$1:function(a){this.a.mC(this.b,a)},
-$S:991}
-H.b_p.prototype={
+$S:971}
+H.b_b.prototype={
$1:function(a){var s
window
s="Error while trying to load an asset: "+H.f(a)
if(typeof console!="undefined")window.console.warn(s)
this.a.mC(this.b,null)},
$S:11}
-H.b_q.prototype={
-$1:function(a){this.a.mC(this.b,C.bR.hn([!0]))},
-$S:69}
-H.b_r.prototype={
-$1:function(a){this.a.mC(this.b,C.bR.hn([a]))},
-$S:308}
-H.b_s.prototype={
+H.b_c.prototype={
+$1:function(a){this.a.mC(this.b,C.bT.hn([!0]))},
+$S:65}
+H.b_d.prototype={
+$1:function(a){this.a.mC(this.b,C.bT.hn([a]))},
+$S:347}
+H.b_e.prototype={
$1:function(a){if(!a&&this.a!=null)this.a.$1(null)},
-$S:308}
-H.b_n.prototype={
+$S:347}
+H.b_9.prototype={
$1:function(a){var s=this.a
if(s!=null)s.$1(this.b)},
-$S:69}
-H.b_j.prototype={
+$S:65}
+H.b_5.prototype={
$1:function(a){var s=t.oh.a(a).matches
s.toString
s=s?C.aR:C.aU
-this.a.a5i(s)},
-$S:31}
-H.b_k.prototype={
-$0:function(){var s=this.a,r=s.a6;(r&&C.Pi).aj(r,s.a0)
+this.a.a5m(s)},
+$S:33}
+H.b_6.prototype={
+$0:function(){var s=this.a,r=s.a5;(r&&C.Pi).ak(r,s.a0)
s.a0=null},
$C:"$0",
$R:0,
$S:0}
-H.b_l.prototype={
-$1:function(a){var s=a==null?null:new H.aVP(a),r=new H.a26(s)
-r.YD(s)
+H.b_7.prototype={
+$1:function(a){var s=a==null?null:new H.aVA(a),r=new H.a28(s)
+r.YC(s)
this.a.x=r},
-$S:1017}
-H.b_m.prototype={
+$S:1013}
+H.b_8.prototype={
$0:function(){self._flutter_web_set_location_strategy=null},
$C:"$0",
$R:0,
$S:0}
-H.ciW.prototype={
+H.ciu.prototype={
$0:function(){var s=this
s.a.$3(s.b,s.c,s.d)},
$C:"$0",
$R:0,
$S:0}
-H.aw5.prototype={}
-H.aBK.prototype={}
-H.aEO.prototype={
-Bv:function(a){this.LG(a)
-this.iD$=a.iD$
-a.iD$=null},
+H.aw8.prototype={}
+H.aBN.prototype={}
+H.aER.prototype={
+Bt:function(a){this.LG(a)
+this.iC$=a.iC$
+a.iC$=null},
px:function(){this.Ep()
-this.iD$=null}}
-H.aEP.prototype={
-Bv:function(a){this.LG(a)
-this.iD$=a.iD$
-a.iD$=null},
+this.iC$=null}}
+H.aES.prototype={
+Bt:function(a){this.LG(a)
+this.iC$=a.iC$
+a.iC$=null},
px:function(){this.Ep()
-this.iD$=null}}
-H.aEQ.prototype={
-Bv:function(a){this.LG(a)
-this.iD$=a.iD$
-a.iD$=null},
+this.iC$=null}}
+H.aET.prototype={
+Bt:function(a){this.LG(a)
+this.iC$=a.iC$
+a.iC$=null},
px:function(){this.Ep()
-this.iD$=null}}
-H.aJr.prototype={}
+this.iC$=null}}
H.aJu.prototype={}
-H.cNn.prototype={}
-H.a0m.prototype={
+H.aJx.prototype={}
+H.cML.prototype={}
+H.a0o.prototype={
j:function(a){var s="HttpException: "+this.a,r=this.b
if(r!=null)s+=", uri = "+r.j(0)
return s.charCodeAt(0)==0?s:s},
$iep:1}
-H.bRp.prototype={
-ano:function(a,b){var s=b.gca(b)
-if(s)this.b=P.cN7(b,t.N,t.ob)},
+H.bR7.prototype={
+ans:function(a,b){var s=b.gca(b)
+if(s)this.b=P.cMv(b,t.N,t.ob)},
gw:function(a){return this.a},
j:function(a){var s,r,q=new P.eK("")
q.a=this.a
s=this.b
-if(s!=null&&s.gH(s)>0)s.L(0,new H.bRy(q))
+if(s!=null&&s.gH(s)>0)s.L(0,new H.bRg(q))
r=q.a
return r.charCodeAt(0)==0?r:r},
-anz:function(a,b,c,d){var s,r,q,p,o={}
+anD:function(a,b,c,d){var s,r,q,p,o={}
o.a=0
-s=new H.bRq(o,a)
-r=new H.bRx(o,s,a)
-q=new H.bRw(o,s,a,c,b)
-p=new H.bRs(o,s,a)
+s=new H.bR8(o,a)
+r=new H.bRf(o,s,a)
+q=new H.bRe(o,s,a,c,b)
+p=new H.bRa(o,s,a)
r.$0()
this.a=q.$0()
r.$0()
if(s.$0())return
a[o.a]
p.$1(b)
-new H.bRt(o,this,s,a,b,c,!1,q,r,p,new H.bRr(o,s,a)).$0()}}
-H.bRy.prototype={
+new H.bRb(o,this,s,a,b,c,!1,q,r,p,new H.bR9(o,s,a)).$0()}}
+H.bRg.prototype={
$2:function(a,b){var s,r,q,p,o,n=this.a
n.a+="; "
s=n.a+=H.f(a)
if(b!=null){n.a=s+"="
-s=H.div(b)
+s=H.dhT(b)
r=n.a
if(s)n.a=r+b
else{n.a=r+'"'
-for(s=b.length,q=0,p=0;p").a7(b).h("eO<1,2>"))},
+J.Z.prototype={
+v9:function(a,b){return new H.eO(a,H.a0(a).h("@<1>").a6(b).h("eO<1,2>"))},
F:function(a,b){if(!!a.fixed$length)H.b(P.z("add"))
a.push(b)},
-f1:function(a,b){if(!!a.fixed$length)H.b(P.z("removeAt"))
-if(!H.bE(b))throw H.d(H.bu(b))
-if(b<0||b>=a.length)throw H.d(P.Tn(b,null,null))
+f2:function(a,b){if(!!a.fixed$length)H.b(P.z("removeAt"))
+if(!H.bE(b))throw H.d(H.bt(b))
+if(b<0||b>=a.length)throw H.d(P.Tr(b,null,null))
return a.splice(b,1)[0]},
hg:function(a,b,c){if(!!a.fixed$length)H.b(P.z("insert"))
-if(!H.bE(b))throw H.d(H.bu(b))
-if(b<0||b>a.length)throw H.d(P.Tn(b,null,null))
+if(!H.bE(b))throw H.d(H.bt(b))
+if(b<0||b>a.length)throw H.d(P.Tr(b,null,null))
a.splice(b,0,c)},
-Co:function(a,b,c){var s,r
+Cn:function(a,b,c){var s,r
if(!!a.fixed$length)H.b(P.z("insertAll"))
-P.cNU(b,0,a.length,"index")
+P.cNh(b,0,a.length,"index")
if(!t.Ee.b(c))c=J.kS(c)
-s=J.bX(c)
+s=J.bY(c)
a.length=a.length+s
r=b+s
-this.dS(a,r,a.length,a,b)
+this.dT(a,r,a.length,a,b)
this.fC(a,b,r,c)},
kq:function(a){if(!!a.fixed$length)H.b(P.z("removeLast"))
if(a.length===0)throw H.d(H.tl(a,-1))
return a.pop()},
-P:function(a,b){var s
+O:function(a,b){var s
if(!!a.fixed$length)H.b(P.z("remove"))
for(s=0;s"))},
+ip:function(a,b){return new H.az(a,b,H.a0(a).h("az<1>"))},
V:function(a,b){var s
if(!!a.fixed$length)H.b(P.z("addAll"))
-for(s=J.a3(b);s.t();)a.push(s.gC(s))},
+for(s=J.a2(b);s.t();)a.push(s.gC(s))},
cq:function(a){this.sH(a,0)},
L:function(a,b){var s,r=a.length
for(s=0;s").a7(c).h("A<1,2>"))},
-cQ:function(a,b){return this.ep(a,b,t.z)},
+if(a.length!==r)throw H.d(P.dV(a))}},
+eq:function(a,b,c){return new H.B(a,b,H.a0(a).h("@<1>").a6(c).h("B<1,2>"))},
+cQ:function(a,b){return this.eq(a,b,t.z)},
dl:function(a,b){var s,r=P.d6(a.length,"",!1,t.N)
for(s=0;s=0;--s){r=a[s]
if(b.$1(r))return r
-if(q!==a.length)throw H.d(P.dU(a))}if(c!=null)return c.$0()
-throw H.d(H.f5())},
-aac:function(a,b){return this.vC(a,b,null)},
-ahq:function(a,b,c){var s,r,q,p,o=a.length
+if(q!==a.length)throw H.d(P.dV(a))}if(c!=null)return c.$0()
+throw H.d(H.f7())},
+aag:function(a,b){return this.vC(a,b,null)},
+ahu:function(a,b,c){var s,r,q,p,o=a.length
for(s=null,r=!1,q=0;qa.length)throw H.d(P.ee(b,0,a.length,"start",null))
+f5:function(a,b,c){if(b<0||b>a.length)throw H.d(P.ee(b,0,a.length,"start",null))
if(c==null)c=a.length
else if(ca.length)throw H.d(P.ee(c,b,a.length,"end",null))
if(b===c)return H.a([],H.a0(a))
return H.a(a.slice(b,c),H.a0(a))},
-kv:function(a,b){return this.f4(a,b,null)},
-DN:function(a,b,c){P.k4(b,c,a.length)
-return H.ic(a,b,c,H.a0(a).c)},
-ga5:function(a){if(a.length>0)return a[0]
-throw H.d(H.f5())},
+kv:function(a,b){return this.f5(a,b,null)},
+DM:function(a,b,c){P.k4(b,c,a.length)
+return H.ib(a,b,c,H.a0(a).c)},
+ga4:function(a){if(a.length>0)return a[0]
+throw H.d(H.f7())},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
-throw H.d(H.f5())},
+throw H.d(H.f7())},
gfj:function(a){var s=a.length
if(s===1)return a[0]
-if(s===0)throw H.d(H.f5())
-throw H.d(H.cNf())},
+if(s===0)throw H.d(H.f7())
+throw H.d(H.cMD())},
w3:function(a,b,c){if(!!a.fixed$length)H.b(P.z("removeRange"))
P.k4(b,c,a.length)
a.splice(b,c-b)},
-dS:function(a,b,c,d,e){var s,r,q,p,o
+dT:function(a,b,c,d,e){var s,r,q,p,o
if(!!a.immutable$list)H.b(P.z("setRange"))
P.k4(b,c,a.length)
s=c-b
if(s===0)return
-P.iw(e,"skipCount")
+P.iv(e,"skipCount")
if(t.jp.b(d)){r=d
-q=e}else{r=J.aeB(d,e).fX(0,!1)
+q=e}else{r=J.aeE(d,e).fX(0,!1)
q=0}p=J.am(r)
-if(q+s>p.gH(r))throw H.d(H.cU4())
+if(q+s>p.gH(r))throw H.d(H.cTv())
if(q=0;--o)a[b+o]=p.i(r,q+o)
else for(o=0;o"))},
bY:function(a,b){if(!!a.immutable$list)H.b(P.z("sort"))
-H.cVG(a,b==null?J.cP7():b)},
-lF:function(a){return this.bY(a,null)},
-ahn:function(a,b){var s,r,q
+H.cV6(a,b==null?J.cOv():b)},
+lE:function(a){return this.bY(a,null)},
+ahr:function(a,b){var s,r,q
if(!!a.immutable$list)H.b(P.z("shuffle"))
if(b==null)b=C.dd
s=a.length
-for(;s>1;){r=b.mO(s);--s
+for(;s>1;){r=b.mP(s);--s
q=a[s]
this.E(a,s,a[r])
this.E(a,r,q)}},
-ahm:function(a){return this.ahn(a,null)},
-io:function(a,b,c){var s,r=a.length
+ahq:function(a){return this.ahr(a,null)},
+il:function(a,b,c){var s,r=a.length
if(c>=r)return-1
for(s=c;s"))},
+return b?H.a(a.slice(0),s):J.cMF(a.slice(0),s.c)},
+eL:function(a){return this.fX(a,!0)},
+jH:function(a){return P.ht(a,H.a0(a).c)},
+gaJ:function(a){return new J.c8(a,a.length,H.a0(a).h("c8<1>"))},
gG:function(a){return H.k3(a)},
gH:function(a){return a.length},
sH:function(a,b){if(!!a.fixed$length)H.b(P.z("set length"))
@@ -59258,27 +59174,27 @@ E:function(a,b,c){if(!!a.immutable$list)H.b(P.z("indexed set"))
if(!H.bE(b))throw H.d(H.tl(a,b))
if(b>=a.length||b<0)throw H.d(H.tl(a,b))
a[b]=c},
-QG:function(a){return new H.os(a,H.a0(a).h("os<1>"))},
-a8:function(a,b){var s,r,q=H.a([],H.a0(a))
+QF:function(a){return new H.os(a,H.a0(a).h("os<1>"))},
+a7:function(a,b){var s,r,q=H.a([],H.a0(a))
for(s=a.length,r=0;r=a.length)return-1
for(s=c;s=0;--s)if(b.$1(a[s]))return s
return-1},
-aMg:function(a,b){return this.aMh(a,b,null)},
+aMm:function(a,b){return this.aMn(a,b,null)},
$idi:1,
$ibf:1,
$iP:1,
$iD:1}
-J.bbU.prototype={}
+J.bbG.prototype={}
J.c8.prototype={
gC:function(a){return this.d},
t:function(){var s,r=this,q=r.a,p=q.length
@@ -59288,17 +59204,17 @@ if(s>=p){r.d=null
return!1}r.d=q[s]
r.c=s+1
return!0}}
-J.u_.prototype={
-aG:function(a,b){var s
-if(typeof b!="number")throw H.d(H.bu(b))
+J.tZ.prototype={
+aI:function(a,b){var s
+if(typeof b!="number")throw H.d(H.bt(b))
if(ab)return 1
-else if(a===b){if(a===0){s=this.goG(b)
-if(this.goG(a)===s)return 0
-if(this.goG(a))return-1
+else if(a===b){if(a===0){s=this.goH(b)
+if(this.goH(a)===s)return 0
+if(this.goH(a))return-1
return 1}return 0}else if(isNaN(a)){if(isNaN(b))return 0
return 1}else return-1},
-goG:function(a){return a===0?1/a<0:a<0},
+goH:function(a){return a===0?1/a<0:a<0},
gLg:function(a){var s
if(a>0)s=1
else s=a<0?-1:a
@@ -59307,7 +59223,7 @@ eV:function(a){var s
if(a>=-2147483648&&a<=2147483647)return a|0
if(isFinite(a)){s=a<0?Math.ceil(a):Math.floor(a)
return s+0}throw H.d(P.z(""+a+".toInt()"))},
-jx:function(a){var s,r
+jw:function(a){var s,r
if(a>=0){if(a<=2147483647){s=a|0
return a===s?s:s+1}}else if(a>=-2147483648)return a|0
r=Math.ceil(a)
@@ -59318,34 +59234,34 @@ if(a>=0){if(a<=2147483647)return a|0}else if(a>=-2147483648){s=a|0
return a===s?s:s-1}r=Math.floor(a)
if(isFinite(r))return r
throw H.d(P.z(""+a+".floor()"))},
-aY:function(a){if(a>0){if(a!==1/0)return Math.round(a)}else if(a>-1/0)return 0-Math.round(0-a)
+aZ:function(a){if(a>0){if(a!==1/0)return Math.round(a)}else if(a>-1/0)return 0-Math.round(0-a)
throw H.d(P.z(""+a+".round()"))},
-lZ:function(a){if(a<0)return-Math.round(-a)
+lY:function(a){if(a<0)return-Math.round(-a)
else return Math.round(a)},
-aQ:function(a,b,c){if(typeof b!="number")throw H.d(H.bu(b))
-if(typeof c!="number")throw H.d(H.bu(c))
-if(this.aG(b,c)>0)throw H.d(H.bu(b))
-if(this.aG(a,b)<0)return b
-if(this.aG(a,c)>0)return c
+aQ:function(a,b,c){if(typeof b!="number")throw H.d(H.bt(b))
+if(typeof c!="number")throw H.d(H.bt(c))
+if(this.aI(b,c)>0)throw H.d(H.bt(b))
+if(this.aI(a,b)<0)return b
+if(this.aI(a,c)>0)return c
return a},
u_:function(a){return a},
-e8:function(a,b){var s
-if(!H.bE(b))H.b(H.bu(b))
+e6:function(a,b){var s
+if(!H.bE(b))H.b(H.bt(b))
if(b>20)throw H.d(P.ee(b,0,20,"fractionDigits",null))
s=a.toFixed(b)
-if(a===0&&this.goG(a))return"-"+s
+if(a===0&&this.goH(a))return"-"+s
return s},
-jp:function(a,b){var s,r,q,p
+jn:function(a,b){var s,r,q,p
if(b<2||b>36)throw H.d(P.ee(b,2,36,"radix",null))
s=a.toString(b)
-if(C.d.d3(s,s.length-1)!==41)return s
+if(C.d.d1(s,s.length-1)!==41)return s
r=/^([\da-z]+)(?:\.([\da-z]+))?\(e\+(\d+)\)$/.exec(s)
if(r==null)H.b(P.z("Unexpected toString result: "+s))
s=r[1]
q=+r[3]
p=r[2]
if(p!=null){s+=p
-q-=p.length}return s+C.d.b0("0",q)},
+q-=p.length}return s+C.d.b1("0",q)},
j:function(a){if(a===0&&1/a<0)return"-0.0"
else return""+a},
gG:function(a){var s,r,q,p,o=a|0
@@ -59355,60 +59271,60 @@ r=Math.log(s)/0.6931471805599453|0
q=Math.pow(2,r)
p=s<1?s/q:q/s
return 536870911&((p*9007199254740992|0)+(p*3542243181176521|0))*599197+r*1259},
-a8:function(a,b){if(typeof b!="number")throw H.d(H.bu(b))
+a7:function(a,b){if(typeof b!="number")throw H.d(H.bt(b))
return a+b},
-bl:function(a,b){if(typeof b!="number")throw H.d(H.bu(b))
+bl:function(a,b){if(typeof b!="number")throw H.d(H.bt(b))
return a-b},
-eJ:function(a,b){if(typeof b!="number")throw H.d(H.bu(b))
+eG:function(a,b){if(typeof b!="number")throw H.d(H.bt(b))
return a/b},
-b0:function(a,b){if(typeof b!="number")throw H.d(H.bu(b))
+b1:function(a,b){if(typeof b!="number")throw H.d(H.bt(b))
return a*b},
-aU:function(a,b){var s
-if(typeof b!="number")throw H.d(H.bu(b))
+aT:function(a,b){var s
+if(typeof b!="number")throw H.d(H.bt(b))
s=a%b
if(s===0)return 0
if(s>0)return s
if(b<0)return s-b
else return s+b},
-j_:function(a,b){if(typeof b!="number")throw H.d(H.bu(b))
+iY:function(a,b){if(typeof b!="number")throw H.d(H.bt(b))
if((a|0)===a)if(b>=1||b<-1)return a/b|0
-return this.a4A(a,b)},
-dn:function(a,b){return(a|0)===a?a/b|0:this.a4A(a,b)},
-a4A:function(a,b){var s=a/b
+return this.a4E(a,b)},
+dn:function(a,b){return(a|0)===a?a/b|0:this.a4E(a,b)},
+a4E:function(a,b){var s=a/b
if(s>=-2147483648&&s<=2147483647)return s|0
if(s>0){if(s!==1/0)return Math.floor(s)}else if(s>-1/0)return Math.ceil(s)
throw H.d(P.z("Result of truncating division is "+H.f(s)+": "+H.f(a)+" ~/ "+H.f(b)))},
-hz:function(a,b){if(typeof b!="number")throw H.d(H.bu(b))
-if(b<0)throw H.d(H.bu(b))
+hz:function(a,b){if(typeof b!="number")throw H.d(H.bt(b))
+if(b<0)throw H.d(H.bt(b))
return b>31?0:a<>>0},
t5:function(a,b){return b>31?0:a<>>0},
ug:function(a,b){var s
-if(b<0)throw H.d(H.bu(b))
-if(a>0)s=this.xy(a,b)
+if(b<0)throw H.d(H.bt(b))
+if(a>0)s=this.xx(a,b)
else{s=b>31?31:b
s=a>>s>>>0}return s},
fZ:function(a,b){var s
-if(a>0)s=this.xy(a,b)
+if(a>0)s=this.xx(a,b)
else{s=b>31?31:b
s=a>>s>>>0}return s},
-pj:function(a,b){if(b<0)throw H.d(H.bu(b))
-return this.xy(a,b)},
-xy:function(a,b){return b>31?0:a>>>b},
-u5:function(a,b){if(typeof b!="number")throw H.d(H.bu(b))
+pj:function(a,b){if(b<0)throw H.d(H.bt(b))
+return this.xx(a,b)},
+xx:function(a,b){return b>31?0:a>>>b},
+u5:function(a,b){if(typeof b!="number")throw H.d(H.bt(b))
return(a&b)>>>0},
-zL:function(a,b){if(typeof b!="number")throw H.d(H.bu(b))
+zJ:function(a,b){if(typeof b!="number")throw H.d(H.bt(b))
return(a|b)>>>0},
-m1:function(a,b){if(typeof b!="number")throw H.d(H.bu(b))
+m1:function(a,b){if(typeof b!="number")throw H.d(H.bt(b))
return ab},
-q3:function(a,b){if(typeof b!="number")throw H.d(H.bu(b))
+q4:function(a,b){if(typeof b!="number")throw H.d(H.bt(b))
return a>=b},
gdh:function(a){return C.UB},
$idb:1,
$iaF:1,
$icy:1}
-J.RS.prototype={
+J.RW.prototype={
gLg:function(a){var s
if(a>0)s=1
else s=a<0?-1:a
@@ -59427,85 +59343,85 @@ r+=r>>>8
return s-(32-(r+(r>>>16)&63))},
gdh:function(a){return C.c8},
$iy:1}
-J.a0S.prototype={
+J.a0U.prototype={
gdh:function(a){return C.c7}}
-J.wF.prototype={
-d3:function(a,b){if(!H.bE(b))throw H.d(H.tl(a,b))
+J.wG.prototype={
+d1:function(a,b){if(!H.bE(b))throw H.d(H.tl(a,b))
if(b<0)throw H.d(H.tl(a,b))
if(b>=a.length)H.b(H.tl(a,b))
return a.charCodeAt(b)},
-b5:function(a,b){if(b>=a.length)throw H.d(H.tl(a,b))
+b7:function(a,b){if(b>=a.length)throw H.d(H.tl(a,b))
return a.charCodeAt(b)},
GO:function(a,b,c){var s
-if(typeof b!="string")H.b(H.bu(b))
+if(typeof b!="string")H.b(H.bt(b))
s=b.length
if(c>s)throw H.d(P.ee(c,0,s,null,null))
-return new H.aH9(b,a,c)},
+return new H.aHc(b,a,c)},
GN:function(a,b){return this.GO(a,b,0)},
tK:function(a,b,c){var s,r,q=null
if(c<0||c>b.length)throw H.d(P.ee(c,0,b.length,q,q))
s=a.length
if(c+s>b.length)return q
-for(r=0;rr)return!1
-return b===this.eD(a,r-s)},
-f2:function(a,b,c){if(typeof c!="string")H.b(H.bu(c))
-P.cNU(0,0,a.length,"startIndex")
-return H.dGM(a,b,c,0)},
+return b===this.eA(a,r-s)},
+f3:function(a,b,c){if(typeof c!="string")H.b(H.bt(c))
+P.cNh(0,0,a.length,"startIndex")
+return H.dG7(a,b,c,0)},
wv:function(a,b){var s=H.a(a.split(b),t.s)
return s},
pW:function(a,b,c,d){var s
-if(typeof d!="string")H.b(H.bu(d))
+if(typeof d!="string")H.b(H.bt(d))
s=P.k4(b,c,a.length)
-if(!H.bE(s))H.b(H.bu(s))
-return H.cQ3(a,b,s,d)},
-iZ:function(a,b,c){var s
+if(!H.bE(s))H.b(H.bt(s))
+return H.cPs(a,b,s,d)},
+iX:function(a,b,c){var s
if(c<0||c>a.length)throw H.d(P.ee(c,0,a.length,null,null))
if(typeof b=="string"){s=c+b.length
if(s>a.length)return!1
-return b===a.substring(c,s)}return J.cS6(b,a,c)!=null},
-dK:function(a,b){return this.iZ(a,b,0)},
-b2:function(a,b,c){var s=null
-if(!H.bE(b))H.b(H.bu(b))
+return b===a.substring(c,s)}return J.cRw(b,a,c)!=null},
+dK:function(a,b){return this.iX(a,b,0)},
+b3:function(a,b,c){var s=null
+if(!H.bE(b))H.b(H.bt(b))
if(c==null)c=a.length
-if(b<0)throw H.d(P.Tn(b,s,s))
-if(b>c)throw H.d(P.Tn(b,s,s))
-if(c>a.length)throw H.d(P.Tn(c,s,s))
+if(b<0)throw H.d(P.Tr(b,s,s))
+if(b>c)throw H.d(P.Tr(b,s,s))
+if(c>a.length)throw H.d(P.Tr(c,s,s))
return a.substring(b,c)},
-eD:function(a,b){return this.b2(a,b,null)},
+eA:function(a,b){return this.b3(a,b,null)},
Kd:function(a){return a.toLowerCase()},
-en:function(a){var s,r,q,p=a.trim(),o=p.length
+el:function(a){var s,r,q,p=a.trim(),o=p.length
if(o===0)return p
-if(this.b5(p,0)===133){s=J.cNk(p,1)
+if(this.b7(p,0)===133){s=J.cMI(p,1)
if(s===o)return""}else s=0
r=o-1
-q=this.d3(p,r)===133?J.cNl(p,r):o
+q=this.d1(p,r)===133?J.cMJ(p,r):o
if(s===0&&q===o)return p
return p.substring(s,q)},
-aRc:function(a){var s,r
+aRi:function(a){var s,r
if(typeof a.trimLeft!="undefined"){s=a.trimLeft()
if(s.length===0)return s
-r=this.b5(s,0)===133?J.cNk(s,1):0}else{r=J.cNk(a,0)
+r=this.b7(s,0)===133?J.cMI(s,1):0}else{r=J.cMI(a,0)
s=a}if(r===0)return s
if(r===s.length)return""
return s.substring(r)},
-VJ:function(a){var s,r,q
+VI:function(a){var s,r,q
if(typeof a.trimRight!="undefined"){s=a.trimRight()
r=s.length
if(r===0)return s
q=r-1
-if(this.d3(s,q)===133)r=J.cNl(s,q)}else{r=J.cNl(a,a.length)
+if(this.d1(s,q)===133)r=J.cMJ(s,q)}else{r=J.cMJ(a,a.length)
s=a}if(r===s.length)return s
if(r===0)return""
return s.substring(0,r)},
-b0:function(a,b){var s,r
+b1:function(a,b){var s,r
if(0>=b)return""
if(b===1||a.length===0)return a
if(b!==b>>>0)throw H.d(C.X6)
@@ -59515,17 +59431,17 @@ if(b===0)break
s+=s}return r},
h6:function(a,b,c){var s=b-a.length
if(s<=0)return a
-return this.b0(c,s)+a},
-abs:function(a,b){var s=b-a.length
+return this.b1(c,s)+a},
+abw:function(a,b){var s=b-a.length
if(s<=0)return a
-return a+this.b0(" ",s)},
-io:function(a,b,c){var s,r,q,p
+return a+this.b1(" ",s)},
+il:function(a,b,c){var s,r,q,p
if(c<0||c>a.length)throw H.d(P.ee(c,0,a.length,null,null))
if(typeof b=="string")return a.indexOf(b,c)
-if(b instanceof H.B8){s=b.Nn(a,c)
+if(b instanceof H.B7){s=b.Nm(a,c)
return s==null?-1:s.b.index}for(r=a.length,q=J.dB(b),p=c;p<=r;++p)if(q.tK(b,a,p)!=null)return p
return-1},
-fh:function(a,b){return this.io(a,b,0)},
+fh:function(a,b){return this.il(a,b,0)},
IT:function(a,b,c){var s,r,q
if(c==null)c=a.length
else if(c<0||c>a.length)throw H.d(P.ee(c,0,a.length,null,null))
@@ -59535,15 +59451,15 @@ if(c+s>r)c=r-s
return a.lastIndexOf(b,c)}for(s=J.dB(b),q=c;q>=0;--q)if(s.tK(b,a,q)!=null)return q
return-1},
pL:function(a,b){return this.IT(a,b,null)},
-Ri:function(a,b,c){var s
-if(b==null)H.b(H.bu(b))
+Rh:function(a,b,c){var s
+if(b==null)H.b(H.bt(b))
s=a.length
if(c>s)throw H.d(P.ee(c,0,s,null,null))
-return H.aKs(a,b,c)},
-I:function(a,b){return this.Ri(a,b,0)},
+return H.aKv(a,b,c)},
+I:function(a,b){return this.Rh(a,b,0)},
gag:function(a){return a.length===0},
-aG:function(a,b){var s
-if(typeof b!="string")throw H.d(H.bu(b))
+aI:function(a,b){var s
+if(typeof b!="string")throw H.d(H.bt(b))
if(a===b)s=0
else s=a>6}r=536870911&r+((67108863&r)<<3)
r^=r>>11
return 536870911&r+((16383&r)<<15)},
-gdh:function(a){return C.el},
+gdh:function(a){return C.en},
gH:function(a){return a.length},
i:function(a,b){if(!H.bE(b))throw H.d(H.tl(a,b))
if(b>=a.length||b<0)throw H.d(H.tl(a,b))
return a[b]},
$idi:1,
$idb:1,
-$ia2D:1,
+$ia2F:1,
$ic:1}
-H.bKb.prototype={
+H.bJQ.prototype={
F:function(a,b){var s,r,q,p,o,n,m,l=this,k=b.length
if(k===0)return
s=l.a+k
@@ -59583,255 +59499,255 @@ r=o}if(t.H3.b(b))(r&&C.aH).fC(r,l.a,s,b)
else for(n=l.a,m=0;m").a7(s.Q[1]).h("ago<1,2>"))},
-gH:function(a){return J.bX(this.gnd())},
-gag:function(a){return J.eU(this.gnd())},
-gca:function(a){return J.kl(this.gnd())},
-jP:function(a,b){var s=H.F(this)
-return H.zd(J.aeB(this.gnd(),b),s.c,s.Q[1])},
-l2:function(a,b){var s=H.F(this)
-return H.zd(J.cSh(this.gnd(),b),s.c,s.Q[1])},
-dr:function(a,b){return H.F(this).Q[1].a(J.vx(this.gnd(),b))},
-ga5:function(a){return H.F(this).Q[1].a(J.nm(this.gnd()))},
-gaS:function(a){return H.F(this).Q[1].a(J.ER(this.gnd()))},
+H.yl.prototype={
+gaJ:function(a){var s=H.F(this)
+return new H.agr(J.a2(this.gnd()),s.h("@<1>").a6(s.Q[1]).h("agr<1,2>"))},
+gH:function(a){return J.bY(this.gnd())},
+gag:function(a){return J.eV(this.gnd())},
+gca:function(a){return J.kQ(this.gnd())},
+jN:function(a,b){var s=H.F(this)
+return H.zc(J.aeE(this.gnd(),b),s.c,s.Q[1])},
+l1:function(a,b){var s=H.F(this)
+return H.zc(J.cRH(this.gnd(),b),s.c,s.Q[1])},
+dr:function(a,b){return H.F(this).Q[1].a(J.vy(this.gnd(),b))},
+ga4:function(a){return H.F(this).Q[1].a(J.nl(this.gnd()))},
+gaS:function(a){return H.F(this).Q[1].a(J.ES(this.gnd()))},
I:function(a,b){return J.js(this.gnd(),b)},
j:function(a){return J.aD(this.gnd())}}
-H.ago.prototype={
+H.agr.prototype={
t:function(){return this.a.t()},
gC:function(a){var s=this.a
return this.$ti.Q[1].a(s.gC(s))}}
-H.Fv.prototype={
-v9:function(a,b){return H.zd(this.a,H.F(this).c,b)},
+H.Fw.prototype={
+v9:function(a,b){return H.zc(this.a,H.F(this).c,b)},
gnd:function(){return this.a}}
-H.a9_.prototype={$ibf:1}
-H.a8g.prototype={
+H.a92.prototype={$ibf:1}
+H.a8j.prototype={
i:function(a,b){return this.$ti.Q[1].a(J.e(this.a,b))},
E:function(a,b,c){J.c0(this.a,b,this.$ti.c.a(c))},
-sH:function(a,b){J.da2(this.a,b)},
+sH:function(a,b){J.d9p(this.a,b)},
F:function(a,b){J.fI(this.a,this.$ti.c.a(b))},
-bY:function(a,b){var s=b==null?null:new H.bHw(this,b)
-J.nn(this.a,s)},
-hg:function(a,b,c){J.cM8(this.a,b,this.$ti.c.a(c))},
-P:function(a,b){return J.km(this.a,b)},
-f1:function(a,b){return this.$ti.Q[1].a(J.cS9(this.a,b))},
-kq:function(a){return this.$ti.Q[1].a(J.cSb(this.a))},
-l_:function(a,b){J.cSc(this.a,new H.bHu(this,b))},
-pX:function(a,b){J.cSe(this.a,new H.bHv(this,b))},
-DN:function(a,b,c){var s=this.$ti
-return H.zd(J.d9E(this.a,b,c),s.c,s.Q[1])},
-dS:function(a,b,c,d,e){var s=this.$ti
-J.da4(this.a,b,c,H.zd(d,s.Q[1],s.c),e)},
-fC:function(a,b,c,d){return this.dS(a,b,c,d,0)},
+bY:function(a,b){var s=b==null?null:new H.bHc(this,b)
+J.nm(this.a,s)},
+hg:function(a,b,c){J.cLw(this.a,b,this.$ti.c.a(c))},
+O:function(a,b){return J.kn(this.a,b)},
+f2:function(a,b){return this.$ti.Q[1].a(J.cRz(this.a,b))},
+kq:function(a){return this.$ti.Q[1].a(J.cRB(this.a))},
+kZ:function(a,b){J.cRC(this.a,new H.bHa(this,b))},
+pX:function(a,b){J.cRE(this.a,new H.bHb(this,b))},
+DM:function(a,b,c){var s=this.$ti
+return H.zc(J.d90(this.a,b,c),s.c,s.Q[1])},
+dT:function(a,b,c,d,e){var s=this.$ti
+J.d9r(this.a,b,c,H.zc(d,s.Q[1],s.c),e)},
+fC:function(a,b,c,d){return this.dT(a,b,c,d,0)},
$ibf:1,
$iD:1}
-H.bHw.prototype={
+H.bHc.prototype={
$2:function(a,b){var s=this.a.$ti.Q[1]
return this.b.$2(s.a(a),s.a(b))},
$C:"$2",
$R:2,
$S:function(){return this.a.$ti.h("y(1,1)")}}
-H.bHu.prototype={
+H.bHa.prototype={
$1:function(a){return this.b.$1(this.a.$ti.Q[1].a(a))},
-$S:function(){return this.a.$ti.h("a2(1)")}}
-H.bHv.prototype={
+$S:function(){return this.a.$ti.h("a4(1)")}}
+H.bHb.prototype={
$1:function(a){return this.b.$1(this.a.$ti.Q[1].a(a))},
-$S:function(){return this.a.$ti.h("a2(1)")}}
+$S:function(){return this.a.$ti.h("a4(1)")}}
H.eO.prototype={
-v9:function(a,b){return new H.eO(this.a,this.$ti.h("@<1>").a7(b).h("eO<1,2>"))},
+v9:function(a,b){return new H.eO(this.a,this.$ti.h("@<1>").a6(b).h("eO<1,2>"))},
gnd:function(){return this.a}}
-H.vQ.prototype={
-os:function(a,b,c){var s=this.$ti
-return new H.vQ(this.a,s.h("@<1>").a7(s.Q[1]).a7(b).a7(c).h("vQ<1,2,3,4>"))},
-aP:function(a,b){return J.dZ(this.a,b)},
+H.vR.prototype={
+ou:function(a,b,c){var s=this.$ti
+return new H.vR(this.a,s.h("@<1>").a6(s.Q[1]).a6(b).a6(c).h("vR<1,2,3,4>"))},
+aN:function(a,b){return J.e_(this.a,b)},
i:function(a,b){return this.$ti.h("4?").a(J.e(this.a,b))},
E:function(a,b,c){var s=this.$ti
J.c0(this.a,s.c.a(b),s.Q[1].a(c))},
-eH:function(a,b,c){var s=this.$ti
-return s.Q[3].a(J.Yr(this.a,s.c.a(b),new H.aPK(this,c)))},
+eE:function(a,b,c){var s=this.$ti
+return s.Q[3].a(J.Yt(this.a,s.c.a(b),new H.aPN(this,c)))},
V:function(a,b){var s=this.$ti
-J.aey(this.a,new H.vQ(b,s.h("@<3>").a7(s.Q[3]).a7(s.c).a7(s.Q[1]).h("vQ<1,2,3,4>")))},
-P:function(a,b){return this.$ti.Q[3].a(J.km(this.a,b))},
-cq:function(a){J.aKS(this.a)},
-L:function(a,b){J.cc(this.a,new H.aPJ(this,b))},
+J.aeB(this.a,new H.vR(b,s.h("@<3>").a6(s.Q[3]).a6(s.c).a6(s.Q[1]).h("vR<1,2,3,4>")))},
+O:function(a,b){return this.$ti.Q[3].a(J.kn(this.a,b))},
+cq:function(a){J.aKV(this.a)},
+L:function(a,b){J.ci(this.a,new H.aPM(this,b))},
gah:function(a){var s=this.$ti
-return H.zd(J.yQ(this.a),s.c,s.Q[2])},
+return H.zc(J.yP(this.a),s.c,s.Q[2])},
gdY:function(a){var s=this.$ti
-return H.zd(J.cS2(this.a),s.Q[1],s.Q[3])},
-gH:function(a){return J.bX(this.a)},
-gag:function(a){return J.eU(this.a)},
-gca:function(a){return J.kl(this.a)},
-gjX:function(a){return J.aKV(this.a).ep(0,new H.aPI(this),this.$ti.h("el<3,4>"))}}
-H.aPK.prototype={
+return H.zc(J.cRs(this.a),s.Q[1],s.Q[3])},
+gH:function(a){return J.bY(this.a)},
+gag:function(a){return J.eV(this.a)},
+gca:function(a){return J.kQ(this.a)},
+gjV:function(a){return J.aKY(this.a).eq(0,new H.aPL(this),this.$ti.h("ek<3,4>"))}}
+H.aPN.prototype={
$0:function(){return this.a.$ti.Q[1].a(this.b.$0())},
$S:function(){return this.a.$ti.h("2()")}}
-H.aPJ.prototype={
+H.aPM.prototype={
$2:function(a,b){var s=this.a.$ti
this.b.$2(s.Q[2].a(a),s.Q[3].a(b))},
$S:function(){return this.a.$ti.h("w(1,2)")}}
-H.aPI.prototype={
+H.aPL.prototype={
$1:function(a){var s=this.a.$ti,r=s.Q[3]
-return new P.el(s.Q[2].a(a.a),r.a(a.b),s.h("@<3>").a7(r).h("el<1,2>"))},
-$S:function(){return this.a.$ti.h("el<3,4>(el<1,2>)")}}
-H.am3.prototype={
+return new P.ek(s.Q[2].a(a.a),r.a(a.b),s.h("@<3>").a6(r).h("ek<1,2>"))},
+$S:function(){return this.a.$ti.h("ek<3,4>(ek<1,2>)")}}
+H.am6.prototype={
j:function(a){var s=this.a
return s!=null?"LateInitializationError: "+s:"LateInitializationError"}}
-H.arH.prototype={
+H.arK.prototype={
j:function(a){var s="ReachabilityError: "+this.a
return s}}
-H.qF.prototype={
+H.qE.prototype={
gH:function(a){return this.a.length},
-i:function(a,b){return C.d.d3(this.a,b)}}
+i:function(a,b){return C.d.d1(this.a,b)}}
H.bf.prototype={}
H.al.prototype={
-gaH:function(a){var s=this
-return new H.cZ(s,s.gH(s),H.F(s).h("cZ"))},
+gaJ:function(a){var s=this
+return new H.d_(s,s.gH(s),H.F(s).h("d_"))},
L:function(a,b){var s,r=this,q=r.gH(r)
for(s=0;s").a7(c).h("A<1,2>"))},
-cQ:function(a,b){return this.ep(a,b,t.z)},
+ip:function(a,b){return this.mu(0,b)},
+eq:function(a,b,c){return new H.B(this,b,H.F(this).h("@").a6(c).h("B<1,2>"))},
+cQ:function(a,b){return this.eq(a,b,t.z)},
w1:function(a,b){var s,r,q=this,p=q.gH(q)
-if(p===0)throw H.d(H.f5())
+if(p===0)throw H.d(H.f7())
s=q.dr(0,0)
for(r=1;rs)throw H.d(P.ee(r,0,s,"start",null))}},
-garT:function(){var s=J.bX(this.a),r=this.c
+garW:function(){var s=J.bY(this.a),r=this.c
if(r==null||r>s)return s
return r},
-gaDf:function(){var s=J.bX(this.a),r=this.b
+gaDl:function(){var s=J.bY(this.a),r=this.b
if(r>s)return s
return r},
-gH:function(a){var s,r=J.bX(this.a),q=this.b
+gH:function(a){var s,r=J.bY(this.a),q=this.b
if(q>=r)return 0
s=this.c
if(s==null||s>=r)return r-q
return s-q},
-dr:function(a,b){var s=this,r=s.gaDf()+b
-if(b<0||r>=s.garT())throw H.d(P.fv(b,s,"index",null,null))
-return J.vx(s.a,r)},
-jP:function(a,b){var s,r,q=this
-P.iw(b,"count")
+dr:function(a,b){var s=this,r=s.gaDl()+b
+if(b<0||r>=s.garW())throw H.d(P.fv(b,s,"index",null,null))
+return J.vy(s.a,r)},
+jN:function(a,b){var s,r,q=this
+P.iv(b,"count")
s=q.b+b
r=q.c
-if(r!=null&&s>=r)return new H.qQ(q.$ti.h("qQ<1>"))
-return H.ic(q.a,s,r,q.$ti.c)},
-l2:function(a,b){var s,r,q,p=this
-P.iw(b,"count")
+if(r!=null&&s>=r)return new H.qP(q.$ti.h("qP<1>"))
+return H.ib(q.a,s,r,q.$ti.c)},
+l1:function(a,b){var s,r,q,p=this
+P.iv(b,"count")
s=p.c
r=p.b
-if(s==null)return H.ic(p.a,r,r+b,p.$ti.c)
+if(s==null)return H.ib(p.a,r,r+b,p.$ti.c)
else{q=r+b
if(s=o){r.d=null
return!1}r.d=p.dr(q,s);++r.c
return!0}}
H.cQ.prototype={
-gaH:function(a){var s=H.F(this)
-return new H.Sm(J.a3(this.a),this.b,s.h("@<1>").a7(s.Q[1]).h("Sm<1,2>"))},
-gH:function(a){return J.bX(this.a)},
-gag:function(a){return J.eU(this.a)},
-ga5:function(a){return this.b.$1(J.nm(this.a))},
-gaS:function(a){return this.b.$1(J.ER(this.a))},
-dr:function(a,b){return this.b.$1(J.vx(this.a,b))}}
+gaJ:function(a){var s=H.F(this)
+return new H.Sq(J.a2(this.a),this.b,s.h("@<1>").a6(s.Q[1]).h("Sq<1,2>"))},
+gH:function(a){return J.bY(this.a)},
+gag:function(a){return J.eV(this.a)},
+ga4:function(a){return this.b.$1(J.nl(this.a))},
+gaS:function(a){return this.b.$1(J.ES(this.a))},
+dr:function(a,b){return this.b.$1(J.vy(this.a,b))}}
H.og.prototype={$ibf:1}
-H.Sm.prototype={
+H.Sq.prototype={
t:function(){var s=this,r=s.b
if(r.t()){s.a=s.c.$1(r.gC(r))
return!0}s.a=null
return!1},
gC:function(a){var s=this.a
return s}}
-H.A.prototype={
-gH:function(a){return J.bX(this.a)},
-dr:function(a,b){return this.b.$1(J.vx(this.a,b))}}
-H.ay.prototype={
-gaH:function(a){return new H.nd(J.a3(this.a),this.b,this.$ti.h("nd<1>"))},
-ep:function(a,b,c){return new H.cQ(this,b,this.$ti.h("@<1>").a7(c).h("cQ<1,2>"))},
-cQ:function(a,b){return this.ep(a,b,t.z)}}
-H.nd.prototype={
+H.B.prototype={
+gH:function(a){return J.bY(this.a)},
+dr:function(a,b){return this.b.$1(J.vy(this.a,b))}}
+H.az.prototype={
+gaJ:function(a){return new H.nc(J.a2(this.a),this.b,this.$ti.h("nc<1>"))},
+eq:function(a,b,c){return new H.cQ(this,b,this.$ti.h("@<1>").a6(c).h("cQ<1,2>"))},
+cQ:function(a,b){return this.eq(a,b,t.z)}}
+H.nc.prototype={
t:function(){var s,r
for(s=this.a,r=this.b;s.t();)if(r.$1(s.gC(s)))return!0
return!1},
gC:function(a){var s=this.a
return s.gC(s)}}
H.jz.prototype={
-gaH:function(a){var s=this.$ti
-return new H.tU(J.a3(this.a),this.b,C.jq,s.h("@<1>").a7(s.Q[1]).h("tU<1,2>"))}}
-H.tU.prototype={
+gaJ:function(a){var s=this.$ti
+return new H.tT(J.a2(this.a),this.b,C.js,s.h("@<1>").a6(s.Q[1]).h("tT<1,2>"))}}
+H.tT.prototype={
gC:function(a){var s=this.d
return s},
t:function(){var s,r,q=this,p=q.c
if(p==null)return!1
for(s=q.a,r=q.b;!p.t();){q.d=null
if(s.t()){q.c=null
-p=J.a3(r.$1(s.gC(s)))
+p=J.a2(r.$1(s.gC(s)))
q.c=p}else return!1}p=q.c
q.d=p.gC(p)
return!0}}
-H.MF.prototype={
-gaH:function(a){return new H.av_(J.a3(this.a),this.b,H.F(this).h("av_<1>"))}}
-H.a_t.prototype={
-gH:function(a){var s=J.bX(this.a),r=this.b
+H.MH.prototype={
+gaJ:function(a){return new H.av2(J.a2(this.a),this.b,H.F(this).h("av2<1>"))}}
+H.a_v.prototype={
+gH:function(a){var s=J.bY(this.a),r=this.b
if(s>r)return r
return s},
$ibf:1}
-H.av_.prototype={
+H.av2.prototype={
t:function(){if(--this.b>=0)return this.a.t()
this.b=-1
return!1},
@@ -59840,140 +59756,140 @@ if(this.b<0)return null
s=this.a
return s.gC(s)}}
H.xC.prototype={
-jP:function(a,b){P.eB(b,"count")
-P.iw(b,"count")
+jN:function(a,b){P.ez(b,"count")
+P.iv(b,"count")
return new H.xC(this.a,this.b+b,H.F(this).h("xC<1>"))},
-gaH:function(a){return new H.Vc(J.a3(this.a),this.b,H.F(this).h("Vc<1>"))}}
-H.Rb.prototype={
-gH:function(a){var s=J.bX(this.a)-this.b
+gaJ:function(a){return new H.Vg(J.a2(this.a),this.b,H.F(this).h("Vg<1>"))}}
+H.Rf.prototype={
+gH:function(a){var s=J.bY(this.a)-this.b
if(s>=0)return s
return 0},
-jP:function(a,b){P.eB(b,"count")
-P.iw(b,"count")
-return new H.Rb(this.a,this.b+b,this.$ti)},
+jN:function(a,b){P.ez(b,"count")
+P.iv(b,"count")
+return new H.Rf(this.a,this.b+b,this.$ti)},
$ibf:1}
-H.Vc.prototype={
+H.Vg.prototype={
t:function(){var s,r
for(s=this.a,r=0;r"))}}
-H.aub.prototype={
+H.a4n.prototype={
+gaJ:function(a){return new H.aue(J.a2(this.a),this.b,this.$ti.h("aue<1>"))}}
+H.aue.prototype={
t:function(){var s,r,q=this
if(!q.c){q.c=!0
for(s=q.a,r=q.b;s.t();)if(!r.$1(s.gC(s)))return!0}return q.a.t()},
gC:function(a){var s=this.a
return s.gC(s)}}
-H.qQ.prototype={
-gaH:function(a){return C.jq},
+H.qP.prototype={
+gaJ:function(a){return C.js},
L:function(a,b){},
gag:function(a){return!0},
gH:function(a){return 0},
-ga5:function(a){throw H.d(H.f5())},
-gaS:function(a){throw H.d(H.f5())},
+ga4:function(a){throw H.d(H.f7())},
+gaS:function(a){throw H.d(H.f7())},
dr:function(a,b){throw H.d(P.ee(b,0,0,"index",null))},
I:function(a,b){return!1},
dl:function(a,b){return""},
-iM:function(a,b){return this},
-ep:function(a,b,c){return new H.qQ(c.h("qQ<0>"))},
-cQ:function(a,b){return this.ep(a,b,t.z)},
-jP:function(a,b){P.iw(b,"count")
+ip:function(a,b){return this},
+eq:function(a,b,c){return new H.qP(c.h("qP<0>"))},
+cQ:function(a,b){return this.eq(a,b,t.z)},
+jN:function(a,b){P.iv(b,"count")
return this},
-l2:function(a,b){P.iw(b,"count")
+l1:function(a,b){P.iv(b,"count")
return this},
fX:function(a,b){var s=this.$ti.c
-return b?J.RQ(0,s):J.a0R(0,s)},
-eN:function(a){return this.fX(a,!0)},
-jJ:function(a){return P.fP(this.$ti.c)}}
-H.ak8.prototype={
+return b?J.RU(0,s):J.a0T(0,s)},
+eL:function(a){return this.fX(a,!0)},
+jH:function(a){return P.fP(this.$ti.c)}}
+H.akb.prototype={
t:function(){return!1},
-gC:function(a){throw H.d(H.f5())}}
-H.IW.prototype={
-gaH:function(a){return new H.al2(J.a3(this.a),this.b,H.F(this).h("al2<1>"))},
+gC:function(a){throw H.d(H.f7())}}
+H.IX.prototype={
+gaJ:function(a){return new H.al5(J.a2(this.a),this.b,H.F(this).h("al5<1>"))},
gH:function(a){var s=this.b
-return J.bX(this.a)+s.gH(s)},
+return J.bY(this.a)+s.gH(s)},
gag:function(a){var s
-if(J.eU(this.a)){s=this.b
-s=!s.gaH(s).t()}else s=!1
+if(J.eV(this.a)){s=this.b
+s=!s.gaJ(s).t()}else s=!1
return s},
gca:function(a){var s
-if(!J.kl(this.a)){s=this.b
+if(!J.kQ(this.a)){s=this.b
s=!s.gag(s)}else s=!0
return s},
I:function(a,b){return J.js(this.a,b)||this.b.I(0,b)},
-ga5:function(a){var s,r=J.a3(this.a)
+ga4:function(a){var s,r=J.a2(this.a)
if(r.t())return r.gC(r)
s=this.b
-return s.ga5(s)},
-gaS:function(a){var s,r,q=this.b,p=q.$ti,o=new H.tU(J.a3(q.a),q.b,C.jq,p.h("@<1>").a7(p.Q[1]).h("tU<1,2>"))
+return s.ga4(s)},
+gaS:function(a){var s,r,q=this.b,p=q.$ti,o=new H.tT(J.a2(q.a),q.b,C.js,p.h("@<1>").a6(p.Q[1]).h("tT<1,2>"))
if(o.t()){s=o.gC(o)
for(;o.t();s=r)r=o.d
-return s}return J.ER(this.a)}}
-H.al2.prototype={
+return s}return J.ES(this.a)}}
+H.al5.prototype={
t:function(){var s,r,q=this
if(q.a.t())return!0
s=q.b
if(s!=null){r=s.$ti
-r=new H.tU(J.a3(s.a),s.b,C.jq,r.h("@<1>").a7(r.Q[1]).h("tU<1,2>"))
+r=new H.tT(J.a2(s.a),s.b,C.js,r.h("@<1>").a6(r.Q[1]).h("tT<1,2>"))
q.a=r
q.b=null
return r.t()}return!1},
gC:function(a){var s=this.a
return s.gC(s)}}
H.mh.prototype={
-gaH:function(a){return new H.Ek(J.a3(this.a),this.$ti.h("Ek<1>"))}}
+gaJ:function(a){return new H.Ek(J.a2(this.a),this.$ti.h("Ek<1>"))}}
H.Ek.prototype={
t:function(){var s,r
for(s=this.a,r=this.$ti.c;s.t();)if(r.b(s.gC(s)))return!0
return!1},
gC:function(a){var s=this.a
return this.$ti.c.a(s.gC(s))}}
-H.a_W.prototype={
+H.a_Y.prototype={
sH:function(a,b){throw H.d(P.z("Cannot change the length of a fixed-length list"))},
F:function(a,b){throw H.d(P.z("Cannot add to a fixed-length list"))},
hg:function(a,b,c){throw H.d(P.z("Cannot add to a fixed-length list"))},
-P:function(a,b){throw H.d(P.z("Cannot remove from a fixed-length list"))},
-l_:function(a,b){throw H.d(P.z("Cannot remove from a fixed-length list"))},
+O:function(a,b){throw H.d(P.z("Cannot remove from a fixed-length list"))},
+kZ:function(a,b){throw H.d(P.z("Cannot remove from a fixed-length list"))},
pX:function(a,b){throw H.d(P.z("Cannot remove from a fixed-length list"))},
-f1:function(a,b){throw H.d(P.z("Cannot remove from a fixed-length list"))},
+f2:function(a,b){throw H.d(P.z("Cannot remove from a fixed-length list"))},
kq:function(a){throw H.d(P.z("Cannot remove from a fixed-length list"))}}
-H.avB.prototype={
+H.avE.prototype={
E:function(a,b,c){throw H.d(P.z("Cannot modify an unmodifiable list"))},
sH:function(a,b){throw H.d(P.z("Cannot change the length of an unmodifiable list"))},
F:function(a,b){throw H.d(P.z("Cannot add to an unmodifiable list"))},
hg:function(a,b,c){throw H.d(P.z("Cannot add to an unmodifiable list"))},
-P:function(a,b){throw H.d(P.z("Cannot remove from an unmodifiable list"))},
-l_:function(a,b){throw H.d(P.z("Cannot remove from an unmodifiable list"))},
+O:function(a,b){throw H.d(P.z("Cannot remove from an unmodifiable list"))},
+kZ:function(a,b){throw H.d(P.z("Cannot remove from an unmodifiable list"))},
pX:function(a,b){throw H.d(P.z("Cannot remove from an unmodifiable list"))},
bY:function(a,b){throw H.d(P.z("Cannot modify an unmodifiable list"))},
-f1:function(a,b){throw H.d(P.z("Cannot remove from an unmodifiable list"))},
+f2:function(a,b){throw H.d(P.z("Cannot remove from an unmodifiable list"))},
kq:function(a){throw H.d(P.z("Cannot remove from an unmodifiable list"))},
-dS:function(a,b,c,d,e){throw H.d(P.z("Cannot modify an unmodifiable list"))},
-fC:function(a,b,c,d){return this.dS(a,b,c,d,0)}}
-H.VY.prototype={}
-H.aDH.prototype={
-gH:function(a){return J.bX(this.a)},
-dr:function(a,b){P.cNT(b,this,null,null)
+dT:function(a,b,c,d,e){throw H.d(P.z("Cannot modify an unmodifiable list"))},
+fC:function(a,b,c,d){return this.dT(a,b,c,d,0)}}
+H.W0.prototype={}
+H.aDK.prototype={
+gH:function(a){return J.bY(this.a)},
+dr:function(a,b){P.cNg(b,this,null,null)
return b}}
H.os.prototype={
-i:function(a,b){return this.aP(0,b)?J.e(this.a,H.b4(b)):null},
-gH:function(a){return J.bX(this.a)},
-gdY:function(a){return H.ic(this.a,0,null,this.$ti.c)},
-gah:function(a){return new H.aDH(this.a)},
-gag:function(a){return J.eU(this.a)},
-gca:function(a){return J.kl(this.a)},
-aP:function(a,b){return H.bE(b)&&b>=0&&b=0&&b"))},
-aJS:function(a,b){var s=this
-return P.hG(function(){var r=a
+gjV:function(a){return this.aJY(a,H.F(this).h("ek<1,2>"))},
+aJY:function(a,b){var s=this
+return P.hF(function(){var r=a
var q=0,p=1,o,n,m,l,k
-return function $async$gjX(c,d){if(c===1){o=d
-q=p}while(true)switch(q){case 0:n=s.gah(s),n=n.gaH(n),m=H.F(s),m=m.h("@<1>").a7(m.Q[1]).h("el<1,2>")
+return function $async$gjV(c,d){if(c===1){o=d
+q=p}while(true)switch(q){case 0:n=s.gah(s),n=n.gaJ(n),m=H.F(s),m=m.h("@<1>").a6(m.Q[1]).h("ek<1,2>")
case 2:if(!n.t()){q=3
break}l=n.gC(n)
k=s.i(0,l)
k.toString
q=4
-return new P.el(l,k,m)
+return new P.ek(l,k,m)
case 4:q=2
break
-case 3:return P.hD()
-case 1:return P.hE(o)}}},b)},
-oL:function(a,b,c,d){var s=P.ab(c,d)
-this.L(0,new H.aTy(this,b,s))
+case 3:return P.hC()
+case 1:return P.hD(o)}}},b)},
+oM:function(a,b,c,d){var s=P.ab(c,d)
+this.L(0,new H.aTj(this,b,s))
return s},
-cQ:function(a,b){return this.oL(a,b,t.z,t.z)},
+cQ:function(a,b){return this.oM(a,b,t.z,t.z)},
$ibr:1}
-H.aTy.prototype={
+H.aTj.prototype={
$2:function(a,b){var s=this.b.$2(a,b)
this.c.E(0,s.a,s.b)},
$S:function(){return H.F(this.a).h("w(1,2)")}}
H.ao.prototype={
gH:function(a){return this.a},
-aP:function(a,b){if(typeof b!="string")return!1
+aN:function(a,b){if(typeof b!="string")return!1
if("__proto__"===b)return!1
return this.b.hasOwnProperty(b)},
-i:function(a,b){if(!this.aP(0,b))return null
-return this.Nt(b)},
-Nt:function(a){return this.b[a]},
+i:function(a,b){if(!this.aN(0,b))return null
+return this.Ns(b)},
+Ns:function(a){return this.b[a]},
L:function(a,b){var s,r,q,p=this.c
for(s=p.length,r=0;r"))},
+b.$2(q,this.Ns(q))}},
+gah:function(a){return new H.a8u(this,H.F(this).h("a8u<1>"))},
gdY:function(a){var s=H.F(this)
-return H.lX(this.c,new H.aTz(this),s.c,s.Q[1])}}
-H.aTz.prototype={
-$1:function(a){return this.a.Nt(a)},
+return H.lY(this.c,new H.aTk(this),s.c,s.Q[1])}}
+H.aTk.prototype={
+$1:function(a){return this.a.Ns(a)},
$S:function(){return H.F(this.a).h("2(1)")}}
-H.a8r.prototype={
-gaH:function(a){var s=this.a.c
+H.a8u.prototype={
+gaJ:function(a){var s=this.a.c
return new J.c8(s,s.length,H.a0(s).h("c8<1>"))},
gH:function(a){return this.a.c.length}}
H.cT.prototype={
-x8:function(){var s,r=this,q=r.$map
+x7:function(){var s,r=this,q=r.$map
if(q==null){s=r.$ti
-q=new H.hN(s.h("@<1>").a7(s.Q[1]).h("hN<1,2>"))
-H.d_C(r.a,q)
+q=new H.hM(s.h("@<1>").a6(s.Q[1]).h("hM<1,2>"))
+H.d_1(r.a,q)
r.$map=q}return q},
-aP:function(a,b){return this.x8().aP(0,b)},
-i:function(a,b){return this.x8().i(0,b)},
-L:function(a,b){this.x8().L(0,b)},
-gah:function(a){var s=this.x8()
+aN:function(a,b){return this.x7().aN(0,b)},
+i:function(a,b){return this.x7().i(0,b)},
+L:function(a,b){this.x7().L(0,b)},
+gah:function(a){var s=this.x7()
return s.gah(s)},
-gdY:function(a){var s=this.x8()
+gdY:function(a){var s=this.x7()
return s.gdY(s)},
-gH:function(a){var s=this.x8()
+gH:function(a){var s=this.x7()
return s.gH(s)}}
-H.alG.prototype={
-amW:function(a){if(false)H.d_X(0,0)},
-j:function(a){var s="<"+C.b.dl([H.Z(this.$ti.c)],", ")+">"
+H.alJ.prototype={
+an_:function(a){if(false)H.d_n(0,0)},
+j:function(a){var s="<"+C.b.dl([H.Y(this.$ti.c)],", ")+">"
return H.f(this.a)+" with "+s}}
-H.JC.prototype={
+H.JD.prototype={
$1:function(a){return this.a.$1$1(a,this.$ti.Q[0])},
$2:function(a,b){return this.a.$1$2(a,b,this.$ti.Q[0])},
$0:function(){return this.a.$1$0(this.$ti.Q[0])},
$4:function(a,b,c,d){return this.a.$1$4(a,b,c,d,this.$ti.Q[0])},
-$S:function(){return H.d_X(H.Yg(this.a),this.$ti)}}
-H.bbP.prototype={
-gaaS:function(){var s=this.a
+$S:function(){return H.d_n(H.Yi(this.a),this.$ti)}}
+H.bbB.prototype={
+gaaW:function(){var s=this.a
return s},
-gabK:function(){var s,r,q,p,o=this
+gabO:function(){var s,r,q,p,o=this
if(o.c===1)return C.f
s=o.d
r=s.length-o.e.length-o.f
if(r===0)return C.f
q=[]
for(p=0;p>>0},
j:function(a){var s=this.c
if(s==null)s=this.a
-return"Closure '"+H.f(this.d)+"' of "+("Instance of '"+H.f(H.bjm(s))+"'")}}
-H.at3.prototype={
+return"Closure '"+H.f(this.d)+"' of "+("Instance of '"+H.f(H.bjd(s))+"'")}}
+H.at6.prototype={
j:function(a){return"RuntimeError: "+this.a}}
-H.c1w.prototype={}
-H.hN.prototype={
+H.c1e.prototype={}
+H.hM.prototype={
gH:function(a){return this.a},
gag:function(a){return this.a===0},
gca:function(a){return!this.gag(this)},
-gah:function(a){return new H.a1e(this,H.F(this).h("a1e<1>"))},
+gah:function(a){return new H.a1g(this,H.F(this).h("a1g<1>"))},
gdY:function(a){var s=this,r=H.F(s)
-return H.lX(s.gah(s),new H.bbW(s),r.c,r.Q[1])},
-aP:function(a,b){var s,r,q=this
+return H.lY(s.gah(s),new H.bbI(s),r.c,r.Q[1])},
+aN:function(a,b){var s,r,q=this
if(typeof b=="string"){s=q.b
if(s==null)return!1
-return q.a_5(s,b)}else if(typeof b=="number"&&(b&0x3ffffff)===b){r=q.c
+return q.a_4(s,b)}else if(typeof b=="number"&&(b&0x3ffffff)===b){r=q.c
if(r==null)return!1
-return q.a_5(r,b)}else return q.a9F(b)},
-a9F:function(a){var s=this,r=s.d
+return q.a_4(r,b)}else return q.a9J(b)},
+a9J:function(a){var s=this,r=s.d
if(r==null)return!1
-return s.yJ(s.Fc(r,s.yI(a)),a)>=0},
-V:function(a,b){J.cc(b,new H.bbV(this))},
+return s.yH(s.Fc(r,s.yG(a)),a)>=0},
+V:function(a,b){J.ci(b,new H.bbH(this))},
i:function(a,b){var s,r,q,p,o=this,n=null
if(typeof b=="string"){s=o.b
if(s==null)return n
-r=o.AI(s,b)
+r=o.AG(s,b)
q=r==null?n:r.b
return q}else if(typeof b=="number"&&(b&0x3ffffff)===b){p=o.c
if(p==null)return n
-r=o.AI(p,b)
+r=o.AG(p,b)
q=r==null?n:r.b
-return q}else return o.a9H(b)},
-a9H:function(a){var s,r,q=this,p=q.d
+return q}else return o.a9L(b)},
+a9L:function(a){var s,r,q=this,p=q.d
if(p==null)return null
-s=q.Fc(p,q.yI(a))
-r=q.yJ(s,a)
+s=q.Fc(p,q.yG(a))
+r=q.yH(s,a)
if(r<0)return null
return s[r].b},
E:function(a,b,c){var s,r,q=this
if(typeof b=="string"){s=q.b
-q.YL(s==null?q.b=q.OI():s,b,c)}else if(typeof b=="number"&&(b&0x3ffffff)===b){r=q.c
-q.YL(r==null?q.c=q.OI():r,b,c)}else q.a9J(b,c)},
-a9J:function(a,b){var s,r,q,p=this,o=p.d
-if(o==null)o=p.d=p.OI()
-s=p.yI(a)
+q.YK(s==null?q.b=q.OH():s,b,c)}else if(typeof b=="number"&&(b&0x3ffffff)===b){r=q.c
+q.YK(r==null?q.c=q.OH():r,b,c)}else q.a9N(b,c)},
+a9N:function(a,b){var s,r,q,p=this,o=p.d
+if(o==null)o=p.d=p.OH()
+s=p.yG(a)
r=p.Fc(o,s)
-if(r==null)p.Pj(o,s,[p.OJ(a,b)])
-else{q=p.yJ(r,a)
+if(r==null)p.Pi(o,s,[p.OI(a,b)])
+else{q=p.yH(r,a)
if(q>=0)r[q].b=b
-else r.push(p.OJ(a,b))}},
-eH:function(a,b,c){var s
-if(this.aP(0,b))return this.i(0,b)
+else r.push(p.OI(a,b))}},
+eE:function(a,b,c){var s
+if(this.aN(0,b))return this.i(0,b)
s=c.$0()
this.E(0,b,s)
return s},
-P:function(a,b){var s=this
-if(typeof b=="string")return s.a37(s.b,b)
-else if(typeof b=="number"&&(b&0x3ffffff)===b)return s.a37(s.c,b)
-else return s.a9I(b)},
-a9I:function(a){var s,r,q,p,o=this,n=o.d
+O:function(a,b){var s=this
+if(typeof b=="string")return s.a3a(s.b,b)
+else if(typeof b=="number"&&(b&0x3ffffff)===b)return s.a3a(s.c,b)
+else return s.a9M(b)},
+a9M:function(a){var s,r,q,p,o=this,n=o.d
if(n==null)return null
-s=o.yI(a)
+s=o.yG(a)
r=o.Fc(n,s)
-q=o.yJ(r,a)
+q=o.yH(r,a)
if(q<0)return null
p=r.splice(q,1)[0]
-o.a4X(p)
-if(r.length===0)o.N6(n,s)
+o.a50(p)
+if(r.length===0)o.N5(n,s)
return p.b},
cq:function(a){var s=this
if(s.a>0){s.b=s.c=s.d=s.e=s.f=null
s.a=0
-s.OH()}},
+s.OG()}},
L:function(a,b){var s=this,r=s.e,q=s.r
for(;r!=null;){b.$2(r.a,r.b)
-if(q!==s.r)throw H.d(P.dU(s))
+if(q!==s.r)throw H.d(P.dV(s))
r=r.c}},
-YL:function(a,b,c){var s=this.AI(a,b)
-if(s==null)this.Pj(a,b,this.OJ(b,c))
+YK:function(a,b,c){var s=this.AG(a,b)
+if(s==null)this.Pi(a,b,this.OI(b,c))
else s.b=c},
-a37:function(a,b){var s
+a3a:function(a,b){var s
if(a==null)return null
-s=this.AI(a,b)
+s=this.AG(a,b)
if(s==null)return null
-this.a4X(s)
-this.N6(a,b)
+this.a50(s)
+this.N5(a,b)
return s.b},
-OH:function(){this.r=this.r+1&67108863},
-OJ:function(a,b){var s,r=this,q=new H.bcY(a,b)
+OG:function(){this.r=this.r+1&67108863},
+OI:function(a,b){var s,r=this,q=new H.bcK(a,b)
if(r.e==null)r.e=r.f=q
else{s=r.f
s.toString
q.d=s
r.f=s.c=q}++r.a
-r.OH()
+r.OG()
return q},
-a4X:function(a){var s=this,r=a.d,q=a.c
+a50:function(a){var s=this,r=a.d,q=a.c
if(r==null)s.e=q
else r.c=q
if(q==null)s.f=r
else q.d=r;--s.a
-s.OH()},
-yI:function(a){return J.h(a)&0x3ffffff},
-yJ:function(a,b){var s,r
+s.OG()},
+yG:function(a){return J.h(a)&0x3ffffff},
+yH:function(a,b){var s,r
if(a==null)return-1
s=a.length
for(r=0;r"))
+gaJ:function(a){var s=this.a,r=new H.amo(s,s.r,this.$ti.h("amo<1>"))
r.c=s.e
return r},
-I:function(a,b){return this.a.aP(0,b)},
+I:function(a,b){return this.a.aN(0,b)},
L:function(a,b){var s=this.a,r=s.e,q=s.r
for(;r!=null;){b.$1(r.a)
-if(q!==s.r)throw H.d(P.dU(s))
+if(q!==s.r)throw H.d(P.dV(s))
r=r.c}}}
-H.aml.prototype={
+H.amo.prototype={
gC:function(a){return this.d},
t:function(){var s,r=this,q=r.a
-if(r.b!==q.r)throw H.d(P.dU(q))
+if(r.b!==q.r)throw H.d(P.dV(q))
s=r.c
if(s==null){r.d=null
return!1}else{r.d=s.a
r.c=s.c
return!0}}}
-H.cHL.prototype={
+H.cHc.prototype={
$1:function(a){return this.a(a)},
-$S:8}
-H.cHM.prototype={
+$S:7}
+H.cHd.prototype={
$2:function(a,b){return this.a(a,b)},
-$S:1067}
-H.cHN.prototype={
+$S:1063}
+H.cHe.prototype={
$1:function(a){return this.a(a)},
-$S:1078}
-H.B8.prototype={
+$S:1066}
+H.B7.prototype={
j:function(a){return"RegExp/"+H.f(this.a)+"/"+this.b.flags},
ga2a:function(){var s=this,r=s.c
if(r!=null)return r
r=s.b
-return s.c=H.cNm(s.a,r.multiline,!r.ignoreCase,r.unicode,r.dotAll,!0)},
-gaz1:function(){var s=this,r=s.d
+return s.c=H.cMK(s.a,r.multiline,!r.ignoreCase,r.unicode,r.dotAll,!0)},
+gaz5:function(){var s=this,r=s.d
if(r!=null)return r
r=s.b
-return s.d=H.cNm(H.f(s.a)+"|()",r.multiline,!r.ignoreCase,r.unicode,r.dotAll,!0)},
+return s.d=H.cMK(H.f(s.a)+"|()",r.multiline,!r.ignoreCase,r.unicode,r.dotAll,!0)},
mk:function(a){var s
-if(typeof a!="string")H.b(H.bu(a))
+if(typeof a!="string")H.b(H.bt(a))
s=this.b.exec(a)
if(s==null)return null
-return new H.Oq(s)},
+return new H.Ot(s)},
Eg:function(a){var s=this.mk(a)
if(s!=null)return s.b[0]
return null},
GO:function(a,b,c){var s=b.length
if(c>s)throw H.d(P.ee(c,0,s,null,null))
-return new H.azu(this,b,c)},
+return new H.azx(this,b,c)},
GN:function(a,b){return this.GO(a,b,0)},
-Nn:function(a,b){var s,r=this.ga2a()
+Nm:function(a,b){var s,r=this.ga2a()
r.lastIndex=b
s=r.exec(a)
if(s==null)return null
-return new H.Oq(s)},
-as1:function(a,b){var s,r=this.gaz1()
+return new H.Ot(s)},
+as4:function(a,b){var s,r=this.gaz5()
r.lastIndex=b
s=r.exec(a)
if(s==null)return null
if(s.pop()!=null)return null
-return new H.Oq(s)},
+return new H.Ot(s)},
tK:function(a,b,c){if(c<0||c>b.length)throw H.d(P.ee(c,0,b.length,null,null))
-return this.as1(b,c)},
-$ia2D:1,
+return this.as4(b,c)},
+$ia2F:1,
$ixn:1}
-H.Oq.prototype={
-ged:function(a){return this.b.index},
-ge9:function(a){var s=this.b
+H.Ot.prototype={
+geb:function(a){return this.b.index},
+ge7:function(a){var s=this.b
return s.index+s[0].length},
-DS:function(a){return this.b[a]},
+DR:function(a){return this.b[a]},
i:function(a,b){return this.b[b]},
$irb:1,
-$iboc:1}
-H.azu.prototype={
-gaH:function(a){return new H.bFb(this.a,this.b,this.c)}}
-H.bFb.prototype={
+$ibo2:1}
+H.azx.prototype={
+gaJ:function(a){return new H.bER(this.a,this.b,this.c)}}
+H.bER.prototype={
gC:function(a){return this.d},
t:function(){var s,r,q,p,o,n=this,m=n.b
if(m==null)return!1
s=n.c
r=m.length
if(s<=r){q=n.a
-p=q.Nn(m,s)
+p=q.Nm(m,s)
if(p!=null){n.d=p
-o=p.ge9(p)
+o=p.ge7(p)
if(p.b.index===o){if(q.b.unicode){s=n.c
q=s+1
-if(q=55296&&s<=56319){s=C.d.d3(m,q)
+if(q=55296&&s<=56319){s=C.d.d1(m,q)
s=s>=56320&&s<=57343}else s=!1}else s=!1}else s=!1
o=(s?o+1:o)+1}n.c=o
return!0}}n.b=n.d=null
return!1}}
H.uU.prototype={
-ge9:function(a){return this.a+this.c.length},
-i:function(a,b){return this.DS(b)},
-DS:function(a){if(a!==0)throw H.d(P.Tn(a,null,null))
+ge7:function(a){return this.a+this.c.length},
+i:function(a,b){return this.DR(b)},
+DR:function(a){if(a!==0)throw H.d(P.Tr(a,null,null))
return this.c},
$irb:1,
-ged:function(a){return this.a}}
-H.aH9.prototype={
-gaH:function(a){return new H.c2v(this.a,this.b,this.c)},
-ga5:function(a){var s=this.b,r=this.a.indexOf(s,this.c)
+geb:function(a){return this.a}}
+H.aHc.prototype={
+gaJ:function(a){return new H.c2d(this.a,this.b,this.c)},
+ga4:function(a){var s=this.b,r=this.a.indexOf(s,this.c)
if(r>=0)return new H.uU(r,s)
-throw H.d(H.f5())}}
-H.c2v.prototype={
+throw H.d(H.f7())}}
+H.c2d.prototype={
t:function(){var s,r,q=this,p=q.c,o=q.b,n=o.length,m=q.a,l=m.length
if(p+n>l){q.d=null
return!1}s=m.indexOf(o,p)
@@ -60412,27 +60328,27 @@ return!0},
gC:function(a){var s=this.d
s.toString
return s}}
-H.L9.prototype={
+H.La.prototype={
gdh:function(a){return C.arw},
-a6h:function(a,b,c){throw H.d(P.z("Int64List not supported by dart2js."))},
-$iL9:1,
-$icMr:1}
+a6l:function(a,b,c){throw H.d(P.z("Int64List not supported by dart2js."))},
+$iLa:1,
+$icLP:1}
H.ja.prototype={
-axX:function(a,b,c,d){if(!H.bE(b))throw H.d(P.hK(b,d,"Invalid list position"))
+ay0:function(a,b,c,d){if(!H.bE(b))throw H.d(P.hJ(b,d,"Invalid list position"))
else throw H.d(P.ee(b,0,c,d,null))},
-Zw:function(a,b,c,d){if(b>>>0!==b||b>c)this.axX(a,b,c,d)},
+Zv:function(a,b,c,d){if(b>>>0!==b||b>c)this.ay0(a,b,c,d)},
$ija:1,
-$ihA:1}
-H.a28.prototype={
+$ihz:1}
+H.a2a.prototype={
gdh:function(a){return C.arx},
-Wn:function(a,b,c){throw H.d(P.z("Int64 accessor not supported by dart2js."))},
-Xd:function(a,b,c,d){throw H.d(P.z("Int64 accessor not supported by dart2js."))},
-$idT:1}
-H.SC.prototype={
+Wm:function(a,b,c){throw H.d(P.z("Int64 accessor not supported by dart2js."))},
+Xc:function(a,b,c,d){throw H.d(P.z("Int64 accessor not supported by dart2js."))},
+$idU:1}
+H.SG.prototype={
gH:function(a){return a.length},
-a3Z:function(a,b,c,d,e){var s,r,q=a.length
-this.Zw(a,b,q,"start")
-this.Zw(a,c,q,"end")
+a42:function(a,b,c,d,e){var s,r,q=a.length
+this.Zv(a,b,q,"start")
+this.Zv(a,c,q,"end")
if(b>c)throw H.d(P.ee(b,0,c,null,null))
s=c-b
if(e<0)throw H.d(P.aa(e))
@@ -60442,131 +60358,131 @@ if(e!==0||r!==s)d=d.subarray(e,e+s)
a.set(d,b)},
$idi:1,
$idF:1}
-H.Bp.prototype={
-i:function(a,b){H.yG(b,a,a.length)
+H.Bo.prototype={
+i:function(a,b){H.yF(b,a,a.length)
return a[b]},
-E:function(a,b,c){H.yG(b,a,a.length)
+E:function(a,b,c){H.yF(b,a,a.length)
a[b]=c},
-dS:function(a,b,c,d,e){if(t.jW.b(d)){this.a3Z(a,b,c,d,e)
-return}this.Y3(a,b,c,d,e)},
-fC:function(a,b,c,d){return this.dS(a,b,c,d,0)},
+dT:function(a,b,c,d,e){if(t.jW.b(d)){this.a42(a,b,c,d,e)
+return}this.Y2(a,b,c,d,e)},
+fC:function(a,b,c,d){return this.dT(a,b,c,d,0)},
$ibf:1,
$iP:1,
$iD:1}
H.ow.prototype={
-E:function(a,b,c){H.yG(b,a,a.length)
+E:function(a,b,c){H.yF(b,a,a.length)
a[b]=c},
-dS:function(a,b,c,d,e){if(t.A5.b(d)){this.a3Z(a,b,c,d,e)
-return}this.Y3(a,b,c,d,e)},
-fC:function(a,b,c,d){return this.dS(a,b,c,d,0)},
+dT:function(a,b,c,d,e){if(t.A5.b(d)){this.a42(a,b,c,d,e)
+return}this.Y2(a,b,c,d,e)},
+fC:function(a,b,c,d){return this.dT(a,b,c,d,0)},
$ibf:1,
$iP:1,
$iD:1}
-H.a29.prototype={
-gdh:function(a){return C.as2},
-f4:function(a,b,c){return new Float32Array(a.subarray(b,H.EL(b,c,a.length)))},
-kv:function(a,b){return this.f4(a,b,null)}}
-H.apS.prototype={
-gdh:function(a){return C.as3},
-f4:function(a,b,c){return new Float64Array(a.subarray(b,H.EL(b,c,a.length)))},
-kv:function(a,b){return this.f4(a,b,null)},
-$ib2C:1}
-H.apT.prototype={
-gdh:function(a){return C.asc},
-i:function(a,b){H.yG(b,a,a.length)
-return a[b]},
-f4:function(a,b,c){return new Int16Array(a.subarray(b,H.EL(b,c,a.length)))},
-kv:function(a,b){return this.f4(a,b,null)}}
-H.a2a.prototype={
-gdh:function(a){return C.asd},
-i:function(a,b){H.yG(b,a,a.length)
-return a[b]},
-f4:function(a,b,c){return new Int32Array(a.subarray(b,H.EL(b,c,a.length)))},
-kv:function(a,b){return this.f4(a,b,null)},
-$ib6u:1}
-H.apU.prototype={
-gdh:function(a){return C.asf},
-i:function(a,b){H.yG(b,a,a.length)
-return a[b]},
-f4:function(a,b,c){return new Int8Array(a.subarray(b,H.EL(b,c,a.length)))},
-kv:function(a,b){return this.f4(a,b,null)}}
-H.apW.prototype={
-gdh:function(a){return C.at_},
-i:function(a,b){H.yG(b,a,a.length)
-return a[b]},
-f4:function(a,b,c){return new Uint16Array(a.subarray(b,H.EL(b,c,a.length)))},
-kv:function(a,b){return this.f4(a,b,null)}}
H.a2b.prototype={
-gdh:function(a){return C.at0},
-i:function(a,b){H.yG(b,a,a.length)
+gdh:function(a){return C.as2},
+f5:function(a,b,c){return new Float32Array(a.subarray(b,H.EL(b,c,a.length)))},
+kv:function(a,b){return this.f5(a,b,null)}}
+H.apV.prototype={
+gdh:function(a){return C.as3},
+f5:function(a,b,c){return new Float64Array(a.subarray(b,H.EL(b,c,a.length)))},
+kv:function(a,b){return this.f5(a,b,null)},
+$ib2t:1}
+H.apW.prototype={
+gdh:function(a){return C.asc},
+i:function(a,b){H.yF(b,a,a.length)
return a[b]},
-f4:function(a,b,c){return new Uint32Array(a.subarray(b,H.EL(b,c,a.length)))},
-kv:function(a,b){return this.f4(a,b,null)}}
+f5:function(a,b,c){return new Int16Array(a.subarray(b,H.EL(b,c,a.length)))},
+kv:function(a,b){return this.f5(a,b,null)}}
H.a2c.prototype={
+gdh:function(a){return C.asd},
+i:function(a,b){H.yF(b,a,a.length)
+return a[b]},
+f5:function(a,b,c){return new Int32Array(a.subarray(b,H.EL(b,c,a.length)))},
+kv:function(a,b){return this.f5(a,b,null)},
+$ib6k:1}
+H.apX.prototype={
+gdh:function(a){return C.asf},
+i:function(a,b){H.yF(b,a,a.length)
+return a[b]},
+f5:function(a,b,c){return new Int8Array(a.subarray(b,H.EL(b,c,a.length)))},
+kv:function(a,b){return this.f5(a,b,null)}}
+H.apZ.prototype={
+gdh:function(a){return C.at_},
+i:function(a,b){H.yF(b,a,a.length)
+return a[b]},
+f5:function(a,b,c){return new Uint16Array(a.subarray(b,H.EL(b,c,a.length)))},
+kv:function(a,b){return this.f5(a,b,null)}}
+H.a2d.prototype={
+gdh:function(a){return C.at0},
+i:function(a,b){H.yF(b,a,a.length)
+return a[b]},
+f5:function(a,b,c){return new Uint32Array(a.subarray(b,H.EL(b,c,a.length)))},
+kv:function(a,b){return this.f5(a,b,null)}}
+H.a2e.prototype={
gdh:function(a){return C.at1},
gH:function(a){return a.length},
-i:function(a,b){H.yG(b,a,a.length)
+i:function(a,b){H.yF(b,a,a.length)
return a[b]},
-f4:function(a,b,c){return new Uint8ClampedArray(a.subarray(b,H.EL(b,c,a.length)))},
-kv:function(a,b){return this.f4(a,b,null)}}
-H.La.prototype={
+f5:function(a,b,c){return new Uint8ClampedArray(a.subarray(b,H.EL(b,c,a.length)))},
+kv:function(a,b){return this.f5(a,b,null)}}
+H.Lb.prototype={
gdh:function(a){return C.at2},
gH:function(a){return a.length},
-i:function(a,b){H.yG(b,a,a.length)
+i:function(a,b){H.yF(b,a,a.length)
return a[b]},
-f4:function(a,b,c){return new Uint8Array(a.subarray(b,H.EL(b,c,a.length)))},
-kv:function(a,b){return this.f4(a,b,null)},
-$iLa:1,
-$ikb:1}
-H.aau.prototype={}
-H.aav.prototype={}
-H.aaw.prototype={}
-H.aax.prototype={}
+f5:function(a,b,c){return new Uint8Array(a.subarray(b,H.EL(b,c,a.length)))},
+kv:function(a,b){return this.f5(a,b,null)},
+$iLb:1,
+$ikd:1}
+H.aay.prototype={}
+H.aaz.prototype={}
+H.aaA.prototype={}
+H.aaB.prototype={}
H.ru.prototype={
-h:function(a){return H.aIE(v.typeUniverse,this,a)},
-a7:function(a){return H.djB(v.typeUniverse,this,a)}}
-H.aCB.prototype={}
-H.acr.prototype={
+h:function(a){return H.aIH(v.typeUniverse,this,a)},
+a6:function(a){return H.diZ(v.typeUniverse,this,a)}}
+H.aCE.prototype={}
+H.acv.prototype={
j:function(a){return H.mk(this.a,null)},
-$ikM:1}
-H.aC3.prototype={
+$ikL:1}
+H.aC6.prototype={
j:function(a){return this.a}}
-H.acs.prototype={}
-P.bGj.prototype={
+H.acw.prototype={}
+P.bG_.prototype={
$1:function(a){var s=this.a,r=s.a
s.a=null
r.$0()},
$S:11}
-P.bGi.prototype={
+P.bFZ.prototype={
$1:function(a){var s,r
this.a.a=a
s=this.b
r=this.c
s.firstChild?s.removeChild(r):s.appendChild(r)},
-$S:1107}
-P.bGk.prototype={
+$S:1104}
+P.bG0.prototype={
$0:function(){this.a.$0()},
$C:"$0",
$R:0,
$S:0}
-P.bGl.prototype={
+P.bG1.prototype={
$0:function(){this.a.$0()},
$C:"$0",
$R:0,
$S:0}
-P.acn.prototype={
-anv:function(a,b){if(self.setTimeout!=null)this.b=self.setTimeout(H.ml(new P.c4Z(this,b),0),a)
+P.acr.prototype={
+anz:function(a,b){if(self.setTimeout!=null)this.b=self.setTimeout(H.ml(new P.c4H(this,b),0),a)
else throw H.d(P.z("`setTimeout()` not found."))},
-anw:function(a,b){if(self.setTimeout!=null)this.b=self.setInterval(H.ml(new P.c4Y(this,a,Date.now(),b),0),a)
+anA:function(a,b){if(self.setTimeout!=null)this.b=self.setInterval(H.ml(new P.c4G(this,a,Date.now(),b),0),a)
else throw H.d(P.z("Periodic timer."))},
-bU:function(a){var s
+bV:function(a){var s
if(self.setTimeout!=null){s=this.b
if(s==null)return
if(this.a)self.clearTimeout(s)
else self.clearInterval(s)
this.b=null}else throw H.d(P.z("Canceling a timer."))},
-$ik9:1}
-P.c4Z.prototype={
+$ikb:1}
+P.c4H.prototype={
$0:function(){var s=this.a
s.b=null
s.c=1
@@ -60574,83 +60490,83 @@ this.b.$0()},
$C:"$0",
$R:0,
$S:1}
-P.c4Y.prototype={
+P.c4G.prototype={
$0:function(){var s,r=this,q=r.a,p=q.c+1,o=r.b
if(o>0){s=Date.now()-r.c
-if(s>(p+1)*o)p=C.e.j_(s,o)}q.c=p
+if(s>(p+1)*o)p=C.e.iY(s,o)}q.c=p
r.d.$1(q)},
$C:"$0",
$R:0,
$S:0}
-P.a82.prototype={
-al:function(a,b){var s,r=this
+P.a85.prototype={
+am:function(a,b){var s,r=this
if(!r.b)r.a.my(b)
else{s=r.a
-if(r.$ti.h("b1<1>").b(b))s.Zp(b)
-else s.wN(b)}},
-fF:function(a){return this.al(a,null)},
+if(r.$ti.h("b2<1>").b(b))s.Zo(b)
+else s.wM(b)}},
+fF:function(a){return this.am(a,null)},
ps:function(a,b){var s
-if(b==null)b=P.vH(a)
+if(b==null)b=P.vI(a)
s=this.a
-if(this.b)s.ju(a,b)
+if(this.b)s.js(a,b)
else s.ED(a,b)},
gpE:function(){return this.a},
-$ieD:1}
-P.caA.prototype={
+$ieB:1}
+P.ca8.prototype={
$1:function(a){return this.a.$2(0,a)},
-$S:48}
-P.caB.prototype={
-$2:function(a,b){this.a.$2(1,new H.a_G(a,b))},
+$S:47}
+P.ca9.prototype={
+$2:function(a,b){this.a.$2(1,new H.a_I(a,b))},
$C:"$2",
$R:2,
-$S:1128}
-P.csW.prototype={
+$S:1123}
+P.csu.prototype={
$2:function(a,b){this.a(a,b)},
$C:"$2",
$R:2,
-$S:1157}
-P.cay.prototype={
+$S:1145}
+P.ca6.prototype={
$0:function(){var s=this.a,r=s.gpu(s),q=r.b
if((q&1)!==0?(r.gqv().e&4)!==0:(q&2)===0){s.c=!0
return}this.b.$2(0,null)},
$C:"$0",
$R:0,
$S:0}
-P.caz.prototype={
+P.ca7.prototype={
$1:function(a){var s=this.a.d!=null?2:0
this.b.$2(s,null)},
$S:11}
-P.azP.prototype={
+P.azS.prototype={
gpu:function(a){return this.b?this.a:H.b(H.R("Field 'controller' has not been initialized."))},
-anj:function(a,b){var s=this,r=new P.bGn(a)
-r=P.Dj(new P.bGp(s,a),new P.bGq(r),null,new P.bGr(s,r),!1,b)
+ann:function(a,b){var s=this,r=new P.bG3(a)
+r=P.Dj(new P.bG5(s,a),new P.bG6(r),null,new P.bG7(s,r),!1,b)
s.b=!0
s.a=r}}
-P.bGn.prototype={
-$0:function(){P.jT(new P.bGo(this.a))},
+P.bG3.prototype={
+$0:function(){P.jT(new P.bG4(this.a))},
$S:0}
-P.bGo.prototype={
+P.bG4.prototype={
$0:function(){this.a.$2(0,null)},
$C:"$0",
$R:0,
$S:0}
-P.bGq.prototype={
+P.bG6.prototype={
$0:function(){this.a.$0()},
$S:0}
-P.bGr.prototype={
+P.bG7.prototype={
$0:function(){var s=this.a
if(s.c){s.c=!1
this.b.$0()}},
$S:0}
-P.bGp.prototype={
+P.bG5.prototype={
$0:function(){var s=this.a
if((s.gpu(s).b&4)===0){s.d=new P.aC($.aG,t.LR)
if(s.c){s.c=!1
-P.jT(new P.bGm(this.b))}return s.d}},
+P.jT(new P.bG2(this.b))}return s.d}},
$C:"$0",
$R:0,
-$S:1162}
-P.bGm.prototype={
+$S:1146}
+P.bG2.prototype={
$0:function(){this.a.$2(2,null)},
$C:"$0",
$R:0,
@@ -60675,7 +60591,7 @@ if(p==null||p.length===0){n.b=null
return!1}n.a=p.pop()
continue}else{s=r.a
if(q===3)throw s
-else{o=J.a3(s)
+else{o=J.a2(s)
if(o instanceof P.hg){s=n.d
if(s==null)s=n.d=[]
s.push(n.a)
@@ -60683,19 +60599,19 @@ n.a=o.a
continue}else{n.c=o
continue}}}}else{n.b=r
return!0}}return!1}}
-P.ac3.prototype={
-gaH:function(a){return new P.hg(this.a(),this.$ti.h("hg<1>"))}}
-P.kO.prototype={
-goF:function(){return!0}}
-P.O8.prototype={
+P.ac7.prototype={
+gaJ:function(a){return new P.hg(this.a(),this.$ti.h("hg<1>"))}}
+P.kN.prototype={
+goG:function(){return!0}}
+P.Ob.prototype={
pd:function(){},
pe:function(){}}
P.t9.prototype={
-gLr:function(a){return new P.kO(this,H.F(this).h("kO<1>"))},
+gLr:function(a){return new P.kN(this,H.F(this).h("kN<1>"))},
guG:function(){return this.c<4},
-Ay:function(){var s=this.r
+Aw:function(){var s=this.r
return s==null?this.r=new P.aC($.aG,t.D4):s},
-a38:function(a){var s=a.fr,r=a.dy
+a3b:function(a){var s=a.fr,r=a.dy
if(s==null)this.d=r
else s.dy=r
if(r==null)this.e=s
@@ -60703,14 +60619,14 @@ else r.fr=s
a.fr=a
a.dy=a},
Mi:function(a,b,c,d){var s,r,q,p,o,n,m,l,k=this
-if((k.c&4)!==0)return P.cY7(c,H.F(k).c)
+if((k.c&4)!==0)return P.cXy(c,H.F(k).c)
s=H.F(k)
r=$.aG
q=d?1:0
-p=P.a8a(r,a,s.c)
-o=P.aA4(r,b)
-n=c==null?P.aKf():c
-m=new P.O8(k,p,o,r.oU(n,t.n),r,q,s.h("O8<1>"))
+p=P.a8d(r,a,s.c)
+o=P.aA7(r,b)
+n=c==null?P.aKi():c
+m=new P.Ob(k,p,o,r.oV(n,t.n),r,q,s.h("Ob<1>"))
m.fr=m
m.dy=m
m.dx=k.c&1
@@ -60720,39 +60636,39 @@ m.dy=null
m.fr=l
if(l==null)k.d=m
else l.dy=m
-if(k.d===m)P.aKc(k.a)
+if(k.d===m)P.aKf(k.a)
return m},
-a2U:function(a){var s,r=this
-H.F(r).h("O8<1>").a(a)
+a2X:function(a){var s,r=this
+H.F(r).h("Ob<1>").a(a)
if(a.dy===a)return null
s=a.dx
if((s&2)!==0)a.dx=s|4
-else{r.a38(a)
-if((r.c&2)===0&&r.d==null)r.Ai()}return null},
-a2V:function(a){},
-a2W:function(a){},
-ul:function(){if((this.c&4)!==0)return new P.pT("Cannot add new events after calling close")
-return new P.pT("Cannot add new events while doing an addStream")},
+else{r.a3b(a)
+if((r.c&2)===0&&r.d==null)r.Ag()}return null},
+a2Y:function(a){},
+a2Z:function(a){},
+ul:function(){if((this.c&4)!==0)return new P.pR("Cannot add new events after calling close")
+return new P.pR("Cannot add new events while doing an addStream")},
F:function(a,b){if(!this.guG())throw H.d(this.ul())
this.mE(b)},
-iv:function(a,b){var s
-P.eB(a,"error")
+iu:function(a,b){var s
+P.ez(a,"error")
if(!this.guG())throw H.d(this.ul())
s=$.aG.tw(a,b)
if(s!=null){a=s.a
-b=s.b}else if(b==null)b=P.vH(a)
+b=s.b}else if(b==null)b=P.vI(a)
this.pi(a,b)},
-xI:function(a){return this.iv(a,null)},
-dD:function(a){var s,r,q=this
+xH:function(a){return this.iu(a,null)},
+dC:function(a){var s,r,q=this
if((q.c&4)!==0){s=q.r
s.toString
return s}if(!q.guG())throw H.d(q.ul())
q.c|=4
-r=q.Ay()
-q.oh()
+r=q.Aw()
+q.oj()
return r},
-gpy:function(){return this.Ay()},
-NA:function(a){var s,r,q,p=this,o=p.c
+gpy:function(){return this.Aw()},
+Nz:function(a){var s,r,q,p=this,o=p.c
if((o&2)!==0)throw H.d(P.bg(u.c))
s=p.d
if(s==null)return
@@ -60763,195 +60679,195 @@ if((o&1)===r){s.dx=o|2
a.$1(s)
o=s.dx^=1
q=s.dy
-if((o&4)!==0)p.a38(s)
+if((o&4)!==0)p.a3b(s)
s.dx&=4294967293
s=q}else s=s.dy}p.c&=4294967293
-if(p.d==null)p.Ai()},
-Ai:function(){if((this.c&4)!==0){var s=this.r
-if(s.a===0)s.my(null)}P.aKc(this.b)},
+if(p.d==null)p.Ag()},
+Ag:function(){if((this.c&4)!==0){var s=this.r
+if(s.a===0)s.my(null)}P.aKf(this.b)},
$ij6:1,
-$im5:1}
-P.yA.prototype={
+$im6:1}
+P.yz.prototype={
guG:function(){return P.t9.prototype.guG.call(this)&&(this.c&2)===0},
-ul:function(){if((this.c&2)!==0)return new P.pT(u.c)
-return this.ak4()},
+ul:function(){if((this.c&2)!==0)return new P.pR(u.c)
+return this.ak8()},
mE:function(a){var s=this,r=s.d
if(r==null)return
if(r===s.e){s.c|=2
-r.o_(0,a)
+r.o1(0,a)
s.c&=4294967293
-if(s.d==null)s.Ai()
-return}s.NA(new P.c2M(s,a))},
+if(s.d==null)s.Ag()
+return}s.Nz(new P.c2u(s,a))},
pi:function(a,b){if(this.d==null)return
-this.NA(new P.c2O(this,a,b))},
-oh:function(){var s=this
-if(s.d!=null)s.NA(new P.c2N(s))
+this.Nz(new P.c2w(this,a,b))},
+oj:function(){var s=this
+if(s.d!=null)s.Nz(new P.c2v(s))
else s.r.my(null)}}
-P.c2M.prototype={
-$1:function(a){a.o_(0,this.b)},
-$S:function(){return H.F(this.a).h("w(hZ<1>)")}}
-P.c2O.prototype={
+P.c2u.prototype={
+$1:function(a){a.o1(0,this.b)},
+$S:function(){return H.F(this.a).h("w(hX<1>)")}}
+P.c2w.prototype={
$1:function(a){a.p7(this.b,this.c)},
-$S:function(){return H.F(this.a).h("w(hZ<1>)")}}
-P.c2N.prototype={
-$1:function(a){a.wF()},
-$S:function(){return H.F(this.a).h("w(hZ<1>)")}}
+$S:function(){return H.F(this.a).h("w(hX<1>)")}}
+P.c2v.prototype={
+$1:function(a){a.wE()},
+$S:function(){return H.F(this.a).h("w(hX<1>)")}}
P.p1.prototype={
mE:function(a){var s,r
-for(s=this.d,r=this.$ti.h("kP<1>");s!=null;s=s.dy)s.qg(new P.kP(a,r))},
+for(s=this.d,r=this.$ti.h("kO<1>");s!=null;s=s.dy)s.qg(new P.kO(a,r))},
pi:function(a,b){var s
-for(s=this.d;s!=null;s=s.dy)s.qg(new P.Og(a,b))},
-oh:function(){var s=this.d
-if(s!=null)for(;s!=null;s=s.dy)s.qg(C.nr)
+for(s=this.d;s!=null;s=s.dy)s.qg(new P.Oj(a,b))},
+oj:function(){var s=this.d
+if(s!=null)for(;s!=null;s=s.dy)s.qg(C.nq)
else this.r.my(null)}}
-P.WB.prototype={
-M6:function(a){var s=this.db;(s==null?this.db=new P.vk(this.$ti.h("vk<1>")):s).F(0,a)},
+P.WE.prototype={
+M6:function(a){var s=this.db;(s==null?this.db=new P.vl(this.$ti.h("vl<1>")):s).F(0,a)},
F:function(a,b){var s=this,r=s.c
-if((r&4)===0&&(r&2)!==0){s.M6(new P.kP(b,s.$ti.h("kP<1>")))
-return}s.ak6(0,b)
-s.a0d()},
-iv:function(a,b){var s,r=this
-P.eB(a,"error")
-if(b==null)b=P.vH(a)
+if((r&4)===0&&(r&2)!==0){s.M6(new P.kO(b,s.$ti.h("kO<1>")))
+return}s.aka(0,b)
+s.a0c()},
+iu:function(a,b){var s,r=this
+P.ez(a,"error")
+if(b==null)b=P.vI(a)
s=r.c
-if((s&4)===0&&(s&2)!==0){r.M6(new P.Og(a,b))
+if((s&4)===0&&(s&2)!==0){r.M6(new P.Oj(a,b))
return}if(!(P.t9.prototype.guG.call(r)&&(r.c&2)===0))throw H.d(r.ul())
r.pi(a,b)
-r.a0d()},
-xI:function(a){return this.iv(a,null)},
-a0d:function(){var s=this.db
+r.a0c()},
+xH:function(a){return this.iu(a,null)},
+a0c:function(){var s=this.db
while(!0){if(!(s!=null&&s.c!=null))break
-s.SV(this)
+s.SU(this)
s=this.db}},
-dD:function(a){var s=this,r=s.c
-if((r&4)===0&&(r&2)!==0){s.M6(C.nr)
+dC:function(a){var s=this,r=s.c
+if((r&4)===0&&(r&2)!==0){s.M6(C.nq)
s.c|=4
-return P.t9.prototype.gpy.call(s)}return s.ak7(0)},
-Ai:function(){var s=this.db
+return P.t9.prototype.gpy.call(s)}return s.akb(0)},
+Ag:function(){var s=this.db
if(s!=null){if(s.a===1)s.a=3
-this.db=s.b=s.c=null}this.ak5()}}
-P.b3b.prototype={
+this.db=s.b=s.c=null}this.ak9()}}
+P.b32.prototype={
$0:function(){var s,r,q
-try{this.a.lI(this.b.$0())}catch(q){s=H.J(q)
+try{this.a.lH(this.b.$0())}catch(q){s=H.K(q)
r=H.c7(q)
-P.ccl(this.a,s,r)}},
+P.cbU(this.a,s,r)}},
$C:"$0",
$R:0,
$S:0}
-P.b3a.prototype={
+P.b31.prototype={
$0:function(){var s,r,q
-try{this.a.lI(this.b.$0())}catch(q){s=H.J(q)
+try{this.a.lH(this.b.$0())}catch(q){s=H.K(q)
r=H.c7(q)
-P.ccl(this.a,s,r)}},
+P.cbU(this.a,s,r)}},
$C:"$0",
$R:0,
$S:0}
-P.b39.prototype={
+P.b30.prototype={
$0:function(){var s,r,q,p=this,o=p.a
-if(o==null)p.b.lI(null)
-else try{p.b.lI(o.$0())}catch(q){s=H.J(q)
+if(o==null)p.b.lH(null)
+else try{p.b.lH(o.$0())}catch(q){s=H.K(q)
r=H.c7(q)
-P.ccl(p.b,s,r)}},
+P.cbU(p.b,s,r)}},
$C:"$0",
$R:0,
$S:0}
-P.b3d.prototype={
+P.b34.prototype={
$1:function(a){var s=this.a
s.d=!0
return s.c=a},
-$S:1391}
-P.b3f.prototype={
+$S:1378}
+P.b36.prototype={
$1:function(a){var s=this.a
s.f=!0
return s.e=a},
-$S:1397}
-P.b3c.prototype={
+$S:1392}
+P.b33.prototype={
$0:function(){var s=this.a
return s.d?s.c:H.b(H.R("Local 'error' has not been initialized."))},
-$S:1409}
-P.b3e.prototype={
+$S:1396}
+P.b35.prototype={
$0:function(){var s=this.a
return s.f?s.e:H.b(H.R("Local 'stackTrace' has not been initialized."))},
-$S:1427}
-P.b3h.prototype={
+$S:1417}
+P.b38.prototype={
$2:function(a,b){var s=this,r=s.a,q=--r.b
if(r.a!=null){r.a=null
-if(r.b===0||s.c)s.d.ju(a,b)
+if(r.b===0||s.c)s.d.js(a,b)
else{s.e.$1(a)
-s.f.$1(b)}}else if(q===0&&!s.c)s.d.ju(s.r.$0(),s.x.$0())},
+s.f.$1(b)}}else if(q===0&&!s.c)s.d.js(s.r.$0(),s.x.$0())},
$C:"$2",
$R:2,
-$S:111}
-P.b3g.prototype={
+$S:115}
+P.b37.prototype={
$1:function(a){var s,r=this,q=r.a;--q.b
s=q.a
if(s!=null){J.c0(s,r.b,a)
-if(q.b===0)r.c.wN(P.v(s,!0,r.x))}else if(q.b===0&&!r.e)r.c.ju(r.f.$0(),r.r.$0())},
+if(q.b===0)r.c.wM(P.v(s,!0,r.x))}else if(q.b===0&&!r.e)r.c.js(r.f.$0(),r.r.$0())},
$S:function(){return this.x.h("w(0)")}}
-P.avm.prototype={
+P.avp.prototype={
j:function(a){var s="TimeoutException after "+this.b.j(0)
s=s+": "+this.a
return s},
$iep:1}
-P.Oe.prototype={
+P.Oh.prototype={
ps:function(a,b){var s
-P.eB(a,"error")
+P.ez(a,"error")
if(this.a.a!==0)throw H.d(P.bg("Future already completed"))
s=$.aG.tw(a,b)
if(s!=null){a=s.a
-b=s.b}else if(b==null)b=P.vH(a)
-this.ju(a,b)},
-aB:function(a){return this.ps(a,null)},
-$ieD:1,
+b=s.b}else if(b==null)b=P.vI(a)
+this.js(a,b)},
+aC:function(a){return this.ps(a,null)},
+$ieB:1,
gpE:function(){return this.a}}
P.b6.prototype={
-al:function(a,b){var s=this.a
+am:function(a,b){var s=this.a
if(s.a!==0)throw H.d(P.bg("Future already completed"))
s.my(b)},
-fF:function(a){return this.al(a,null)},
-ju:function(a,b){this.a.ED(a,b)}}
-P.OB.prototype={
-al:function(a,b){var s=this.a
+fF:function(a){return this.am(a,null)},
+js:function(a,b){this.a.ED(a,b)}}
+P.OF.prototype={
+am:function(a,b){var s=this.a
if(s.a!==0)throw H.d(P.bg("Future already completed"))
-s.lI(b)},
-fF:function(a){return this.al(a,null)},
-ju:function(a,b){this.a.ju(a,b)}}
-P.ve.prototype={
-aNl:function(a){if((this.c&15)!==6)return!0
+s.lH(b)},
+fF:function(a){return this.am(a,null)},
+js:function(a,b){this.a.js(a,b)}}
+P.vf.prototype={
+aNr:function(a){if((this.c&15)!==6)return!0
return this.b.b.tY(this.d,a.a,t.C9,t.K)},
-aL2:function(a){var s=this.e,r=t.z,q=t.K,p=this.b.b
+aL8:function(a){var s=this.e,r=t.z,q=t.K,p=this.b.b
if(t.Hg.b(s))return p.K3(s,a.a,a.b,r,q,t.Km)
else return p.tY(s,a.a,r,q)}}
P.aC.prototype={
-jG:function(a,b,c,d){var s,r,q=$.aG
+jE:function(a,b,c,d){var s,r,q=$.aG
if(q!==C.aJ){b=q.tT(b,d.h("0/"),this.$ti.c)
-if(c!=null)c=P.cZP(c,q)}s=new P.aC($.aG,d.h("aC<0>"))
+if(c!=null)c=P.cZf(c,q)}s=new P.aC($.aG,d.h("aC<0>"))
r=c==null?1:3
-this.Ac(new P.ve(s,r,b,c,this.$ti.h("@<1>").a7(d).h("ve<1,2>")))
+this.Aa(new P.vf(s,r,b,c,this.$ti.h("@<1>").a6(d).h("vf<1,2>")))
return s},
-R:function(a,b,c){return this.jG(a,b,null,c)},
-acX:function(a,b){return this.jG(a,b,null,t.z)},
-a4H:function(a,b,c){var s=new P.aC($.aG,c.h("aC<0>"))
-this.Ac(new P.ve(s,19,a,b,this.$ti.h("@<1>").a7(c).h("ve<1,2>")))
+R:function(a,b,c){return this.jE(a,b,null,c)},
+ad0:function(a,b){return this.jE(a,b,null,t.z)},
+a4L:function(a,b,c){var s=new P.aC($.aG,c.h("aC<0>"))
+this.Aa(new P.vf(s,19,a,b,this.$ti.h("@<1>").a6(c).h("vf<1,2>")))
return s},
va:function(a,b){var s=this.$ti,r=$.aG,q=new P.aC(r,s)
-if(r!==C.aJ){a=P.cZP(a,r)
+if(r!==C.aJ){a=P.cZf(a,r)
if(b!=null)b=r.tT(b,t.C9,t.K)}r=b==null?2:6
-this.Ac(new P.ve(q,r,b,a,s.h("@<1>").a7(s.c).h("ve<1,2>")))
+this.Aa(new P.vf(q,r,b,a,s.h("@<1>").a6(s.c).h("vf<1,2>")))
return q},
a3:function(a){return this.va(a,null)},
-iL:function(a){var s=this.$ti,r=$.aG,q=new P.aC(r,s)
-if(r!==C.aJ)a=r.oU(a,t.z)
-this.Ac(new P.ve(q,8,a,null,s.h("@<1>").a7(s.c).h("ve<1,2>")))
+iJ:function(a){var s=this.$ti,r=$.aG,q=new P.aC(r,s)
+if(r!==C.aJ)a=r.oV(a,t.z)
+this.Aa(new P.vf(q,8,a,null,s.h("@<1>").a6(s.c).h("vf<1,2>")))
return q},
-Ac:function(a){var s,r=this,q=r.a
+Aa:function(a){var s,r=this,q=r.a
if(q<=1){a.a=r.c
r.c=a}else{if(q===2){q=r.c
s=q.a
-if(s<4){q.Ac(a)
+if(s<4){q.Aa(a)
return}r.a=s
-r.c=q.c}r.b.rA(new P.bQ7(r,a))}},
-a2K:function(a){var s,r,q,p,o,n,m=this,l={}
+r.c=q.c}r.b.rA(new P.bPS(r,a))}},
+a2N:function(a){var s,r,q,p,o,n,m=this,l={}
l.a=a
if(a==null)return
s=m.a
@@ -60961,98 +60877,98 @@ if(r!=null){q=a.a
for(p=a;q!=null;p=q,q=o)o=q.a
p.a=r}}else{if(s===2){s=m.c
n=s.a
-if(n<4){s.a2K(a)
+if(n<4){s.a2N(a)
return}m.a=n
m.c=s.c}l.a=m.G5(a)
-m.b.rA(new P.bQf(l,m))}},
+m.b.rA(new P.bQ_(l,m))}},
G3:function(){var s=this.c
this.c=null
return this.G5(s)},
G5:function(a){var s,r,q
for(s=a,r=null;s!=null;r=s,s=q){q=s.a
s.a=r}return r},
-lI:function(a){var s,r=this,q=r.$ti
-if(q.h("b1<1>").b(a))if(q.b(a))P.bQa(a,r)
-else P.cOB(a,r)
+lH:function(a){var s,r=this,q=r.$ti
+if(q.h("b2<1>").b(a))if(q.b(a))P.bPV(a,r)
+else P.cNZ(a,r)
else{s=r.G3()
r.a=4
r.c=a
-P.X8(r,s)}},
-wN:function(a){var s=this,r=s.G3()
+P.Xb(r,s)}},
+wM:function(a){var s=this,r=s.G3()
s.a=4
s.c=a
-P.X8(s,r)},
-ju:function(a,b){var s=this,r=s.G3(),q=P.aMc(a,b)
+P.Xb(s,r)},
+js:function(a,b){var s=this,r=s.G3(),q=P.aMf(a,b)
s.a=8
s.c=q
-P.X8(s,r)},
-my:function(a){if(this.$ti.h("b1<1>").b(a)){this.Zp(a)
-return}this.aoy(a)},
-aoy:function(a){this.a=1
-this.b.rA(new P.bQ9(this,a))},
-Zp:function(a){var s=this
+P.Xb(s,r)},
+my:function(a){if(this.$ti.h("b2<1>").b(a)){this.Zo(a)
+return}this.aoC(a)},
+aoC:function(a){this.a=1
+this.b.rA(new P.bPU(this,a))},
+Zo:function(a){var s=this
if(s.$ti.b(a)){if(a.a===8){s.a=1
-s.b.rA(new P.bQe(s,a))}else P.bQa(a,s)
-return}P.cOB(a,s)},
+s.b.rA(new P.bPZ(s,a))}else P.bPV(a,s)
+return}P.cNZ(a,s)},
ED:function(a,b){this.a=1
-this.b.rA(new P.bQ8(this,a,b))},
-ad_:function(a,b,c){var s,r,q,p=this,o={}
+this.b.rA(new P.bPT(this,a,b))},
+ad3:function(a,b,c){var s,r,q,p=this,o={}
if(p.a>=4){o=new P.aC($.aG,p.$ti)
o.my(p)
return o}s=p.$ti
r=$.aG
q=new P.aC(r,s)
o.a=null
-if(c==null)o.a=P.eM(b,new P.bQk(q,b))
-else o.a=P.eM(b,new P.bQl(p,q,r,r.oU(c,s.h("1/"))))
-p.jG(0,new P.bQm(o,p,q),new P.bQn(o,q),t.P)
+if(c==null)o.a=P.eM(b,new P.bQ4(q,b))
+else o.a=P.eM(b,new P.bQ5(p,q,r,r.oV(c,s.h("1/"))))
+p.jE(0,new P.bQ6(o,p,q),new P.bQ7(o,q),t.P)
return q},
-acZ:function(a,b){return this.ad_(a,b,null)},
-$ib1:1}
-P.bQ7.prototype={
-$0:function(){P.X8(this.a,this.b)},
+ad2:function(a,b){return this.ad3(a,b,null)},
+$ib2:1}
+P.bPS.prototype={
+$0:function(){P.Xb(this.a,this.b)},
$C:"$0",
$R:0,
$S:0}
-P.bQf.prototype={
-$0:function(){P.X8(this.b,this.a.a)},
+P.bQ_.prototype={
+$0:function(){P.Xb(this.b,this.a.a)},
$C:"$0",
$R:0,
$S:0}
-P.bQb.prototype={
+P.bPW.prototype={
$1:function(a){var s=this.a
s.a=0
-s.lI(a)},
+s.lH(a)},
$S:11}
-P.bQc.prototype={
-$2:function(a,b){this.a.ju(a,b)},
+P.bPX.prototype={
+$2:function(a,b){this.a.js(a,b)},
$C:"$2",
$R:2,
-$S:138}
-P.bQd.prototype={
-$0:function(){this.a.ju(this.b,this.c)},
+$S:128}
+P.bPY.prototype={
+$0:function(){this.a.js(this.b,this.c)},
$C:"$0",
$R:0,
$S:0}
-P.bQ9.prototype={
-$0:function(){this.a.wN(this.b)},
+P.bPU.prototype={
+$0:function(){this.a.wM(this.b)},
$C:"$0",
$R:0,
$S:0}
-P.bQe.prototype={
-$0:function(){P.bQa(this.b,this.a)},
+P.bPZ.prototype={
+$0:function(){P.bPV(this.b,this.a)},
$C:"$0",
$R:0,
$S:0}
-P.bQ8.prototype={
-$0:function(){this.a.ju(this.b,this.c)},
+P.bPT.prototype={
+$0:function(){this.a.js(this.b,this.c)},
$C:"$0",
$R:0,
$S:0}
-P.bQi.prototype={
+P.bQ2.prototype={
$0:function(){var s,r,q,p,o,n,m=this,l=null
try{q=m.a.a
-l=q.b.b.w7(q.d,t.z)}catch(p){s=H.J(p)
+l=q.b.b.w7(q.d,t.z)}catch(p){s=H.K(p)
r=H.c7(p)
if(m.c){q=m.b.a.c.a
o=s
@@ -61060,381 +60976,381 @@ o=q==null?o==null:q===o
q=o}else q=!1
o=m.a
if(q)o.c=m.b.a.c
-else o.c=P.aMc(s,r)
+else o.c=P.aMf(s,r)
o.b=!0
return}if(l instanceof P.aC&&l.a>=4){if(l.a===8){q=m.a
q.c=l.c
q.b=!0}return}if(t.L0.b(l)){n=m.b.a
q=m.a
-q.c=J.cMa(l,new P.bQj(n),t.z)
+q.c=J.cLy(l,new P.bQ3(n),t.z)
q.b=!1}},
$S:1}
-P.bQj.prototype={
+P.bQ3.prototype={
$1:function(a){return this.a},
-$S:1505}
-P.bQh.prototype={
+$S:1479}
+P.bQ1.prototype={
$0:function(){var s,r,q,p,o,n
try{q=this.a
p=q.a
o=p.$ti
-q.c=p.b.b.tY(p.d,this.b,o.h("2/"),o.c)}catch(n){s=H.J(n)
+q.c=p.b.b.tY(p.d,this.b,o.h("2/"),o.c)}catch(n){s=H.K(n)
r=H.c7(n)
q=this.a
-q.c=P.aMc(s,r)
+q.c=P.aMf(s,r)
q.b=!0}},
$S:1}
-P.bQg.prototype={
+P.bQ0.prototype={
$0:function(){var s,r,q,p,o,n,m,l,k=this
try{s=k.a.a.c
p=k.b
-if(p.a.aNl(s)&&p.a.e!=null){p.c=p.a.aL2(s)
-p.b=!1}}catch(o){r=H.J(o)
+if(p.a.aNr(s)&&p.a.e!=null){p.c=p.a.aL8(s)
+p.b=!1}}catch(o){r=H.K(o)
q=H.c7(o)
p=k.a.a.c
n=p.a
m=r
l=k.b
if(n==null?m==null:n===m)l.c=p
-else l.c=P.aMc(r,q)
+else l.c=P.aMf(r,q)
l.b=!0}},
$S:1}
-P.bQk.prototype={
-$0:function(){this.a.ju(new P.avm("Future not completed",this.b),C.Vf)},
+P.bQ4.prototype={
+$0:function(){this.a.js(new P.avp("Future not completed",this.b),C.Vf)},
$C:"$0",
$R:0,
$S:0}
-P.bQl.prototype={
+P.bQ5.prototype={
$0:function(){var s,r,q,p=this
-try{p.b.lI(p.c.w7(p.d,p.a.$ti.h("1/")))}catch(q){s=H.J(q)
+try{p.b.lH(p.c.w7(p.d,p.a.$ti.h("1/")))}catch(q){s=H.K(q)
r=H.c7(q)
-p.b.ju(s,r)}},
+p.b.js(s,r)}},
$C:"$0",
$R:0,
$S:0}
-P.bQm.prototype={
+P.bQ6.prototype={
$1:function(a){var s=this.a.a
-if(s.b!=null){s.bU(0)
-this.c.wN(a)}},
+if(s.b!=null){s.bV(0)
+this.c.wM(a)}},
$S:function(){return this.b.$ti.h("w(1)")}}
-P.bQn.prototype={
+P.bQ7.prototype={
$2:function(a,b){var s=this.a.a
-if(s.b!=null){s.bU(0)
-this.b.ju(a,b)}},
+if(s.b!=null){s.bV(0)
+this.b.js(a,b)}},
$C:"$2",
$R:2,
-$S:138}
-P.azO.prototype={}
+$S:128}
+P.azR.prototype={}
P.dp.prototype={
-goF:function(){return!1},
-aGe:function(a,b){var s=H.F(this),r=new P.WA(this,null,null,$.aG,s.h("WA"))
-r.e=new P.WB(r.gazB(),r.gazh(),s.h("WB"))
+goG:function(){return!1},
+aGk:function(a,b){var s=H.F(this),r=new P.WD(this,null,null,$.aG,s.h("WD"))
+r.e=new P.WE(r.gazF(),r.gazl(),s.h("WE"))
return r},
-aGd:function(){return this.aGe(null,null)},
-ep:function(a,b,c){return new P.yv(b,this,H.F(this).h("@").a7(c).h("yv<1,2>"))},
-cQ:function(a,b){return this.ep(a,b,t.z)},
-aPn:function(a){return a.aFU(0,this).R(0,new P.bwq(a),t.z)},
-lT:function(a,b,c,d){var s,r={},q=new P.aC($.aG,d.h("aC<0>"))
+aGj:function(){return this.aGk(null,null)},
+eq:function(a,b,c){return new P.yu(b,this,H.F(this).h("@").a6(c).h("yu<1,2>"))},
+cQ:function(a,b){return this.eq(a,b,t.z)},
+aPt:function(a){return a.aG_(0,this).R(0,new P.bwh(a),t.z)},
+lS:function(a,b,c,d){var s,r={},q=new P.aC($.aG,d.h("aC<0>"))
r.a=b
-s=this.h5(0,null,!0,new P.bwg(r,q),q.gAm())
-s.tO(new P.bwh(r,this,c,s,q,d))
+s=this.h5(0,null,!0,new P.bw7(r,q),q.gAk())
+s.tO(new P.bw8(r,this,c,s,q,d))
return q},
-L:function(a,b){var s=new P.aC($.aG,t.LR),r=this.h5(0,null,!0,new P.bwk(s),s.gAm())
-r.tO(new P.bwl(this,b,r,s))
+L:function(a,b){var s=new P.aC($.aG,t.LR),r=this.h5(0,null,!0,new P.bwb(s),s.gAk())
+r.tO(new P.bwc(this,b,r,s))
return s},
gH:function(a){var s={},r=new P.aC($.aG,t.wJ)
s.a=0
-this.h5(0,new P.bwo(s,this),!0,new P.bwp(s,r),r.gAm())
+this.h5(0,new P.bwf(s,this),!0,new P.bwg(s,r),r.gAk())
return r},
-gag:function(a){var s=new P.aC($.aG,t.tr),r=this.h5(0,null,!0,new P.bwm(s),s.gAm())
-r.tO(new P.bwn(this,r,s))
+gag:function(a){var s=new P.aC($.aG,t.tr),r=this.h5(0,null,!0,new P.bwd(s),s.gAk())
+r.tO(new P.bwe(this,r,s))
return s},
-ga5:function(a){var s=new P.aC($.aG,H.F(this).h("aC")),r=this.h5(0,null,!0,new P.bwc(s),s.gAm())
-r.tO(new P.bwd(this,r,s))
+ga4:function(a){var s=new P.aC($.aG,H.F(this).h("aC")),r=this.h5(0,null,!0,new P.bw3(s),s.gAk())
+r.tO(new P.bw4(this,r,s))
return s}}
-P.bw8.prototype={
+P.bw_.prototype={
$1:function(a){var s=this.a
-s.o_(0,a)
+s.o1(0,a)
s.ML()},
$S:function(){return this.b.h("w(0)")}}
-P.bw9.prototype={
+P.bw0.prototype={
$2:function(a,b){var s=this.a
s.p7(a,b)
s.ML()},
$C:"$2",
$R:2,
-$S:72}
-P.bwb.prototype={
-$0:function(){return new P.a9U(J.a3(this.a),this.b.h("a9U<0>"))},
-$S:function(){return this.b.h("a9U<0>()")}}
-P.bwq.prototype={
-$1:function(a){return this.a.dD(0)},
-$S:477}
-P.bwg.prototype={
-$0:function(){this.b.lI(this.a.a)},
+$S:74}
+P.bw2.prototype={
+$0:function(){return new P.a9Y(J.a2(this.a),this.b.h("a9Y<0>"))},
+$S:function(){return this.b.h("a9Y<0>()")}}
+P.bwh.prototype={
+$1:function(a){return this.a.dC(0)},
+$S:428}
+P.bw7.prototype={
+$0:function(){this.b.lH(this.a.a)},
$C:"$0",
$R:0,
$S:0}
-P.bwh.prototype={
+P.bw8.prototype={
$1:function(a){var s=this,r=s.a,q=s.f
-P.cZU(new P.bwe(r,s.c,a,q),new P.bwf(r,q),P.cZ4(s.d,s.e))},
+P.cZk(new P.bw5(r,s.c,a,q),new P.bw6(r,q),P.cYv(s.d,s.e))},
$S:function(){return H.F(this.b).h("w(dp.T)")}}
-P.bwe.prototype={
+P.bw5.prototype={
$0:function(){return this.b.$2(this.a.a,this.c)},
$S:function(){return this.d.h("0()")}}
-P.bwf.prototype={
+P.bw6.prototype={
$1:function(a){this.a.a=a},
$S:function(){return this.b.h("w(0)")}}
-P.bwk.prototype={
-$0:function(){this.a.lI(null)},
+P.bwb.prototype={
+$0:function(){this.a.lH(null)},
$C:"$0",
$R:0,
$S:0}
-P.bwl.prototype={
-$1:function(a){P.cZU(new P.bwi(this.b,a),new P.bwj(),P.cZ4(this.c,this.d))},
+P.bwc.prototype={
+$1:function(a){P.cZk(new P.bw9(this.b,a),new P.bwa(),P.cYv(this.c,this.d))},
$S:function(){return H.F(this.a).h("w(dp.T)")}}
-P.bwi.prototype={
+P.bw9.prototype={
$0:function(){return this.a.$1(this.b)},
$S:1}
-P.bwj.prototype={
+P.bwa.prototype={
$1:function(a){},
-$S:69}
-P.bwo.prototype={
+$S:65}
+P.bwf.prototype={
$1:function(a){++this.a.a},
$S:function(){return H.F(this.b).h("w(dp.T)")}}
-P.bwp.prototype={
-$0:function(){this.b.lI(this.a.a)},
-$C:"$0",
-$R:0,
-$S:0}
-P.bwm.prototype={
-$0:function(){this.a.lI(!0)},
-$C:"$0",
-$R:0,
-$S:0}
-P.bwn.prototype={
-$1:function(a){P.cZ5(this.b,this.c,!1)},
-$S:function(){return H.F(this.a).h("w(dp.T)")}}
-P.bwc.prototype={
-$0:function(){var s,r,q,p
-try{q=H.f5()
-throw H.d(q)}catch(p){s=H.J(p)
-r=H.c7(p)
-P.ccl(this.a,s,r)}},
+P.bwg.prototype={
+$0:function(){this.b.lH(this.a.a)},
$C:"$0",
$R:0,
$S:0}
P.bwd.prototype={
-$1:function(a){P.cZ5(this.b,this.c,a)},
+$0:function(){this.a.lH(!0)},
+$C:"$0",
+$R:0,
+$S:0}
+P.bwe.prototype={
+$1:function(a){P.cYw(this.b,this.c,!1)},
+$S:function(){return H.F(this.a).h("w(dp.T)")}}
+P.bw3.prototype={
+$0:function(){var s,r,q,p
+try{q=H.f7()
+throw H.d(q)}catch(p){s=H.K(p)
+r=H.c7(p)
+P.cbU(this.a,s,r)}},
+$C:"$0",
+$R:0,
+$S:0}
+P.bw4.prototype={
+$1:function(a){P.cYw(this.b,this.c,a)},
$S:function(){return H.F(this.a).h("w(dp.T)")}}
P.jK.prototype={}
-P.a4H.prototype={
-goF:function(){return this.a.goF()},
+P.a4K.prototype={
+goG:function(){return this.a.goG()},
h5:function(a,b,c,d,e){return this.a.h5(0,b,c,d,e)},
nJ:function(a,b,c,d){return this.h5(a,b,null,c,d)}}
P.iV.prototype={}
-P.Oz.prototype={
-gLr:function(a){return new P.i_(this,H.F(this).h("i_<1>"))},
-gaAl:function(){if((this.b&8)===0)return this.a
+P.OC.prototype={
+gLr:function(a){return new P.hY(this,H.F(this).h("hY<1>"))},
+gaAr:function(){if((this.b&8)===0)return this.a
return this.a.c},
-wY:function(){var s,r,q=this
+wX:function(){var s,r,q=this
if((q.b&8)===0){s=q.a
-return s==null?q.a=new P.vk(H.F(q).h("vk<1>")):s}r=q.a
+return s==null?q.a=new P.vl(H.F(q).h("vl<1>")):s}r=q.a
s=r.c
-return s==null?r.c=new P.vk(H.F(q).h("vk<1>")):s},
+return s==null?r.c=new P.vl(H.F(q).h("vl<1>")):s},
gqv:function(){var s=this.a
return(this.b&8)!==0?s.c:s},
-uo:function(){if((this.b&4)!==0)return new P.pT("Cannot add event after closing")
-return new P.pT("Cannot add event while adding a stream")},
-aFV:function(a,b,c){var s,r,q,p=this,o=p.b
+uo:function(){if((this.b&4)!==0)return new P.pR("Cannot add event after closing")
+return new P.pR("Cannot add event while adding a stream")},
+aG0:function(a,b,c){var s,r,q,p=this,o=p.b
if(o>=4)throw H.d(p.uo())
if((o&2)!==0){o=new P.aC($.aG,t.LR)
o.my(null)
return o}o=p.a
s=new P.aC($.aG,t.LR)
-r=b.h5(0,p.gaow(p),!1,p.gaox(),p.ganQ())
+r=b.h5(0,p.gaoA(p),!1,p.gaoB(),p.ganU())
q=p.b
if((q&1)!==0?(p.gqv().e&4)!==0:(q&2)===0)r.vT(0)
-p.a=new P.ac_(o,s,r,H.F(p).h("ac_<1>"))
+p.a=new P.ac3(o,s,r,H.F(p).h("ac3<1>"))
p.b|=8
return s},
-Ay:function(){var s=this.c
-if(s==null)s=this.c=(this.b&2)!==0?$.vv():new P.aC($.aG,t.D4)
+Aw:function(){var s=this.c
+if(s==null)s=this.c=(this.b&2)!==0?$.vw():new P.aC($.aG,t.D4)
return s},
F:function(a,b){if(this.b>=4)throw H.d(this.uo())
-this.o_(0,b)},
-iv:function(a,b){var s
-P.eB(a,"error")
+this.o1(0,b)},
+iu:function(a,b){var s
+P.ez(a,"error")
if(this.b>=4)throw H.d(this.uo())
s=$.aG.tw(a,b)
if(s!=null){a=s.a
-b=s.b}else if(b==null)b=P.vH(a)
+b=s.b}else if(b==null)b=P.vI(a)
this.p7(a,b)},
-xI:function(a){return this.iv(a,null)},
-dD:function(a){var s=this,r=s.b
-if((r&4)!==0)return s.Ay()
+xH:function(a){return this.iu(a,null)},
+dC:function(a){var s=this,r=s.b
+if((r&4)!==0)return s.Aw()
if(r>=4)throw H.d(s.uo())
s.ML()
-return s.Ay()},
+return s.Aw()},
ML:function(){var s=this.b|=4
-if((s&1)!==0)this.oh()
-else if((s&3)===0)this.wY().F(0,C.nr)},
-o_:function(a,b){var s=this,r=s.b
+if((s&1)!==0)this.oj()
+else if((s&3)===0)this.wX().F(0,C.nq)},
+o1:function(a,b){var s=this,r=s.b
if((r&1)!==0)s.mE(b)
-else if((r&3)===0)s.wY().F(0,new P.kP(b,H.F(s).h("kP<1>")))},
+else if((r&3)===0)s.wX().F(0,new P.kO(b,H.F(s).h("kO<1>")))},
p7:function(a,b){var s=this.b
if((s&1)!==0)this.pi(a,b)
-else if((s&3)===0)this.wY().F(0,new P.Og(a,b))},
-wF:function(){var s=this.a
+else if((s&3)===0)this.wX().F(0,new P.Oj(a,b))},
+wE:function(){var s=this.a
this.a=s.c
this.b&=4294967287
s.a.my(null)},
Mi:function(a,b,c,d){var s,r,q,p,o=this
if((o.b&3)!==0)throw H.d(P.bg("Stream has already been listened to."))
-s=P.dii(o,a,b,c,d,H.F(o).c)
-r=o.gaAl()
+s=P.dhG(o,a,b,c,d,H.F(o).c)
+r=o.gaAr()
q=o.b|=1
if((q&8)!==0){p=o.a
p.c=s
p.b.tV(0)}else o.a=s
-s.a3Y(r)
-s.NN(new P.c2t(o))
+s.a41(r)
+s.NM(new P.c2b(o))
return s},
-a2U:function(a){var s,r,q,p,o,n,m,l=this,k=null
-if((l.b&8)!==0)k=l.a.bU(0)
+a2X:function(a){var s,r,q,p,o,n,m,l=this,k=null
+if((l.b&8)!==0)k=l.a.bV(0)
l.a=null
l.b=l.b&4294967286|2
s=l.r
if(s!=null)if(k==null)try{r=s.$0()
-if(t.uz.b(r))k=r}catch(o){q=H.J(o)
+if(t.uz.b(r))k=r}catch(o){q=H.K(o)
p=H.c7(o)
n=new P.aC($.aG,t.D4)
n.ED(q,p)
-k=n}else k=k.iL(s)
-m=new P.c2s(l)
-if(k!=null)k=k.iL(m)
+k=n}else k=k.iJ(s)
+m=new P.c2a(l)
+if(k!=null)k=k.iJ(m)
else m.$0()
return k},
-a2V:function(a){if((this.b&8)!==0)this.a.b.vT(0)
-P.aKc(this.e)},
-a2W:function(a){if((this.b&8)!==0)this.a.b.tV(0)
-P.aKc(this.f)},
+a2Y:function(a){if((this.b&8)!==0)this.a.b.vT(0)
+P.aKf(this.e)},
+a2Z:function(a){if((this.b&8)!==0)this.a.b.tV(0)
+P.aKf(this.f)},
$ij6:1,
-$im5:1}
-P.c2t.prototype={
-$0:function(){P.aKc(this.a.d)},
+$im6:1}
+P.c2b.prototype={
+$0:function(){P.aKf(this.a.d)},
$S:0}
-P.c2s.prototype={
+P.c2a.prototype={
$0:function(){var s=this.a.c
if(s!=null&&s.a===0)s.my(null)},
$C:"$0",
$R:0,
$S:1}
-P.aHm.prototype={
-mE:function(a){this.gqv().o_(0,a)},
+P.aHp.prototype={
+mE:function(a){this.gqv().o1(0,a)},
pi:function(a,b){this.gqv().p7(a,b)},
-oh:function(){this.gqv().wF()}}
-P.azQ.prototype={
-mE:function(a){this.gqv().qg(new P.kP(a,this.$ti.h("kP<1>")))},
-pi:function(a,b){this.gqv().qg(new P.Og(a,b))},
-oh:function(){this.gqv().qg(C.nr)}}
-P.WC.prototype={}
+oj:function(){this.gqv().wE()}}
+P.azT.prototype={
+mE:function(a){this.gqv().qg(new P.kO(a,this.$ti.h("kO<1>")))},
+pi:function(a,b){this.gqv().qg(new P.Oj(a,b))},
+oj:function(){this.gqv().qg(C.nq)}}
+P.WF.prototype={}
P.EG.prototype={}
-P.i_.prototype={
-MY:function(a,b,c,d){return this.a.Mi(a,b,c,d)},
+P.hY.prototype={
+MX:function(a,b,c,d){return this.a.Mi(a,b,c,d)},
gG:function(a){return(H.k3(this.a)^892482866)>>>0},
B:function(a,b){if(b==null)return!1
if(this===b)return!0
-return b instanceof P.i_&&b.a===this.a}}
+return b instanceof P.hY&&b.a===this.a}}
P.Eq.prototype={
-xm:function(){return this.x.a2U(this)},
-pd:function(){this.x.a2V(this)},
-pe:function(){this.x.a2W(this)}}
-P.azt.prototype={
-bU:function(a){var s=this.b.bU(0)
+xl:function(){return this.x.a2X(this)},
+pd:function(){this.x.a2Y(this)},
+pe:function(){this.x.a2Z(this)}}
+P.azw.prototype={
+bV:function(a){var s=this.b.bV(0)
if(s==null){this.a.my(null)
-return $.vv()}return s.iL(new P.bFa(this))}}
-P.bFa.prototype={
+return $.vw()}return s.iJ(new P.bEQ(this))}}
+P.bEQ.prototype={
$0:function(){this.a.a.my(null)},
$C:"$0",
$R:0,
$S:0}
-P.ac_.prototype={}
-P.hZ.prototype={
-a3Y:function(a){var s=this
+P.ac3.prototype={}
+P.hX.prototype={
+a41:function(a){var s=this
if(a==null)return
s.r=a
if(!a.gag(a)){s.e=(s.e|64)>>>0
-a.DZ(s)}},
-tO:function(a){this.a=P.a8a(this.d,a,H.F(this).h("hZ.T"))},
-z2:function(a,b){var s,r,q=this,p=q.e
+a.DY(s)}},
+tO:function(a){this.a=P.a8d(this.d,a,H.F(this).h("hX.T"))},
+z0:function(a,b){var s,r,q=this,p=q.e
if((p&8)!==0)return
s=(p+128|4)>>>0
q.e=s
if(p<128){r=q.r
-if(r!=null)if(r.a===1)r.a=3}if((p&4)===0&&(s&32)===0)q.NN(q.gAV())},
-vT:function(a){return this.z2(a,null)},
+if(r!=null)if(r.a===1)r.a=3}if((p&4)===0&&(s&32)===0)q.NM(q.gAT())},
+vT:function(a){return this.z0(a,null)},
tV:function(a){var s=this,r=s.e
if((r&8)!==0)return
if(r>=128){r=s.e=r-128
if(r<128){if((r&64)!==0){r=s.r
r=!r.gag(r)}else r=!1
-if(r)s.r.DZ(s)
+if(r)s.r.DY(s)
else{r=(s.e&4294967291)>>>0
s.e=r
-if((r&32)===0)s.NN(s.gAW())}}}},
-bU:function(a){var s=this,r=(s.e&4294967279)>>>0
+if((r&32)===0)s.NM(s.gAU())}}}},
+bV:function(a){var s=this,r=(s.e&4294967279)>>>0
s.e=r
if((r&8)===0)s.Mu()
r=s.f
-return r==null?$.vv():r},
+return r==null?$.vw():r},
Mu:function(){var s,r=this,q=r.e=(r.e|8)>>>0
if((q&64)!==0){s=r.r
if(s.a===1)s.a=3}if((q&32)===0)r.r=null
-r.f=r.xm()},
-o_:function(a,b){var s=this,r=s.e
+r.f=r.xl()},
+o1:function(a,b){var s=this,r=s.e
if((r&8)!==0)return
if(r<32)s.mE(b)
-else s.qg(new P.kP(b,H.F(s).h("kP")))},
+else s.qg(new P.kO(b,H.F(s).h("kO")))},
p7:function(a,b){var s=this.e
if((s&8)!==0)return
if(s<32)this.pi(a,b)
-else this.qg(new P.Og(a,b))},
-wF:function(){var s=this,r=s.e
+else this.qg(new P.Oj(a,b))},
+wE:function(){var s=this,r=s.e
if((r&8)!==0)return
r=(r|2)>>>0
s.e=r
-if(r<32)s.oh()
-else s.qg(C.nr)},
+if(r<32)s.oj()
+else s.qg(C.nq)},
pd:function(){},
pe:function(){},
-xm:function(){return null},
+xl:function(){return null},
qg:function(a){var s,r=this,q=r.r
-if(q==null)q=new P.vk(H.F(r).h("vk"))
+if(q==null)q=new P.vl(H.F(r).h("vl"))
r.r=q
q.F(0,a)
s=r.e
if((s&64)===0){s=(s|64)>>>0
r.e=s
-if(s<128)q.DZ(r)}},
+if(s<128)q.DY(r)}},
mE:function(a){var s=this,r=s.e
s.e=(r|32)>>>0
-s.d.w8(s.a,a,H.F(s).h("hZ.T"))
+s.d.w8(s.a,a,H.F(s).h("hX.T"))
s.e=(s.e&4294967263)>>>0
s.Mz((r&4)!==0)},
-pi:function(a,b){var s,r=this,q=r.e,p=new P.bGS(r,a,b)
+pi:function(a,b){var s,r=this,q=r.e,p=new P.bGy(r,a,b)
if((q&1)!==0){r.e=(q|16)>>>0
r.Mu()
s=r.f
-if(s!=null&&s!==$.vv())s.iL(p)
+if(s!=null&&s!==$.vw())s.iJ(p)
else p.$0()}else{p.$0()
r.Mz((q&4)!==0)}},
-oh:function(){var s,r=this,q=new P.bGR(r)
+oj:function(){var s,r=this,q=new P.bGx(r)
r.Mu()
r.e=(r.e|16)>>>0
s=r.f
-if(s!=null&&s!==$.vv())s.iL(q)
+if(s!=null&&s!==$.vw())s.iJ(q)
else q.$0()},
-NN:function(a){var s=this,r=s.e
+NM:function(a){var s=this,r=s.e
s.e=(r|32)>>>0
a.$0()
s.e=(s.e&4294967263)>>>0
@@ -61455,9 +61371,9 @@ q.e=(s^32)>>>0
if(r)q.pd()
else q.pe()
q.e=(q.e&4294967263)>>>0}s=q.e
-if((s&64)!==0&&s<128)q.r.DZ(q)},
+if((s&64)!==0&&s<128)q.r.DY(q)},
$ijK:1}
-P.bGS.prototype={
+P.bGy.prototype={
$0:function(){var s,r,q,p=this.a,o=p.e
if((o&8)!==0&&(o&16)===0)return
p.e=(o|32)>>>0
@@ -61465,13 +61381,13 @@ s=p.b
o=this.b
r=t.K
q=p.d
-if(t.hK.b(s))q.acO(s,o,this.c,r,t.Km)
+if(t.hK.b(s))q.acS(s,o,this.c,r,t.Km)
else q.w8(s,o,r)
p.e=(p.e&4294967263)>>>0},
$C:"$0",
$R:0,
$S:1}
-P.bGR.prototype={
+P.bGx.prototype={
$0:function(){var s=this.a,r=s.e
if((r&16)===0)return
s.e=(r|42)>>>0
@@ -61480,105 +61396,105 @@ s.e=(s.e&4294967263)>>>0},
$C:"$0",
$R:0,
$S:1}
-P.OA.prototype={
-h5:function(a,b,c,d,e){return this.MY(b,e,d,c===!0)},
+P.OD.prototype={
+h5:function(a,b,c,d,e){return this.MX(b,e,d,c===!0)},
nJ:function(a,b,c,d){return this.h5(a,b,null,c,d)},
-TC:function(a,b,c){return this.h5(a,b,null,null,c)},
-yP:function(a,b){return this.h5(a,b,null,null,null)},
-MY:function(a,b,c,d){return P.cY_(a,b,c,d,H.F(this).c)}}
-P.a9q.prototype={
-MY:function(a,b,c,d){var s,r=this
+TB:function(a,b,c){return this.h5(a,b,null,null,c)},
+yN:function(a,b){return this.h5(a,b,null,null,null)},
+MX:function(a,b,c,d){return P.cXq(a,b,c,d,H.F(this).c)}}
+P.a9u.prototype={
+MX:function(a,b,c,d){var s,r=this
if(r.b)throw H.d(P.bg("Stream has already been listened to."))
r.b=!0
-s=P.cY_(a,b,c,d,r.$ti.c)
-s.a3Y(r.a.$0())
+s=P.cXq(a,b,c,d,r.$ti.c)
+s.a41(r.a.$0())
return s}}
-P.a9U.prototype={
+P.a9Y.prototype={
gag:function(a){return this.b==null},
-SV:function(a){var s,r,q,p,o=this.b
+SU:function(a){var s,r,q,p,o=this.b
if(o==null)throw H.d(P.bg("No events pending."))
s=!1
try{if(o.t()){s=!0
-a.mE(J.d9e(o))}else{this.b=null
-a.oh()}}catch(p){r=H.J(p)
+a.mE(J.d8B(o))}else{this.b=null
+a.oj()}}catch(p){r=H.K(p)
q=H.c7(p)
-if(!s)this.b=C.jq
+if(!s)this.b=C.js
a.pi(r,q)}}}
-P.aBs.prototype={
+P.aBv.prototype={
gr9:function(a){return this.a},
sr9:function(a,b){return this.a=b}}
-P.kP.prototype={
-UH:function(a){a.mE(this.b)},
+P.kO.prototype={
+UG:function(a){a.mE(this.b)},
gw:function(a){return this.b}}
-P.Og.prototype={
-UH:function(a){a.pi(this.b,this.c)}}
-P.bLX.prototype={
-UH:function(a){a.oh()},
+P.Oj.prototype={
+UG:function(a){a.pi(this.b,this.c)}}
+P.bLA.prototype={
+UG:function(a){a.oj()},
gr9:function(a){return null},
sr9:function(a,b){throw H.d(P.bg("No events after a done."))}}
-P.aEM.prototype={
-DZ:function(a){var s=this,r=s.a
+P.aEP.prototype={
+DY:function(a){var s=this,r=s.a
if(r===1)return
if(r>=1){s.a=1
-return}P.jT(new P.bZB(s,a))
+return}P.jT(new P.bZv(s,a))
s.a=1}}
-P.bZB.prototype={
+P.bZv.prototype={
$0:function(){var s=this.a,r=s.a
s.a=0
if(r===3)return
-s.SV(this.b)},
+s.SU(this.b)},
$C:"$0",
$R:0,
$S:0}
-P.vk.prototype={
+P.vl.prototype={
gag:function(a){return this.c==null},
F:function(a,b){var s=this,r=s.c
if(r==null)s.b=s.c=b
else{r.sr9(0,b)
s.c=b}},
-SV:function(a){var s=this.b,r=s.gr9(s)
+SU:function(a){var s=this.b,r=s.gr9(s)
this.b=r
if(r==null)this.c=null
-s.UH(a)}}
-P.WU.prototype={
-a3B:function(){var s=this
+s.UG(a)}}
+P.WX.prototype={
+a3E:function(){var s=this
if((s.b&2)!==0)return
-s.a.rA(s.gaCu())
+s.a.rA(s.gaCA())
s.b=(s.b|2)>>>0},
tO:function(a){},
-z2:function(a,b){this.b+=4},
-vT:function(a){return this.z2(a,null)},
+z0:function(a,b){this.b+=4},
+vT:function(a){return this.z0(a,null)},
tV:function(a){var s=this.b
if(s>=4){s=this.b=s-4
-if(s<4&&(s&1)===0)this.a3B()}},
-bU:function(a){return $.vv()},
-oh:function(){var s,r=this,q=r.b=(r.b&4294967293)>>>0
+if(s<4&&(s&1)===0)this.a3E()}},
+bV:function(a){return $.vw()},
+oj:function(){var s,r=this,q=r.b=(r.b&4294967293)>>>0
if(q>=4)return
r.b=(q|1)>>>0
s=r.c
if(s!=null)r.a.tX(s)},
$ijK:1}
-P.WA.prototype={
-goF:function(){return!0},
+P.WD.prototype={
+goG:function(){return!0},
h5:function(a,b,c,d,e){var s,r,q=this,p=q.e
-if(p==null||(p.c&4)!==0)return P.cY7(d,q.$ti.c)
+if(p==null||(p.c&4)!==0)return P.cXy(d,q.$ti.c)
if(q.f==null){s=p.gGE(p)
-r=p.gQo()
-q.f=q.a.nJ(0,s,p.glm(p),r)}return p.Mi(b,e,d,c===!0)},
+r=p.gQn()
+q.f=q.a.nJ(0,s,p.gll(p),r)}return p.Mi(b,e,d,c===!0)},
nJ:function(a,b,c,d){return this.h5(a,b,null,c,d)},
-yP:function(a,b){return this.h5(a,b,null,null,null)},
-xm:function(){var s,r,q=this,p=q.e,o=p==null||(p.c&4)!==0,n=q.c
-if(n!=null){s=q.$ti.h("O9<1>")
-q.d.tY(n,new P.O9(q,s),t.n,s)}if(o){r=q.f
-if(r!=null){r.bU(0)
+yN:function(a,b){return this.h5(a,b,null,null,null)},
+xl:function(){var s,r,q=this,p=q.e,o=p==null||(p.c&4)!==0,n=q.c
+if(n!=null){s=q.$ti.h("Oc<1>")
+q.d.tY(n,new P.Oc(q,s),t.n,s)}if(o){r=q.f
+if(r!=null){r.bV(0)
q.f=null}}},
-azC:function(){var s,r=this,q=r.b
-if(q!=null){s=r.$ti.h("O9<1>")
-r.d.tY(q,new P.O9(r,s),t.n,s)}}}
-P.O9.prototype={
-bU:function(a){var s=this.a,r=s.f
+azG:function(){var s,r=this,q=r.b
+if(q!=null){s=r.$ti.h("Oc<1>")
+r.d.tY(q,new P.Oc(r,s),t.n,s)}}}
+P.Oc.prototype={
+bV:function(a){var s=this.a,r=s.f
if(r!=null){s.e=s.f=null
-r.bU(0)}return $.vv()},
+r.bV(0)}return $.vw()},
$ijK:1}
P.th.prototype={
gC:function(a){if(this.a!=null&&this.c)return this.b
@@ -61588,126 +61504,126 @@ if(q!=null){if(r.c){s=new P.aC($.aG,t.tr)
r.b=s
r.c=!1
q.tV(0)
-return s}throw H.d(P.bg("Already waiting for next."))}return r.axL()},
-axL:function(){var s=this,r=s.b
-if(r!=null){s.a=r.h5(0,s.gazo(),!0,s.gazr(),s.gazx())
-return s.b=new P.aC($.aG,t.tr)}return $.d19()},
-bU:function(a){var s=this,r=s.a,q=s.b
+return s}throw H.d(P.bg("Already waiting for next."))}return r.axP()},
+axP:function(){var s=this,r=s.b
+if(r!=null){s.a=r.h5(0,s.gazs(),!0,s.gazv(),s.gazB())
+return s.b=new P.aC($.aG,t.tr)}return $.d0A()},
+bV:function(a){var s=this,r=s.a,q=s.b
s.b=null
if(r!=null){s.a=null
if(!s.c)q.my(!1)
-return r.bU(0)}return $.vv()},
-azp:function(a){var s,r=this,q=r.b
+return r.bV(0)}return $.vw()},
+azt:function(a){var s,r=this,q=r.b
r.b=a
r.c=!0
-q.lI(!0)
+q.lH(!0)
if(r.c){s=r.a
if(s!=null)s.vT(0)}},
-azy:function(a,b){var s=this.b
+azC:function(a,b){var s=this.b
this.b=this.a=null
-s.ju(a,b)},
-azs:function(){var s=this.b
+s.js(a,b)},
+azw:function(){var s=this.b
this.b=this.a=null
-s.lI(!1)}}
-P.caM.prototype={
-$0:function(){return this.a.ju(this.b,this.c)},
+s.lH(!1)}}
+P.cak.prototype={
+$0:function(){return this.a.js(this.b,this.c)},
$C:"$0",
$R:0,
$S:1}
-P.caL.prototype={
-$2:function(a,b){P.dlu(this.a,this.b,a,b)},
-$S:138}
-P.caN.prototype={
-$0:function(){return this.a.lI(this.b)},
+P.caj.prototype={
+$2:function(a,b){P.dkS(this.a,this.b,a,b)},
+$S:128}
+P.cal.prototype={
+$0:function(){return this.a.lH(this.b)},
$C:"$0",
$R:0,
$S:1}
-P.q6.prototype={
-goF:function(){return this.a.goF()},
-h5:function(a,b,c,d,e){var s=H.F(this),r=s.h("q6.T"),q=$.aG,p=c===!0?1:0,o=P.a8a(q,b,r),n=P.aA4(q,e),m=d==null?P.aKf():d
-r=new P.X6(this,o,n,q.oU(m,t.n),q,p,s.h("@").a7(r).h("X6<1,2>"))
-r.y=this.a.nJ(0,r.gNO(),r.gNS(),r.gNU())
+P.q4.prototype={
+goG:function(){return this.a.goG()},
+h5:function(a,b,c,d,e){var s=H.F(this),r=s.h("q4.T"),q=$.aG,p=c===!0?1:0,o=P.a8d(q,b,r),n=P.aA7(q,e),m=d==null?P.aKi():d
+r=new P.X9(this,o,n,q.oV(m,t.n),q,p,s.h("@").a6(r).h("X9<1,2>"))
+r.y=this.a.nJ(0,r.gNN(),r.gNR(),r.gNT())
return r},
nJ:function(a,b,c,d){return this.h5(a,b,null,c,d)},
-yP:function(a,b){return this.h5(a,b,null,null,null)}}
-P.X6.prototype={
-o_:function(a,b){if((this.e&2)!==0)return
+yN:function(a,b){return this.h5(a,b,null,null,null)}}
+P.X9.prototype={
+o1:function(a,b){if((this.e&2)!==0)return
this.Et(0,b)},
p7:function(a,b){if((this.e&2)!==0)return
-this.wB(a,b)},
+this.wA(a,b)},
pd:function(){var s=this.y
if(s!=null)s.vT(0)},
pe:function(){var s=this.y
if(s!=null)s.tV(0)},
-xm:function(){var s=this.y
+xl:function(){var s=this.y
if(s!=null){this.y=null
-return s.bU(0)}return null},
-NP:function(a){this.x.a0W(a,this)},
-NV:function(a,b){this.p7(a,b)},
-NT:function(){this.wF()}}
-P.yD.prototype={
-a0W:function(a,b){var s,r,q,p=null
-try{p=this.b.$1(a)}catch(q){s=H.J(q)
+return s.bV(0)}return null},
+NO:function(a){this.x.a0V(a,this)},
+NU:function(a,b){this.p7(a,b)},
+NS:function(){this.wE()}}
+P.yC.prototype={
+a0V:function(a,b){var s,r,q,p=null
+try{p=this.b.$1(a)}catch(q){s=H.K(q)
r=H.c7(q)
-P.cZ0(b,s,r)
-return}if(p)b.o_(0,a)}}
-P.yv.prototype={
-a0W:function(a,b){var s,r,q,p=null
-try{p=this.b.$1(a)}catch(q){s=H.J(q)
+P.cYr(b,s,r)
+return}if(p)b.o1(0,a)}}
+P.yu.prototype={
+a0V:function(a,b){var s,r,q,p=null
+try{p=this.b.$1(a)}catch(q){s=H.K(q)
r=H.c7(q)
-P.cZ0(b,s,r)
-return}b.o_(0,p)}}
-P.a94.prototype={
+P.cYr(b,s,r)
+return}b.o1(0,p)}}
+P.a98.prototype={
F:function(a,b){var s=this.a
if((s.e&2)!==0)H.b(P.bg("Stream is already closed"))
s.Et(0,b)},
-iv:function(a,b){var s=this.a,r=b==null?P.vH(a):b
+iu:function(a,b){var s=this.a,r=b==null?P.vI(a):b
if((s.e&2)!==0)H.b(P.bg("Stream is already closed"))
-s.wB(a,r)},
-dD:function(a){var s=this.a
+s.wA(a,r)},
+dC:function(a){var s=this.a
if((s.e&2)!==0)H.b(P.bg("Stream is already closed"))
s.LS()},
$ij6:1}
-P.XP.prototype={
-gPO:function(){return this.y?this.x:H.b(H.R("Field '_transformerSink' has not been initialized."))},
+P.XS.prototype={
+gPN:function(){return this.y?this.x:H.b(H.R("Field '_transformerSink' has not been initialized."))},
pd:function(){var s=this.z
if(s!=null)s.vT(0)},
pe:function(){var s=this.z
if(s!=null)s.tV(0)},
-xm:function(){var s=this.z
+xl:function(){var s=this.z
if(s!=null){this.z=null
-return s.bU(0)}return null},
-NP:function(a){var s,r,q
-try{this.gPO().F(0,a)}catch(q){s=H.J(q)
+return s.bV(0)}return null},
+NO:function(a){var s,r,q
+try{this.gPN().F(0,a)}catch(q){s=H.K(q)
r=H.c7(q)
if((this.e&2)!==0)H.b(P.bg("Stream is already closed"))
-this.wB(s,r)}},
-NV:function(a,b){var s,r,q,p,o=this,n="Stream is already closed"
-try{o.gPO().iv(a,b)}catch(q){s=H.J(q)
+this.wA(s,r)}},
+NU:function(a,b){var s,r,q,p,o=this,n="Stream is already closed"
+try{o.gPN().iu(a,b)}catch(q){s=H.K(q)
r=H.c7(q)
p=s
if(p==null?a==null:p===a){if((o.e&2)!==0)H.b(P.bg(n))
-o.wB(a,b)}else{if((o.e&2)!==0)H.b(P.bg(n))
-o.wB(s,r)}}},
-NT:function(){var s,r,q,p=this
+o.wA(a,b)}else{if((o.e&2)!==0)H.b(P.bg(n))
+o.wA(s,r)}}},
+NS:function(){var s,r,q,p=this
try{p.z=null
-p.gPO().dD(0)}catch(q){s=H.J(q)
+p.gPN().dC(0)}catch(q){s=H.K(q)
r=H.c7(q)
if((p.e&2)!==0)H.b(P.bg("Stream is already closed"))
-p.wB(s,r)}}}
-P.XW.prototype={
+p.wA(s,r)}}}
+P.XZ.prototype={
tk:function(a){var s=this.$ti
-return new P.a89(this.a,a,s.h("@<1>").a7(s.Q[1]).h("a89<1,2>"))}}
-P.a89.prototype={
-goF:function(){return this.b.goF()},
-h5:function(a,b,c,d,e){var s=this.$ti,r=s.Q[1],q=$.aG,p=c===!0?1:0,o=P.a8a(q,b,r),n=P.aA4(q,e),m=d==null?P.aKf():d,l=new P.XP(o,n,q.oU(m,t.n),q,p,s.h("@<1>").a7(r).h("XP<1,2>"))
-s=this.a.$1(new P.a94(l,s.h("a94<2>")))
+return new P.a8c(this.a,a,s.h("@<1>").a6(s.Q[1]).h("a8c<1,2>"))}}
+P.a8c.prototype={
+goG:function(){return this.b.goG()},
+h5:function(a,b,c,d,e){var s=this.$ti,r=s.Q[1],q=$.aG,p=c===!0?1:0,o=P.a8d(q,b,r),n=P.aA7(q,e),m=d==null?P.aKi():d,l=new P.XS(o,n,q.oV(m,t.n),q,p,s.h("@<1>").a6(r).h("XS<1,2>"))
+s=this.a.$1(new P.a98(l,s.h("a98<2>")))
l.y=!0
l.x=s
-l.z=this.b.nJ(0,l.gNO(),l.gNS(),l.gNU())
+l.z=this.b.nJ(0,l.gNN(),l.gNR(),l.gNT())
return l},
nJ:function(a,b,c,d){return this.h5(a,b,null,c,d)}}
-P.Xb.prototype={
+P.Xe.prototype={
F:function(a,b){var s,r,q=this.d
if(q==null)throw H.d(P.bg("Sink is closed"))
s=this.a
@@ -61716,12 +61632,12 @@ else{this.$ti.Q[1].a(b)
r=q.a
if((r.e&2)!==0)H.b(P.bg("Stream is already closed"))
r.Et(0,b)}},
-iv:function(a,b){var s
-P.eB(a,"error")
+iu:function(a,b){var s
+P.ez(a,"error")
s=this.d
if(s==null)throw H.d(P.bg("Sink is closed"))
-s.iv(a,b==null?P.vH(a):b)},
-dD:function(a){var s,r,q=this.d
+s.iu(a,b==null?P.vI(a):b)},
+dC:function(a){var s,r,q=this.d
if(q==null)return
this.d=null
s=this.c
@@ -61730,244 +61646,244 @@ else{r=q.a
if((r.e&2)!==0)H.b(P.bg("Stream is already closed"))
r.LS()}},
$ij6:1}
-P.ac0.prototype={
-tk:function(a){return this.al3(a)}}
-P.c2u.prototype={
+P.ac4.prototype={
+tk:function(a){return this.al7(a)}}
+P.c2c.prototype={
$1:function(a){var s=this
-return new P.Xb(s.a,s.b,s.c,a,s.e.h("@<0>").a7(s.d).h("Xb<1,2>"))},
-$S:function(){return this.e.h("@<0>").a7(this.d).h("Xb<1,2>(j6<2>)")}}
-P.Fd.prototype={
+return new P.Xe(s.a,s.b,s.c,a,s.e.h("@<0>").a6(s.d).h("Xe<1,2>"))},
+$S:function(){return this.e.h("@<0>").a6(this.d).h("Xe<1,2>(j6<2>)")}}
+P.Fe.prototype={
j:function(a){return H.f(this.a)},
-$ieH:1,
-gEc:function(){return this.b}}
-P.kh.prototype={}
-P.c1M.prototype={}
-P.c1N.prototype={}
-P.c1L.prototype={}
-P.c0y.prototype={}
-P.c0z.prototype={}
-P.c0x.prototype={}
-P.OE.prototype={$ibEO:1}
-P.acM.prototype={
-a9c:function(a,b,c){var s=this.a.gO2(),r=s.a
-return s.b.$5(r,r.glJ(),a,b,c)},
+$ieG:1,
+gEb:function(){return this.b}}
+P.kj.prototype={}
+P.c1u.prototype={}
+P.c1v.prototype={}
+P.c1t.prototype={}
+P.c0g.prototype={}
+P.c0h.prototype={}
+P.c0f.prototype={}
+P.OI.prototype={$ibEt:1}
+P.acQ.prototype={
+a9g:function(a,b,c){var s=this.a.gO1(),r=s.a
+return s.b.$5(r,r.glI(),a,b,c)},
$if_:1}
-P.OD.prototype={$ici:1}
-P.aB5.prototype={
-gN5:function(){var s=this.cy
-return s==null?this.cy=new P.acM(this):s},
-glJ:function(){return this.db.gN5()},
+P.OH.prototype={$icg:1}
+P.aB8.prototype={
+gN4:function(){var s=this.cy
+return s==null?this.cy=new P.acQ(this):s},
+glI:function(){return this.db.gN4()},
gvp:function(){return this.cx.a},
tX:function(a){var s,r,q
-try{this.w7(a,t.n)}catch(q){s=H.J(q)
+try{this.w7(a,t.n)}catch(q){s=H.K(q)
r=H.c7(q)
this.qZ(s,r)}},
w8:function(a,b,c){var s,r,q
-try{this.tY(a,b,t.n,c)}catch(q){s=H.J(q)
+try{this.tY(a,b,t.n,c)}catch(q){s=H.K(q)
r=H.c7(q)
this.qZ(s,r)}},
-acO:function(a,b,c,d,e){var s,r,q
-try{this.K3(a,b,c,t.n,d,e)}catch(q){s=H.J(q)
+acS:function(a,b,c,d,e){var s,r,q
+try{this.K3(a,b,c,t.n,d,e)}catch(q){s=H.K(q)
r=H.c7(q)
this.qZ(s,r)}},
-QN:function(a,b){return new P.bKV(this,this.oU(a,b),b)},
-aGq:function(a,b,c){return new P.bKX(this,this.tT(a,b,c),c,b)},
-H1:function(a){return new P.bKU(this,this.oU(a,t.n))},
-QO:function(a,b){return new P.bKW(this,this.tT(a,t.n,b),b)},
+QM:function(a,b){return new P.bKz(this,this.oV(a,b),b)},
+aGw:function(a,b,c){return new P.bKB(this,this.tT(a,b,c),c,b)},
+H1:function(a){return new P.bKy(this,this.oV(a,t.n))},
+QN:function(a,b){return new P.bKA(this,this.tT(a,t.n,b),b)},
i:function(a,b){var s,r=this.dx,q=r.i(0,b)
-if(q!=null||r.aP(0,b))return q
+if(q!=null||r.aN(0,b))return q
s=this.db.i(0,b)
if(s!=null)r.E(0,b,s)
return s},
qZ:function(a,b){var s=this.cx,r=s.a
-return s.b.$5(r,r.glJ(),this,a,b)},
+return s.b.$5(r,r.glI(),this,a,b)},
In:function(a,b){var s=this.ch,r=s.a
-return s.b.$5(r,r.glJ(),this,a,b)},
-a8Z:function(a){return this.In(a,null)},
+return s.b.$5(r,r.glI(),this,a,b)},
+a92:function(a){return this.In(a,null)},
w7:function(a){var s=this.a,r=s.a
-return s.b.$4(r,r.glJ(),this,a)},
+return s.b.$4(r,r.glI(),this,a)},
tY:function(a,b){var s=this.b,r=s.a
-return s.b.$5(r,r.glJ(),this,a,b)},
+return s.b.$5(r,r.glI(),this,a,b)},
K3:function(a,b,c){var s=this.c,r=s.a
-return s.b.$6(r,r.glJ(),this,a,b,c)},
-oU:function(a){var s=this.d,r=s.a
-return s.b.$4(r,r.glJ(),this,a)},
+return s.b.$6(r,r.glI(),this,a,b,c)},
+oV:function(a){var s=this.d,r=s.a
+return s.b.$4(r,r.glI(),this,a)},
tT:function(a){var s=this.e,r=s.a
-return s.b.$4(r,r.glJ(),this,a)},
+return s.b.$4(r,r.glI(),this,a)},
JP:function(a){var s=this.f,r=s.a
-return s.b.$4(r,r.glJ(),this,a)},
+return s.b.$4(r,r.glI(),this,a)},
tw:function(a,b){var s,r
-P.eB(a,"error")
+P.ez(a,"error")
s=this.r
r=s.a
if(r===C.aJ)return null
-return s.b.$5(r,r.glJ(),this,a,b)},
+return s.b.$5(r,r.glI(),this,a,b)},
rA:function(a){var s=this.x,r=s.a
-return s.b.$4(r,r.glJ(),this,a)},
-Rz:function(a,b){var s=this.y,r=s.a
-return s.b.$5(r,r.glJ(),this,a,b)},
-Rv:function(a,b){var s=this.z,r=s.a
-return s.b.$5(r,r.glJ(),this,a,b)},
-abT:function(a,b){var s=this.Q,r=s.a
-return s.b.$4(r,r.glJ(),this,b)},
-ga3u:function(){return this.a},
-ga3w:function(){return this.b},
-ga3v:function(){return this.c},
-ga3_:function(){return this.d},
-ga30:function(){return this.e},
-ga2Z:function(){return this.f},
-ga02:function(){return this.r},
-gPd:function(){return this.x},
-ga_i:function(){return this.y},
-ga_g:function(){return this.z},
-ga2M:function(){return this.Q},
-ga0g:function(){return this.ch},
-gO2:function(){return this.cx},
+return s.b.$4(r,r.glI(),this,a)},
+Ry:function(a,b){var s=this.y,r=s.a
+return s.b.$5(r,r.glI(),this,a,b)},
+Ru:function(a,b){var s=this.z,r=s.a
+return s.b.$5(r,r.glI(),this,a,b)},
+abX:function(a,b){var s=this.Q,r=s.a
+return s.b.$4(r,r.glI(),this,b)},
+ga3x:function(){return this.a},
+ga3z:function(){return this.b},
+ga3y:function(){return this.c},
+ga32:function(){return this.d},
+ga33:function(){return this.e},
+ga31:function(){return this.f},
+ga01:function(){return this.r},
+gPc:function(){return this.x},
+ga_h:function(){return this.y},
+ga_f:function(){return this.z},
+ga2P:function(){return this.Q},
+ga0f:function(){return this.ch},
+gO1:function(){return this.cx},
ga1U:function(){return this.dx}}
-P.bKV.prototype={
+P.bKz.prototype={
$0:function(){return this.a.w7(this.b,this.c)},
$S:function(){return this.c.h("0()")}}
-P.bKX.prototype={
+P.bKB.prototype={
$1:function(a){var s=this
return s.a.tY(s.b,a,s.d,s.c)},
-$S:function(){return this.d.h("@<0>").a7(this.c).h("1(2)")}}
-P.bKU.prototype={
+$S:function(){return this.d.h("@<0>").a6(this.c).h("1(2)")}}
+P.bKy.prototype={
$0:function(){return this.a.tX(this.b)},
$C:"$0",
$R:0,
$S:1}
-P.bKW.prototype={
+P.bKA.prototype={
$1:function(a){return this.a.w8(this.b,a,this.c)},
$S:function(){return this.c.h("~(0)")}}
-P.cnG.prototype={
+P.cne.prototype={
$0:function(){var s=H.d(this.a)
s.stack=J.aD(this.b)
throw s},
$S:0}
-P.aGo.prototype={
-ga3u:function(){return C.axk},
-ga3w:function(){return C.axl},
-ga3v:function(){return C.axj},
-ga3_:function(){return C.axg},
-ga30:function(){return C.axh},
-ga2Z:function(){return C.axf},
-ga02:function(){return C.axs},
-gPd:function(){return C.axv},
-ga_i:function(){return C.axr},
-ga_g:function(){return C.axp},
-ga2M:function(){return C.axu},
-ga0g:function(){return C.axt},
-gO2:function(){return C.axq},
-ga1U:function(){return $.d4m()},
-gN5:function(){var s=$.cYx
-return s==null?$.cYx=new P.acM(this):s},
-glJ:function(){return this.gN5()},
+P.aGr.prototype={
+ga3x:function(){return C.axk},
+ga3z:function(){return C.axl},
+ga3y:function(){return C.axj},
+ga32:function(){return C.axg},
+ga33:function(){return C.axh},
+ga31:function(){return C.axf},
+ga01:function(){return C.axs},
+gPc:function(){return C.axv},
+ga_h:function(){return C.axr},
+ga_f:function(){return C.axp},
+ga2P:function(){return C.axu},
+ga0f:function(){return C.axt},
+gO1:function(){return C.axq},
+ga1U:function(){return $.d3O()},
+gN4:function(){var s=$.cXY
+return s==null?$.cXY=new P.acQ(this):s},
+glI:function(){return this.gN4()},
gvp:function(){return this},
tX:function(a){var s,r,q,p=null
try{if(C.aJ===$.aG){a.$0()
-return}P.cnH(p,p,this,a)}catch(q){s=H.J(q)
+return}P.cnf(p,p,this,a)}catch(q){s=H.K(q)
r=H.c7(q)
-P.aKb(p,p,this,s,r)}},
+P.aKe(p,p,this,s,r)}},
w8:function(a,b){var s,r,q,p=null
try{if(C.aJ===$.aG){a.$1(b)
-return}P.cnJ(p,p,this,a,b)}catch(q){s=H.J(q)
+return}P.cnh(p,p,this,a,b)}catch(q){s=H.K(q)
r=H.c7(q)
-P.aKb(p,p,this,s,r)}},
-acO:function(a,b,c){var s,r,q,p=null
+P.aKe(p,p,this,s,r)}},
+acS:function(a,b,c){var s,r,q,p=null
try{if(C.aJ===$.aG){a.$2(b,c)
-return}P.cnI(p,p,this,a,b,c)}catch(q){s=H.J(q)
+return}P.cng(p,p,this,a,b,c)}catch(q){s=H.K(q)
r=H.c7(q)
-P.aKb(p,p,this,s,r)}},
-QN:function(a,b){return new P.c1D(this,a,b)},
-H1:function(a){return new P.c1C(this,a)},
-QO:function(a,b){return new P.c1E(this,a,b)},
+P.aKe(p,p,this,s,r)}},
+QM:function(a,b){return new P.c1l(this,a,b)},
+H1:function(a){return new P.c1k(this,a)},
+QN:function(a,b){return new P.c1m(this,a,b)},
i:function(a,b){return null},
-qZ:function(a,b){P.aKb(null,null,this,a,b)},
-In:function(a,b){return P.cZQ(null,null,this,a,b)},
-a8Z:function(a){return this.In(a,null)},
+qZ:function(a,b){P.aKe(null,null,this,a,b)},
+In:function(a,b){return P.cZg(null,null,this,a,b)},
+a92:function(a){return this.In(a,null)},
w7:function(a){if($.aG===C.aJ)return a.$0()
-return P.cnH(null,null,this,a)},
+return P.cnf(null,null,this,a)},
tY:function(a,b){if($.aG===C.aJ)return a.$1(b)
-return P.cnJ(null,null,this,a,b)},
+return P.cnh(null,null,this,a,b)},
K3:function(a,b,c){if($.aG===C.aJ)return a.$2(b,c)
-return P.cnI(null,null,this,a,b,c)},
-oU:function(a){return a},
+return P.cng(null,null,this,a,b,c)},
+oV:function(a){return a},
tT:function(a){return a},
JP:function(a){return a},
tw:function(a,b){return null},
-rA:function(a){P.cnK(null,null,this,a)},
-Rz:function(a,b){return P.cOc(a,b)},
-Rv:function(a,b){return P.cW2(a,b)},
-abT:function(a,b){H.aKq(H.f(b))}}
-P.c1D.prototype={
+rA:function(a){P.cni(null,null,this,a)},
+Ry:function(a,b){return P.cNA(a,b)},
+Ru:function(a,b){return P.cVt(a,b)},
+abX:function(a,b){H.aKt(H.f(b))}}
+P.c1l.prototype={
$0:function(){return this.a.w7(this.b,this.c)},
$S:function(){return this.c.h("0()")}}
-P.c1C.prototype={
+P.c1k.prototype={
$0:function(){return this.a.tX(this.b)},
$C:"$0",
$R:0,
$S:1}
-P.c1E.prototype={
+P.c1m.prototype={
$1:function(a){return this.a.w8(this.b,a,this.c)},
$S:function(){return this.c.h("~(0)")}}
-P.cJM.prototype={
+P.cJa.prototype={
$2:function(a,b){return this.a.$1(a)},
$C:"$2",
$R:2,
-$S:111}
-P.cJL.prototype={
+$S:115}
+P.cJ9.prototype={
$5:function(a,b,c,d,e){var s,r,q,p
-try{this.a.K3(this.b,d,e,t.n,t.K,t.Km)}catch(q){s=H.J(q)
+try{this.a.K3(this.b,d,e,t.n,t.K,t.Km)}catch(q){s=H.K(q)
r=H.c7(q)
p=s
-if(p==null?d==null:p===d)b.a9c(c,d,e)
-else b.a9c(c,s,r)}},
-$S:474}
-P.yr.prototype={
+if(p==null?d==null:p===d)b.a9g(c,d,e)
+else b.a9g(c,s,r)}},
+$S:482}
+P.yq.prototype={
gH:function(a){return this.a},
gag:function(a){return this.a===0},
gca:function(a){return this.a!==0},
-gah:function(a){return new P.ys(this,H.F(this).h("ys<1>"))},
+gah:function(a){return new P.yr(this,H.F(this).h("yr<1>"))},
gdY:function(a){var s=H.F(this)
-return H.lX(new P.ys(this,s.h("ys<1>")),new P.bRo(this),s.c,s.Q[1])},
-aP:function(a,b){var s,r
+return H.lY(new P.yr(this,s.h("yr<1>")),new P.bR6(this),s.c,s.Q[1])},
+aN:function(a,b){var s,r
if(typeof b=="string"&&b!=="__proto__"){s=this.b
return s==null?!1:s[b]!=null}else if(typeof b=="number"&&(b&1073741823)===b){r=this.c
-return r==null?!1:r[b]!=null}else return this.a_4(b)},
-a_4:function(a){var s=this.d
+return r==null?!1:r[b]!=null}else return this.a_3(b)},
+a_3:function(a){var s=this.d
if(s==null)return!1
-return this.m8(this.a0p(s,a),a)>=0},
-V:function(a,b){J.cc(b,new P.bRn(this))},
+return this.m8(this.a0o(s,a),a)>=0},
+V:function(a,b){J.ci(b,new P.bR5(this))},
i:function(a,b){var s,r,q
if(typeof b=="string"&&b!=="__proto__"){s=this.b
-r=s==null?null:P.cOC(s,b)
+r=s==null?null:P.cO_(s,b)
return r}else if(typeof b=="number"&&(b&1073741823)===b){q=this.c
-r=q==null?null:P.cOC(q,b)
-return r}else return this.a0m(0,b)},
-a0m:function(a,b){var s,r,q=this.d
+r=q==null?null:P.cO_(q,b)
+return r}else return this.a0l(0,b)},
+a0l:function(a,b){var s,r,q=this.d
if(q==null)return null
-s=this.a0p(q,b)
+s=this.a0o(q,b)
r=this.m8(s,b)
return r<0?null:s[r+1]},
E:function(a,b,c){var s,r,q=this
if(typeof b=="string"&&b!=="__proto__"){s=q.b
-q.ZM(s==null?q.b=P.cOD():s,b,c)}else if(typeof b=="number"&&(b&1073741823)===b){r=q.c
-q.ZM(r==null?q.c=P.cOD():r,b,c)}else q.a3T(b,c)},
-a3T:function(a,b){var s,r,q,p=this,o=p.d
-if(o==null)o=p.d=P.cOD()
+q.ZL(s==null?q.b=P.cO0():s,b,c)}else if(typeof b=="number"&&(b&1073741823)===b){r=q.c
+q.ZL(r==null?q.c=P.cO0():r,b,c)}else q.a3W(b,c)},
+a3W:function(a,b){var s,r,q,p=this,o=p.d
+if(o==null)o=p.d=P.cO0()
s=p.mA(a)
r=o[s]
-if(r==null){P.cOE(o,s,[a,b]);++p.a
+if(r==null){P.cO1(o,s,[a,b]);++p.a
p.e=null}else{q=p.m8(r,a)
if(q>=0)r[q+1]=b
else{r.push(a,b);++p.a
p.e=null}}},
-eH:function(a,b,c){var s
-if(this.aP(0,b))return this.i(0,b)
+eE:function(a,b,c){var s
+if(this.aN(0,b))return this.i(0,b)
s=c.$0()
this.E(0,b,s)
return s},
-P:function(a,b){var s=this
+O:function(a,b){var s=this
if(typeof b=="string"&&b!=="__proto__")return s.rR(s.b,b)
else if(typeof b=="number"&&(b&1073741823)===b)return s.rR(s.c,b)
else return s.ph(0,b)},
@@ -61987,7 +61903,7 @@ s.a=0}},
L:function(a,b){var s,r,q,p=this,o=p.MM()
for(s=o.length,r=0;r"))},
-I:function(a,b){return this.a.aP(0,b)},
+gaJ:function(a){var s=this.a
+return new P.aCT(s,s.MM(),this.$ti.h("aCT<1>"))},
+I:function(a,b){return this.a.aN(0,b)},
L:function(a,b){var s,r,q=this.a,p=q.MM()
for(s=p.length,r=0;r=r.length){s.d=null
return!1}else{s.d=r[q]
s.c=q+1
return!0}}}
-P.aa3.prototype={
-yI:function(a){return H.OS(a)&1073741823},
-yJ:function(a,b){var s,r,q
+P.aa7.prototype={
+yG:function(a){return H.OW(a)&1073741823},
+yH:function(a,b){var s,r,q
if(a==null)return-1
s=a.length
for(r=0;r"))},
-gaH:function(a){return new P.nf(this,this.wP(),H.F(this).h("nf<1>"))},
+AR:function(){return new P.Et(H.F(this).h("Et<1>"))},
+gaJ:function(a){return new P.ne(this,this.wO(),H.F(this).h("ne<1>"))},
gH:function(a){return this.a},
gag:function(a){return this.a===0},
gca:function(a){return this.a!==0},
I:function(a,b){var s,r
if(typeof b=="string"&&b!=="__proto__"){s=this.b
return s==null?!1:s[b]!=null}else if(typeof b=="number"&&(b&1073741823)===b){r=this.c
-return r==null?!1:r[b]!=null}else return this.MS(b)},
-MS:function(a){var s=this.d
+return r==null?!1:r[b]!=null}else return this.MR(b)},
+MR:function(a){var s=this.d
if(s==null)return!1
return this.m8(s[this.mA(a)],a)>=0},
F:function(a,b){var s,r,q=this
if(typeof b=="string"&&b!=="__proto__"){s=q.b
-return q.Ak(s==null?q.b=P.cOF():s,b)}else if(typeof b=="number"&&(b&1073741823)===b){r=q.c
-return q.Ak(r==null?q.c=P.cOF():r,b)}else return q.mz(0,b)},
+return q.Ai(s==null?q.b=P.cO2():s,b)}else if(typeof b=="number"&&(b&1073741823)===b){r=q.c
+return q.Ai(r==null?q.c=P.cO2():r,b)}else return q.mz(0,b)},
mz:function(a,b){var s,r,q=this,p=q.d
-if(p==null)p=q.d=P.cOF()
+if(p==null)p=q.d=P.cO2()
s=q.mA(b)
r=p[s]
if(r==null)p[s]=[b]
@@ -62116,8 +62032,8 @@ r.push(b)}++q.a
q.e=null
return!0},
V:function(a,b){var s
-for(s=J.a3(b);s.t();)this.F(0,s.gC(s))},
-P:function(a,b){var s=this
+for(s=J.a2(b);s.t();)this.F(0,s.gC(s))},
+O:function(a,b){var s=this
if(typeof b=="string"&&b!=="__proto__")return s.rR(s.b,b)
else if(typeof b=="number"&&(b&1073741823)===b)return s.rR(s.c,b)
else return s.ph(0,b)},
@@ -62134,7 +62050,7 @@ return!0},
cq:function(a){var s=this
if(s.a>0){s.b=s.c=s.d=s.e=null
s.a=0}},
-wP:function(){var s,r,q,p,o,n,m,l,k,j,i=this,h=i.e
+wO:function(){var s,r,q,p,o,n,m,l,k,j,i=this,h=i.e
if(h!=null)return h
h=P.d6(i.a,null,!1,t.z)
s=i.b
@@ -62150,7 +62066,7 @@ q=r.length
for(o=0;o=r.length){s.d=null
return!1}else{s.d=r[q]
s.c=q+1
return!0}}}
-P.q7.prototype={
-AT:function(){return new P.q7(H.F(this).h("q7<1>"))},
-gaH:function(a){var s=this,r=new P.Ey(s,s.r,H.F(s).h("Ey<1>"))
+P.q5.prototype={
+AR:function(){return new P.q5(H.F(this).h("q5<1>"))},
+gaJ:function(a){var s=this,r=new P.Ey(s,s.r,H.F(s).h("Ey<1>"))
r.c=s.e
return r},
gH:function(a){return this.a},
@@ -62184,15 +62100,15 @@ if(typeof b=="string"&&b!=="__proto__"){s=this.b
if(s==null)return!1
return s[b]!=null}else if(typeof b=="number"&&(b&1073741823)===b){r=this.c
if(r==null)return!1
-return r[b]!=null}else return this.MS(b)},
-MS:function(a){var s=this.d
+return r[b]!=null}else return this.MR(b)},
+MR:function(a){var s=this.d
if(s==null)return!1
return this.m8(s[this.mA(a)],a)>=0},
L:function(a,b){var s=this,r=s.e,q=s.r
for(;r!=null;){b.$1(r.a)
-if(q!==s.r)throw H.d(P.dU(s))
+if(q!==s.r)throw H.d(P.dV(s))
r=r.b}},
-ga5:function(a){var s=this.e
+ga4:function(a){var s=this.e
if(s==null)throw H.d(P.bg("No elements"))
return s.a},
gaS:function(a){var s=this.f
@@ -62200,16 +62116,16 @@ if(s==null)throw H.d(P.bg("No elements"))
return s.a},
F:function(a,b){var s,r,q=this
if(typeof b=="string"&&b!=="__proto__"){s=q.b
-return q.Ak(s==null?q.b=P.cOG():s,b)}else if(typeof b=="number"&&(b&1073741823)===b){r=q.c
-return q.Ak(r==null?q.c=P.cOG():r,b)}else return q.mz(0,b)},
+return q.Ai(s==null?q.b=P.cO3():s,b)}else if(typeof b=="number"&&(b&1073741823)===b){r=q.c
+return q.Ai(r==null?q.c=P.cO3():r,b)}else return q.mz(0,b)},
mz:function(a,b){var s,r,q=this,p=q.d
-if(p==null)p=q.d=P.cOG()
+if(p==null)p=q.d=P.cO3()
s=q.mA(b)
r=p[s]
if(r==null)p[s]=[q.MO(b)]
else{if(q.m8(r,b)>=0)return!1
r.push(q.MO(b))}return!0},
-P:function(a,b){var s=this
+O:function(a,b){var s=this
if(typeof b=="string"&&b!=="__proto__")return s.rR(s.b,b)
else if(typeof b=="number"&&(b&1073741823)===b)return s.rR(s.c,b)
else return s.ph(0,b)},
@@ -62221,32 +62137,32 @@ q=o.m8(r,b)
if(q<0)return!1
p=r.splice(q,1)[0]
if(0===r.length)delete n[s]
-o.ZP(p)
+o.ZO(p)
return!0},
-l_:function(a,b){this.Nv(b,!0)},
-Nv:function(a,b){var s,r,q,p,o=this,n=o.e
+kZ:function(a,b){this.Nu(b,!0)},
+Nu:function(a,b){var s,r,q,p,o=this,n=o.e
for(;n!=null;n=r){s=n.a
r=n.b
q=o.r
p=a.$1(s)
-if(q!==o.r)throw H.d(P.dU(o))
-if(!0===p)o.P(0,s)}},
+if(q!==o.r)throw H.d(P.dV(o))
+if(!0===p)o.O(0,s)}},
cq:function(a){var s=this
if(s.a>0){s.b=s.c=s.d=s.e=s.f=null
s.a=0
s.MN()}},
-Ak:function(a,b){if(a[b]!=null)return!1
+Ai:function(a,b){if(a[b]!=null)return!1
a[b]=this.MO(b)
return!0},
rR:function(a,b){var s
if(a==null)return!1
s=a[b]
if(s==null)return!1
-this.ZP(s)
+this.ZO(s)
delete a[b]
return!0},
MN:function(){this.r=1073741823&this.r+1},
-MO:function(a){var s,r=this,q=new P.bVo(a)
+MO:function(a){var s,r=this,q=new P.bV6(a)
if(r.e==null)r.e=r.f=q
else{s=r.f
s.toString
@@ -62254,7 +62170,7 @@ q.c=s
r.f=s.b=q}++r.a
r.MN()
return q},
-ZP:function(a){var s=this,r=a.c,q=a.b
+ZO:function(a){var s=this,r=a.c,q=a.b
if(r==null)s.e=q
else r.b=q
if(q==null)s.f=r
@@ -62266,71 +62182,71 @@ if(a==null)return-1
s=a.length
for(r=0;r"))},
-gH:function(a){return J.bX(this.a)},
-i:function(a,b){return J.vx(this.a,b)}}
-P.b4M.prototype={
+P.Nn.prototype={
+v9:function(a,b){return new P.Nn(J.vx(this.a,b),b.h("Nn<0>"))},
+gH:function(a){return J.bY(this.a)},
+i:function(a,b){return J.vy(this.a,b)}}
+P.b4C.prototype={
$2:function(a,b){this.a.E(0,this.b.a(a),this.c.a(b))},
-$S:72}
-P.a0Q.prototype={
-ep:function(a,b,c){return H.lX(this,b,this.$ti.c,c)},
-cQ:function(a,b){return this.ep(a,b,t.z)},
-iM:function(a,b){return new H.ay(this,b,this.$ti.h("ay<1>"))},
+$S:74}
+P.a0S.prototype={
+eq:function(a,b,c){return H.lY(this,b,this.$ti.c,c)},
+cQ:function(a,b){return this.eq(a,b,t.z)},
+ip:function(a,b){return new H.az(this,b,this.$ti.h("az<1>"))},
I:function(a,b){var s
-for(s=this.$ti,s=P.vj(this,s.c,s.h("ii<1>"));s.t();)if(J.j(s.gC(s),b))return!0
+for(s=this.$ti,s=P.vk(this,s.c,s.h("ih<1>"));s.t();)if(J.j(s.gC(s),b))return!0
return!1},
L:function(a,b){var s
-for(s=this.$ti,s=P.vj(this,s.c,s.h("ii<1>"));s.t();)b.$1(s.gC(s))},
-dl:function(a,b){var s=this.$ti,r=P.vj(this,s.c,s.h("ii<1>"))
+for(s=this.$ti,s=P.vk(this,s.c,s.h("ih<1>"));s.t();)b.$1(s.gC(s))},
+dl:function(a,b){var s=this.$ti,r=P.vk(this,s.c,s.h("ih<1>"))
if(!r.t())return""
if(b===""){s=""
do s+=H.f(r.gC(r))
while(r.t())}else{s=H.f(r.gC(r))
for(;r.t();)s=s+b+H.f(r.gC(r))}return s.charCodeAt(0)==0?s:s},
fX:function(a,b){return P.v(this,!0,this.$ti.c)},
-eN:function(a){return this.fX(a,!0)},
-jJ:function(a){return P.hu(this,this.$ti.c)},
-gH:function(a){var s,r=this.$ti,q=P.vj(this,r.c,r.h("ii<1>"))
+eL:function(a){return this.fX(a,!0)},
+jH:function(a){return P.ht(this,this.$ti.c)},
+gH:function(a){var s,r=this.$ti,q=P.vk(this,r.c,r.h("ih<1>"))
for(s=0;q.t();)++s
return s},
gag:function(a){var s=this.$ti
-return!P.vj(this,s.c,s.h("ii<1>")).t()},
+return!P.vk(this,s.c,s.h("ih<1>")).t()},
gca:function(a){return this.d!=null},
-l2:function(a,b){return H.bwU(this,b,this.$ti.c)},
-jP:function(a,b){return H.aua(this,b,this.$ti.c)},
-ga5:function(a){var s=this.$ti,r=P.vj(this,s.c,s.h("ii<1>"))
-if(!r.t())throw H.d(H.f5())
+l1:function(a,b){return H.bwL(this,b,this.$ti.c)},
+jN:function(a,b){return H.aud(this,b,this.$ti.c)},
+ga4:function(a){var s=this.$ti,r=P.vk(this,s.c,s.h("ih<1>"))
+if(!r.t())throw H.d(H.f7())
return r.gC(r)},
-gaS:function(a){var s,r=this.$ti,q=P.vj(this,r.c,r.h("ii<1>"))
-if(!q.t())throw H.d(H.f5())
+gaS:function(a){var s,r=this.$ti,q=P.vk(this,r.c,r.h("ih<1>"))
+if(!q.t())throw H.d(H.f7())
do s=q.gC(q)
while(q.t())
return s},
dr:function(a,b){var s,r,q,p="index"
-P.eB(b,p)
-P.iw(b,p)
-for(s=this.$ti,s=P.vj(this,s.c,s.h("ii<1>")),r=0;s.t();){q=s.gC(s)
+P.ez(b,p)
+P.iv(b,p)
+for(s=this.$ti,s=P.vk(this,s.c,s.h("ih<1>")),r=0;s.t();){q=s.gC(s)
if(b===r)return q;++r}throw H.d(P.fv(b,this,p,null,r))},
-j:function(a){return P.cNe(this,"(",")")}}
-P.a0N.prototype={}
-P.bcZ.prototype={
+j:function(a){return P.cMC(this,"(",")")}}
+P.a0P.prototype={}
+P.bcL.prototype={
$2:function(a,b){this.a.E(0,this.b.a(a),this.c.a(b))},
-$S:72}
+$S:74}
P.d5.prototype={
-gaH:function(a){var s=this
-return new P.Xl(s,s.a,s.c,s.$ti.h("Xl<1>"))},
+gaJ:function(a){var s=this
+return new P.Xo(s,s.a,s.c,s.$ti.h("Xo<1>"))},
gH:function(a){return this.b},
-ga5:function(a){var s
+ga4:function(a){var s
if(this.b===0)throw H.d(P.bg("No such element"))
s=this.c
s.toString
@@ -62346,13 +62262,13 @@ s=q.c
s.toString
r=s
do{b.$1(r)
-if(p!==q.a)throw H.d(P.dU(q))
+if(p!==q.a)throw H.d(P.dV(q))
s=r.b
s.toString
if(s!==q.c){r=s
continue}else break}while(!0)},
gag:function(a){return this.b===0},
-d5:function(a,b,c){var s,r,q=this
+d3:function(a,b,c){var s,r,q=this
if(b.a!=null)throw H.d(P.bg("LinkedListEntry is already in a LinkedList"));++q.a
b.a=q
s=q.b
@@ -62365,12 +62281,12 @@ b.c=r
b.b=a
a.c=r.b=b
q.b=s+1}}
-P.Xl.prototype={
+P.Xo.prototype={
gC:function(a){var s=this.c
return s},
t:function(){var s=this,r=s.a
-if(s.b!==r.a)throw H.d(P.dU(s))
-if(r.b!==0)r=s.e&&s.d==r.ga5(r)
+if(s.b!==r.a)throw H.d(P.dV(s))
+if(r.b!==0)r=s.e&&s.d==r.ga4(r)
else r=!0
if(r){s.c=null
return!1}s.e=!0
@@ -62378,131 +62294,131 @@ r=s.d
s.c=r
s.d=r.b
return!0}}
-P.S2.prototype={}
-P.a1f.prototype={$ibf:1,$iP:1,$iD:1}
+P.S6.prototype={}
+P.a1h.prototype={$ibf:1,$iP:1,$iD:1}
P.b3.prototype={
-gaH:function(a){return new H.cZ(a,this.gH(a),H.c2(a).h("cZ"))},
+gaJ:function(a){return new H.d_(a,this.gH(a),H.c2(a).h("d_"))},
dr:function(a,b){return this.i(a,b)},
L:function(a,b){var s,r=this.gH(a)
for(s=0;s=0;--s){r=this.i(a,s)
if(b.$1(r))return r
-if(q!==this.gH(a))throw H.d(P.dU(a))}if(c!=null)return c.$0()
-throw H.d(H.f5())},
+if(q!==this.gH(a))throw H.d(P.dV(a))}if(c!=null)return c.$0()
+throw H.d(H.f7())},
dl:function(a,b){var s
if(this.gH(a)===0)return""
-s=P.auM("",a,b)
+s=P.auP("",a,b)
return s.charCodeAt(0)==0?s:s},
-iM:function(a,b){return new H.ay(a,b,H.c2(a).h("ay"))},
-ep:function(a,b,c){return new H.A(a,b,H.c2(a).h("@").a7(c).h("A<1,2>"))},
-cQ:function(a,b){return this.ep(a,b,t.z)},
-lT:function(a,b,c){var s,r,q=this.gH(a)
+ip:function(a,b){return new H.az(a,b,H.c2(a).h("az"))},
+eq:function(a,b,c){return new H.B(a,b,H.c2(a).h("@").a6(c).h("B<1,2>"))},
+cQ:function(a,b){return this.eq(a,b,t.z)},
+lS:function(a,b,c){var s,r,q=this.gH(a)
for(s=b,r=0;r")),o=q.gH(a)
+kZ:function(a,b){this.ZM(a,b,!1)},
+pX:function(a,b){this.ZM(a,b,!0)},
+ZM:function(a,b,c){var s,r,q=this,p=H.a([],H.c2(a).h("Z")),o=q.gH(a)
for(s=0;s").a7(b).h("eO<1,2>"))},
+v9:function(a,b){return new H.eO(a,H.c2(a).h("@").a6(b).h("eO<1,2>"))},
kq:function(a){var s,r=this
-if(r.gH(a)===0)throw H.d(H.f5())
+if(r.gH(a)===0)throw H.d(H.f7())
s=r.i(a,r.gH(a)-1)
r.sH(a,r.gH(a)-1)
return s},
-bY:function(a,b){H.cVG(a,b==null?P.dy1():b)},
-QG:function(a){return new H.os(a,H.c2(a).h("os"))},
-a8:function(a,b){var s,r=H.a([],H.c2(a).h("Y"))
-for(s=this.gaH(a);s.t();)r.push(s.gC(s))
-for(s=J.a3(b);s.t();)r.push(s.gC(s))
+bY:function(a,b){H.cV6(a,b==null?P.dxp():b)},
+QF:function(a){return new H.os(a,H.c2(a).h("os"))},
+a7:function(a,b){var s,r=H.a([],H.c2(a).h("Z"))
+for(s=this.gaJ(a);s.t();)r.push(s.gC(s))
+for(s=J.a2(b);s.t();)r.push(s.gC(s))
return r},
-f4:function(a,b,c){var s=this.gH(a)
+f5:function(a,b,c){var s=this.gH(a)
if(c==null)c=s
if(c==null)throw H.d("!")
P.k4(b,c,s)
-return P.v(this.DN(a,b,c),!0,H.c2(a).h("b3.E"))},
-kv:function(a,b){return this.f4(a,b,null)},
-DN:function(a,b,c){P.k4(b,c,this.gH(a))
-return H.ic(a,b,c,H.c2(a).h("b3.E"))},
-aKi:function(a,b,c,d){var s
+return P.v(this.DM(a,b,c),!0,H.c2(a).h("b3.E"))},
+kv:function(a,b){return this.f5(a,b,null)},
+DM:function(a,b,c){P.k4(b,c,this.gH(a))
+return H.ib(a,b,c,H.c2(a).h("b3.E"))},
+aKo:function(a,b,c,d){var s
P.k4(b,c,this.gH(a))
for(s=b;s").b(d)){r=e
-q=d}else{p=J.aeB(d,e)
+q=d}else{p=J.aeE(d,e)
q=p.fX(p,!1)
r=0}p=J.am(q)
-if(r+s>p.gH(q))throw H.d(H.cU4())
+if(r+s>p.gH(q))throw H.d(H.cTv())
if(r=0;--o)this.E(a,b+o,p.i(q,r+o))
else for(o=0;o"))},
-j:function(a){return P.a0O(a,"[","]")}}
-P.a1G.prototype={}
-P.bdP.prototype={
+j:function(a){return P.a0Q(a,"[","]")}}
+P.a1I.prototype={}
+P.bdB.prototype={
$2:function(a,b){var s,r=this.a
if(!r.a)this.b.a+=", "
r.a=!1
@@ -62510,60 +62426,60 @@ r=this.b
s=r.a+=H.f(a)
r.a=s+": "
r.a+=H.f(b)},
-$S:380}
-P.ce.prototype={
-os:function(a,b,c){var s=H.c2(a)
-return P.bdT(a,s.h("ce.K"),s.h("ce.V"),b,c)},
+$S:344}
+P.cc.prototype={
+ou:function(a,b,c){var s=H.c2(a)
+return P.bdF(a,s.h("cc.K"),s.h("cc.V"),b,c)},
L:function(a,b){var s,r
-for(s=J.a3(this.gah(a));s.t();){r=s.gC(s)
+for(s=J.a2(this.gah(a));s.t();){r=s.gC(s)
b.$2(r,this.i(a,r))}},
V:function(a,b){var s,r,q
-for(s=J.aK(b),r=J.a3(s.gah(b));r.t();){q=r.gC(r)
+for(s=J.aK(b),r=J.a2(s.gah(b));r.t();){q=r.gC(r)
this.E(a,q,s.i(b,q))}},
-eH:function(a,b,c){var s
-if(this.aP(a,b))return this.i(a,b)
+eE:function(a,b,c){var s
+if(this.aN(a,b))return this.i(a,b)
s=c.$0()
this.E(a,b,s)
return s},
-zj:function(a,b,c,d){var s,r=this
-if(r.aP(a,b)){s=c.$1(r.i(a,b))
+zh:function(a,b,c,d){var s,r=this
+if(r.aN(a,b)){s=c.$1(r.i(a,b))
r.E(a,b,s)
return s}if(d!=null){s=d.$0()
r.E(a,b,s)
-return s}throw H.d(P.hK(b,"key","Key not in map."))},
-gjX:function(a){return J.fj(this.gah(a),new P.bdS(a),H.c2(a).h("el"))},
-oL:function(a,b,c,d){var s,r,q,p=P.ab(c,d)
-for(s=J.a3(this.gah(a));s.t();){r=s.gC(s)
+return s}throw H.d(P.hJ(b,"key","Key not in map."))},
+gjV:function(a){return J.fd(this.gah(a),new P.bdE(a),H.c2(a).h("ek"))},
+oM:function(a,b,c,d){var s,r,q,p=P.ab(c,d)
+for(s=J.a2(this.gah(a));s.t();){r=s.gC(s)
q=b.$2(r,this.i(a,r))
p.E(0,q.a,q.b)}return p},
-cQ:function(a,b){return this.oL(a,b,t.z,t.z)},
-aFM:function(a,b){var s,r,q
+cQ:function(a,b){return this.oM(a,b,t.z,t.z)},
+aFS:function(a,b){var s,r,q
for(s=b.length,r=0;r").a7(s.h("ce.V")).h("aaa<1,2>"))},
-j:function(a){return P.anA(a)},
+return new P.aae(a,s.h("@").a6(s.h("cc.V")).h("aae<1,2>"))},
+j:function(a){return P.anD(a)},
$ibr:1}
-P.bdS.prototype={
+P.bdE.prototype={
$1:function(a){var s=this.a,r=H.c2(s)
-return new P.el(a,J.e(s,a),r.h("@").a7(r.h("ce.V")).h("el<1,2>"))},
-$S:function(){return H.c2(this.a).h("el(ce.K)")}}
-P.VZ.prototype={}
-P.aaa.prototype={
-gH:function(a){return J.bX(this.a)},
-gag:function(a){return J.eU(this.a)},
-gca:function(a){return J.kl(this.a)},
-ga5:function(a){var s=this.a,r=J.aK(s)
-return r.i(s,J.nm(r.gah(s)))},
+return new P.ek(a,J.e(s,a),r.h("@").a6(r.h("cc.V")).h("ek<1,2>"))},
+$S:function(){return H.c2(this.a).h("ek(cc.K)")}}
+P.W1.prototype={}
+P.aae.prototype={
+gH:function(a){return J.bY(this.a)},
+gag:function(a){return J.eV(this.a)},
+gca:function(a){return J.kQ(this.a)},
+ga4:function(a){var s=this.a,r=J.aK(s)
+return r.i(s,J.nl(r.gah(s)))},
gaS:function(a){var s=this.a,r=J.aK(s)
-return r.i(s,J.ER(r.gah(s)))},
-gaH:function(a){var s=this.a,r=this.$ti
-return new P.aDO(J.a3(J.yQ(s)),s,r.h("@<1>").a7(r.Q[1]).h("aDO<1,2>"))}}
-P.aDO.prototype={
+return r.i(s,J.ES(r.gah(s)))},
+gaJ:function(a){var s=this.a,r=this.$ti
+return new P.aDR(J.a2(J.yP(s)),s,r.h("@<1>").a6(r.Q[1]).h("aDR<1,2>"))}}
+P.aDR.prototype={
t:function(){var s=this,r=s.a
if(r.t()){s.c=J.e(s.b,r.gC(r))
return!0}s.c=null
@@ -62574,148 +62490,148 @@ P.EI.prototype={
E:function(a,b,c){throw H.d(P.z("Cannot modify unmodifiable map"))},
V:function(a,b){throw H.d(P.z("Cannot modify unmodifiable map"))},
cq:function(a){throw H.d(P.z("Cannot modify unmodifiable map"))},
-P:function(a,b){throw H.d(P.z("Cannot modify unmodifiable map"))},
-eH:function(a,b,c){throw H.d(P.z("Cannot modify unmodifiable map"))}}
-P.Sl.prototype={
-os:function(a,b,c){return J.Yp(this.a,b,c)},
+O:function(a,b){throw H.d(P.z("Cannot modify unmodifiable map"))},
+eE:function(a,b,c){throw H.d(P.z("Cannot modify unmodifiable map"))}}
+P.Sp.prototype={
+ou:function(a,b,c){return J.Yr(this.a,b,c)},
i:function(a,b){return J.e(this.a,b)},
E:function(a,b,c){J.c0(this.a,b,c)},
-V:function(a,b){J.aey(this.a,b)},
-cq:function(a){J.aKS(this.a)},
-eH:function(a,b,c){return J.Yr(this.a,b,c)},
-aP:function(a,b){return J.dZ(this.a,b)},
-L:function(a,b){J.cc(this.a,b)},
-gag:function(a){return J.eU(this.a)},
-gca:function(a){return J.kl(this.a)},
-gH:function(a){return J.bX(this.a)},
-gah:function(a){return J.yQ(this.a)},
-P:function(a,b){return J.km(this.a,b)},
+V:function(a,b){J.aeB(this.a,b)},
+cq:function(a){J.aKV(this.a)},
+eE:function(a,b,c){return J.Yt(this.a,b,c)},
+aN:function(a,b){return J.e_(this.a,b)},
+L:function(a,b){J.ci(this.a,b)},
+gag:function(a){return J.eV(this.a)},
+gca:function(a){return J.kQ(this.a)},
+gH:function(a){return J.bY(this.a)},
+gah:function(a){return J.yP(this.a)},
+O:function(a,b){return J.kn(this.a,b)},
j:function(a){return J.aD(this.a)},
-gdY:function(a){return J.cS2(this.a)},
-gjX:function(a){return J.aKV(this.a)},
-oL:function(a,b,c,d){return J.cM9(this.a,b,c,d)},
-cQ:function(a,b){return this.oL(a,b,t.z,t.z)},
+gdY:function(a){return J.cRs(this.a)},
+gjV:function(a){return J.aKY(this.a)},
+oM:function(a,b,c,d){return J.cLx(this.a,b,c,d)},
+cQ:function(a,b){return this.oM(a,b,t.z,t.z)},
$ibr:1}
P.rP.prototype={
-os:function(a,b,c){return new P.rP(J.Yp(this.a,b,c),b.h("@<0>").a7(c).h("rP<1,2>"))}}
+ou:function(a,b,c){return new P.rP(J.Yr(this.a,b,c),b.h("@<0>").a6(c).h("rP<1,2>"))}}
P.ta.prototype={
-ayk:function(a,b){var s=this
+ayo:function(a,b){var s=this
s.b=b
s.a=a
if(a!=null)a.b=H.F(s).h("ta.0").a(s)
if(b!=null)b.a=H.F(s).h("ta.0").a(s)},
-PR:function(){var s,r=this,q=r.a
+PQ:function(){var s,r=this,q=r.a
if(q!=null)q.b=r.b
s=r.b
if(s!=null)s.a=q
r.a=r.b=null}}
-P.mD.prototype={
-h7:function(a){this.PR()
+P.mC.prototype={
+h7:function(a){this.PQ()
return this.gus()}}
-P.yq.prototype={
+P.yp.prototype={
gus:function(){return this.c},
-aNz:function(){return H.F(this).h("yq<1>").a(this.b).Z1()}}
-P.a8P.prototype={
-a31:function(a){this.f=null
-this.PR()
+aNF:function(){return H.F(this).h("yp<1>").a(this.b).Z0()}}
+P.a8S.prototype={
+a34:function(a){this.f=null
+this.PQ()
return this.gus()},
h7:function(a){var s=this,r=s.f
if(r!=null)--r.c
s.f=null
-s.PR()
+s.PQ()
return s.gus()},
-Z1:function(){return this}}
-P.Oh.prototype={
-Z1:function(){return null},
-a31:function(a){throw H.d(H.f5())},
-gus:function(){throw H.d(H.f5())}}
-P.a_o.prototype={
+Z0:function(){return this}}
+P.Ok.prototype={
+Z0:function(){return null},
+a34:function(a){throw H.d(H.f7())},
+gus:function(){throw H.d(H.f7())}}
+P.a_q.prototype={
guU:function(){var s,r=this
-if(!r.b){s=new P.Oh(r,null,r.$ti.h("Oh<1>"))
+if(!r.b){s=new P.Ok(r,null,r.$ti.h("Ok<1>"))
s.a=s
r.a=s.b=s
r.b=!0}return r.a},
gH:function(a){return this.c},
-Qr:function(a){var s=this.guU()
-new P.a8P(s.f,a,H.F(s).h("a8P<1>")).ayk(s,s.b);++this.c},
-ga5:function(a){return this.guU().b.gus()},
+Qq:function(a){var s=this.guU()
+new P.a8S(s.f,a,H.F(s).h("a8S<1>")).ayo(s,s.b);++this.c},
+ga4:function(a){return this.guU().b.gus()},
gaS:function(a){return this.guU().a.gus()},
gag:function(a){return this.guU().b==this.guU()},
-gaH:function(a){var s=this.guU()
-return new P.aBP(s,s.b,this.$ti.h("aBP<1>"))},
-j:function(a){return P.a0O(this,"{","}")},
+gaJ:function(a){var s=this.guU()
+return new P.aBS(s,s.b,this.$ti.h("aBS<1>"))},
+j:function(a){return P.a0Q(this,"{","}")},
$ibf:1}
-P.aBP.prototype={
+P.aBS.prototype={
t:function(){var s=this,r=s.b,q=s.a
if(r==q){s.a=s.b=s.c=null
-return!1}s.$ti.h("yq<1>").a(r)
+return!1}s.$ti.h("yp<1>").a(r)
q=q.f
-if(q!=r.f)throw H.d(P.dU(q))
+if(q!=r.f)throw H.d(P.dV(q))
s.c=r.gus()
s.b=r.b
return!0},
gC:function(a){var s=this.c
return s}}
-P.a1h.prototype={
-gaH:function(a){var s=this
-return new P.aDI(s,s.c,s.d,s.b,s.$ti.h("aDI<1>"))},
+P.a1j.prototype={
+gaJ:function(a){var s=this
+return new P.aDL(s,s.c,s.d,s.b,s.$ti.h("aDL<1>"))},
L:function(a,b){var s,r=this,q=r.d
for(s=r.b;s!==r.c;s=(s+1&r.a.length-1)>>>0){b.$1(r.a[s])
-if(q!==r.d)H.b(P.dU(r))}},
+if(q!==r.d)H.b(P.dV(r))}},
gag:function(a){return this.b===this.c},
gH:function(a){return(this.c-this.b&this.a.length-1)>>>0},
-ga5:function(a){var s=this.b
-if(s===this.c)throw H.d(H.f5())
+ga4:function(a){var s=this.b
+if(s===this.c)throw H.d(H.f7())
return this.a[s]},
gaS:function(a){var s=this.b,r=this.c
-if(s===r)throw H.d(H.f5())
+if(s===r)throw H.d(H.f7())
s=this.a
return s[(r-1&s.length-1)>>>0]},
dr:function(a,b){var s
-P.cNT(b,this,null,null)
+P.cNg(b,this,null,null)
s=this.a
return s[(this.b+b&s.length-1)>>>0]},
fX:function(a,b){var s,r,q,p,o=this,n=o.a.length-1,m=(o.c-o.b&n)>>>0
if(m===0){s=o.$ti.c
-return b?J.RQ(0,s):J.a0R(0,s)}r=P.d6(m,o.ga5(o),b,o.$ti.c)
+return b?J.RU(0,s):J.a0T(0,s)}r=P.d6(m,o.ga4(o),b,o.$ti.c)
for(s=o.a,q=o.b,p=0;p>>0]
return r},
-eN:function(a){return this.fX(a,!0)},
+eL:function(a){return this.fX(a,!0)},
V:function(a,b){var s,r,q,p,o,n,m,l,k=this,j=k.$ti
if(j.h("D<1>").b(b)){s=b.length
r=k.gH(k)
q=r+s
p=k.a
o=p.length
-if(q>=o){n=P.d6(P.cUk(q+(q>>>1)),null,!1,j.h("1?"))
-k.c=k.aFE(n)
+if(q>=o){n=P.d6(P.cTL(q+(q>>>1)),null,!1,j.h("1?"))
+k.c=k.aFK(n)
k.a=n
k.b=0
-C.b.dS(n,r,q,b,0)
+C.b.dT(n,r,q,b,0)
k.c+=s}else{j=k.c
m=o-j
-if(s>>0)s[p]=null
q.b=q.c=0;++q.d}},
-j:function(a){return P.a0O(this,"{","}")},
-Qr:function(a){var s=this,r=s.b,q=s.a
+j:function(a){return P.a0Q(this,"{","}")},
+Qq:function(a){var s=this,r=s.b,q=s.a
r=s.b=(r-1&q.length-1)>>>0
q[r]=a
-if(r===s.c)s.ZO();++s.d},
+if(r===s.c)s.ZN();++s.d},
w2:function(){var s,r,q=this,p=q.b
-if(p===q.c)throw H.d(H.f5());++q.d
+if(p===q.c)throw H.d(H.f7());++q.d
s=q.a
r=s[p]
s[p]=null
q.b=(p+1&s.length-1)>>>0
return r},
kq:function(a){var s,r=this,q=r.b,p=r.c
-if(q===p)throw H.d(H.f5());++r.d
+if(q===p)throw H.d(H.f7());++r.d
q=r.a
p=r.c=(p-1&q.length-1)>>>0
s=q[p]
@@ -62725,116 +62641,116 @@ mz:function(a,b){var s=this,r=s.a,q=s.c
r[q]=b
r=(q+1&r.length-1)>>>0
s.c=r
-if(s.b===r)s.ZO();++s.d},
-ZO:function(){var s=this,r=P.d6(s.a.length*2,null,!1,s.$ti.h("1?")),q=s.a,p=s.b,o=q.length-p
-C.b.dS(r,0,o,q,p)
-C.b.dS(r,o,o+s.b,s.a,0)
+if(s.b===r)s.ZN();++s.d},
+ZN:function(){var s=this,r=P.d6(s.a.length*2,null,!1,s.$ti.h("1?")),q=s.a,p=s.b,o=q.length-p
+C.b.dT(r,0,o,q,p)
+C.b.dT(r,o,o+s.b,s.a,0)
s.b=0
s.c=s.a.length
s.a=r},
-aFE:function(a){var s,r,q=this,p=q.b,o=q.c,n=q.a
+aFK:function(a){var s,r,q=this,p=q.b,o=q.c,n=q.a
if(p<=o){s=o-p
-C.b.dS(a,0,s,n,p)
+C.b.dT(a,0,s,n,p)
return s}else{r=n.length-p
-C.b.dS(a,0,r,n,p)
-C.b.dS(a,r,r+q.c,q.a,0)
+C.b.dT(a,0,r,n,p)
+C.b.dT(a,r,r+q.c,q.a,0)
return q.c+r}}}
-P.aDI.prototype={
+P.aDL.prototype={
gC:function(a){var s=this.e
return s},
t:function(){var s,r=this,q=r.a
-if(r.c!==q.d)H.b(P.dU(q))
+if(r.c!==q.d)H.b(P.dV(q))
s=r.d
if(s===r.b){r.e=null
return!1}q=q.a
r.e=q[s]
r.d=(s+1&q.length-1)>>>0
return!0}}
-P.dX.prototype={
+P.dY.prototype={
gag:function(a){return this.gH(this)===0},
gca:function(a){return this.gH(this)!==0},
V:function(a,b){var s
-for(s=J.a3(b);s.t();)this.F(0,s.gC(s))},
+for(s=J.a2(b);s.t();)this.F(0,s.gC(s))},
JR:function(a){var s,r
-for(s=a.length,r=0;r").a7(c).h("og<1,2>"))},
-cQ:function(a,b){return this.ep(a,b,t.z)},
-j:function(a){return P.a0O(this,"{","}")},
-iM:function(a,b){return new H.ay(this,b,H.F(this).h("ay"))},
+Co:function(a,b){var s,r,q=this.jH(0)
+for(s=this.gaJ(this);s.t();){r=s.gC(s)
+if(!b.I(0,r))q.O(0,r)}return q},
+fX:function(a,b){return P.v(this,b,H.F(this).h("dY.E"))},
+eL:function(a){return this.fX(a,!0)},
+eq:function(a,b,c){return new H.og(this,b,H.F(this).h("@").a6(c).h("og<1,2>"))},
+cQ:function(a,b){return this.eq(a,b,t.z)},
+j:function(a){return P.a0Q(this,"{","}")},
+ip:function(a,b){return new H.az(this,b,H.F(this).h("az"))},
L:function(a,b){var s
-for(s=this.gaH(this);s.t();)b.$1(s.gC(s))},
-dl:function(a,b){var s,r=this.gaH(this)
+for(s=this.gaJ(this);s.t();)b.$1(s.gC(s))},
+dl:function(a,b){var s,r=this.gaJ(this)
if(!r.t())return""
if(b===""){s=""
do s+=H.f(r.gC(r))
while(r.t())}else{s=H.f(r.gC(r))
for(;r.t();)s=s+b+H.f(r.gC(r))}return s.charCodeAt(0)==0?s:s},
-iw:function(a,b){var s
-for(s=this.gaH(this);s.t();)if(b.$1(s.gC(s)))return!0
+iv:function(a,b){var s
+for(s=this.gaJ(this);s.t();)if(b.$1(s.gC(s)))return!0
return!1},
-l2:function(a,b){return H.bwU(this,b,H.F(this).h("dX.E"))},
-jP:function(a,b){return H.aua(this,b,H.F(this).h("dX.E"))},
-ga5:function(a){var s=this.gaH(this)
-if(!s.t())throw H.d(H.f5())
+l1:function(a,b){return H.bwL(this,b,H.F(this).h("dY.E"))},
+jN:function(a,b){return H.aud(this,b,H.F(this).h("dY.E"))},
+ga4:function(a){var s=this.gaJ(this)
+if(!s.t())throw H.d(H.f7())
return s.gC(s)},
-gaS:function(a){var s,r=this.gaH(this)
-if(!r.t())throw H.d(H.f5())
+gaS:function(a){var s,r=this.gaJ(this)
+if(!r.t())throw H.d(H.f7())
do s=r.gC(r)
while(r.t())
return s},
dr:function(a,b){var s,r,q,p="index"
-P.eB(b,p)
-P.iw(b,p)
-for(s=this.gaH(this),r=0;s.t();){q=s.gC(s)
+P.ez(b,p)
+P.iv(b,p)
+for(s=this.gaJ(this),r=0;s.t();){q=s.gC(s)
if(b===r)return q;++r}throw H.d(P.fv(b,this,p,null,r))}}
-P.Ox.prototype={
-yn:function(a){var s,r,q=this.AT()
-for(s=this.gaH(this);s.t();){r=s.gC(s)
+P.OA.prototype={
+yl:function(a){var s,r,q=this.AR()
+for(s=this.gaJ(this);s.t();){r=s.gC(s)
if(!a.I(0,r))q.F(0,r)}return q},
-Cp:function(a,b){var s,r,q=this.AT()
-for(s=this.gaH(this);s.t();){r=s.gC(s)
+Co:function(a,b){var s,r,q=this.AR()
+for(s=this.gaJ(this);s.t();){r=s.gC(s)
if(b.I(0,r))q.F(0,r)}return q},
-jJ:function(a){var s=this.AT()
+jH:function(a){var s=this.AR()
s.V(0,this)
return s},
$ibf:1,
$iP:1,
$ifE:1}
-P.kf.prototype={
-AT:function(){return P.fP(this.$ti.c)},
-I:function(a,b){return J.dZ(this.a,b)},
-gaH:function(a){return J.a3(J.yQ(this.a))},
-gH:function(a){return J.bX(this.a)},
+P.kh.prototype={
+AR:function(){return P.fP(this.$ti.c)},
+I:function(a,b){return J.e_(this.a,b)},
+gaJ:function(a){return J.a2(J.yP(this.a))},
+gH:function(a){return J.bY(this.a)},
F:function(a,b){throw H.d(P.z("Cannot change unmodifiable set"))},
V:function(a,b){throw H.d(P.z("Cannot change unmodifiable set"))},
JR:function(a){throw H.d(P.z("Cannot change unmodifiable set"))},
-l_:function(a,b){throw H.d(P.z("Cannot change unmodifiable set"))},
-P:function(a,b){throw H.d(P.z("Cannot change unmodifiable set"))}}
-P.aGY.prototype={
+kZ:function(a,b){throw H.d(P.z("Cannot change unmodifiable set"))},
+O:function(a,b){throw H.d(P.z("Cannot change unmodifiable set"))}}
+P.aH0.prototype={
ghr:function(a){return this.a}}
-P.ii.prototype={}
+P.ih.prototype={}
P.p5.prototype={
gw:function(a){return this.d}}
-P.aGX.prototype={
+P.aH_.prototype={
ne:function(a){var s,r,q,p,o,n,m,l,k,j,i,h,g=this,f=null
-if(g.giO()==null)return-1
-s=g.giO()
+if(g.giL()==null)return-1
+s=g.giL()
s.toString
-r=g.gZT()
+r=g.gZS()
for(q=f,p=s,o=q,n=o,m=n,l=m;!0;){q=r.$2(p.a,a)
if(q>0){k=p.b
if(k==null)break
@@ -62860,51 +62776,51 @@ else n.c=p}else break
n=p
p=i}}if(n!=null){n.c=p.b
p.b=o}if(l!=null){l.b=p.c
-p.c=m}g.siO(p);++g.c
+p.c=m}g.siL(p);++g.c
return q},
-aD9:function(a){var s,r,q=a.b
+aDf:function(a){var s,r,q=a.b
for(s=a;q!=null;s=q,q=r){s.b=q.c
q.c=s
r=q.b}return s},
-a4i:function(a){var s,r,q=a.c
+a4m:function(a){var s,r,q=a.c
for(s=a;q!=null;s=q,q=r){s.c=q.b
q.b=s
r=q.c}return s},
ph:function(a,b){var s,r,q,p,o=this
-if(o.giO()==null)return null
+if(o.giL()==null)return null
if(o.ne(b)!==0)return null
-s=o.giO()
+s=o.giL()
r=s.b;--o.a
q=s.c
-if(r==null)o.siO(q)
-else{p=o.a4i(r)
+if(r==null)o.siL(q)
+else{p=o.a4m(r)
p.c=q
-o.siO(p)}++o.b
+o.siL(p)}++o.b
return s},
EA:function(a,b){var s,r=this;++r.a;++r.b
-s=r.giO()
-if(s==null){r.siO(a)
+s=r.giL()
+if(s==null){r.siL(a)
return}if(b<0){a.b=s
a.c=s.c
s.c=null}else{a.c=s
a.b=s.b
-s.b=null}r.siO(a)},
-ga08:function(){var s=this,r=s.giO()
+s.b=null}r.siL(a)},
+ga07:function(){var s=this,r=s.giL()
if(r==null)return null
-s.siO(s.aD9(r))
-return s.giO()},
-ga1G:function(){var s=this,r=s.giO()
+s.siL(s.aDf(r))
+return s.giL()},
+ga1G:function(){var s=this,r=s.giL()
if(r==null)return null
-s.siO(s.a4i(r))
-return s.giO()},
-apQ:function(a){this.siO(null)
+s.siL(s.a4m(r))
+return s.giL()},
+apU:function(a){this.siL(null)
this.a=0;++this.b}}
-P.a4u.prototype={
+P.a4x.prototype={
i:function(a,b){var s=this
if(!s.f.$1(b))return null
if(s.d!=null)if(s.ne(b)===0)return s.d.d
return null},
-P:function(a,b){var s
+O:function(a,b){var s
if(!this.f.$1(b))return null
s=this.ph(0,b)
if(s!=null)return s.d
@@ -62914,38 +62830,38 @@ if(b==null)throw H.d(P.aa(b))
s=q.ne(b)
if(s===0){q.d.d=c
return}r=q.$ti
-q.EA(new P.p5(c,b,r.h("@<1>").a7(r.Q[1]).h("p5<1,2>")),s)},
-eH:function(a,b,c){var s,r,q,p,o,n=this
+q.EA(new P.p5(c,b,r.h("@<1>").a6(r.Q[1]).h("p5<1,2>")),s)},
+eE:function(a,b,c){var s,r,q,p,o,n=this
if(b==null)throw H.d(P.aa(b))
s=n.ne(b)
if(s===0)return n.d.d
r=n.b
q=n.c
p=c.$0()
-if(r!==n.b)throw H.d(P.dU(n))
+if(r!==n.b)throw H.d(P.dV(n))
if(q!==n.c)s=n.ne(b)
o=n.$ti
-n.EA(new P.p5(p,b,o.h("@<1>").a7(o.Q[1]).h("p5<1,2>")),s)
+n.EA(new P.p5(p,b,o.h("@<1>").a6(o.Q[1]).h("p5<1,2>")),s)
return p},
-V:function(a,b){J.cc(b,new P.bvp(this))},
+V:function(a,b){J.ci(b,new P.bvg(this))},
gag:function(a){return this.d==null},
gca:function(a){return this.d!=null},
-L:function(a,b){var s,r=this,q=r.$ti,p=new P.abT(r,H.a([],q.h("Y>")),r.b,r.c,q.h("@<1>").a7(q.h("p5<1,2>")).h("abT<1,2>"))
-p.AD(r.d)
+L:function(a,b){var s,r=this,q=r.$ti,p=new P.abX(r,H.a([],q.h("Z>")),r.b,r.c,q.h("@<1>").a6(q.h("p5<1,2>")).h("abX<1,2>"))
+p.AB(r.d)
for(;p.t();){s=p.gC(p)
b.$2(s.a,s.d)}},
gH:function(a){return this.a},
-cq:function(a){this.apQ(0)},
-aP:function(a,b){return this.f.$1(b)&&this.ne(b)===0},
+cq:function(a){this.apU(0)},
+aN:function(a,b){return this.f.$1(b)&&this.ne(b)===0},
gah:function(a){var s=this.$ti
-return new P.yz(this,s.h("@<1>").a7(s.h("p5<1,2>")).h("yz<1,2>"))},
+return new P.yy(this,s.h("@<1>").a6(s.h("p5<1,2>")).h("yy<1,2>"))},
gdY:function(a){var s=this.$ti
-return new P.Oy(this,s.h("@<1>").a7(s.Q[1]).h("Oy<1,2>"))},
-aKA:function(){if(this.d==null)return null
-return this.ga08().a},
-aab:function(){if(this.d==null)return null
+return new P.OB(this,s.h("@<1>").a6(s.Q[1]).h("OB<1,2>"))},
+aKG:function(){if(this.d==null)return null
+return this.ga07().a},
+aaf:function(){if(this.d==null)return null
return this.ga1G().a},
-aMi:function(a){var s,r,q,p=this
+aMo:function(a){var s,r,q,p=this
if(a==null)throw H.d(P.aa(a))
if(p.d==null)return null
if(p.ne(a)<0)return p.d.a
@@ -62954,7 +62870,7 @@ if(s==null)return null
r=s.c
for(;r!=null;s=r,r=q)q=r.c
return s.a},
-aKB:function(a){var s,r,q,p=this
+aKH:function(a){var s,r,q,p=this
if(a==null)throw H.d(P.aa(a))
if(p.d==null)return null
if(p.ne(a)>0)return p.d.a
@@ -62964,253 +62880,253 @@ r=s.b
for(;r!=null;s=r,r=q)q=r.b
return s.a},
$ibr:1,
-giO:function(){return this.d},
-gZT:function(){return this.e},
-siO:function(a){return this.d=a}}
-P.bvq.prototype={
+giL:function(){return this.d},
+gZS:function(){return this.e},
+siL:function(a){return this.d=a}}
+P.bvh.prototype={
$1:function(a){return this.a.b(a)},
-$S:132}
-P.bvp.prototype={
+$S:129}
+P.bvg.prototype={
$2:function(a,b){this.a.E(0,a,b)},
$S:function(){return this.a.$ti.h("w(1,2)")}}
-P.XR.prototype={
+P.XU.prototype={
gC:function(a){var s=this.e
if(s==null)return null
-return this.NK(s)},
-AD:function(a){var s
+return this.NJ(s)},
+AB:function(a){var s
for(s=this.b;a!=null;){s.push(a)
a=a.b}},
t:function(){var s,r,q=this,p=q.a
-if(q.c!==p.b)throw H.d(P.dU(p))
+if(q.c!==p.b)throw H.d(P.dV(p))
s=q.b
if(s.length===0){q.e=null
return!1}if(p.c!==q.d&&q.e!=null){r=q.e
r.toString
C.b.sH(s,0)
p.ne(r.a)
-q.AD(p.giO().c)}p=s.pop()
+q.AB(p.giL().c)}p=s.pop()
q.e=p
-q.AD(p.c)
+q.AB(p.c)
return!0}}
-P.yz.prototype={
+P.yy.prototype={
gH:function(a){return this.a.a},
gag:function(a){return this.a.a===0},
-gaH:function(a){var s=this.$ti
-return P.vj(this.a,s.c,s.Q[1])},
-jJ:function(a){var s=this.a,r=this.$ti,q=P.bvr(s.e,s.f,r.c)
+gaJ:function(a){var s=this.$ti
+return P.vk(this.a,s.c,s.Q[1])},
+jH:function(a){var s=this.a,r=this.$ti,q=P.bvi(s.e,s.f,r.c)
q.a=s.a
-q.d=q.a_9(s.d,r.Q[1])
+q.d=q.a_8(s.d,r.Q[1])
return q}}
-P.Oy.prototype={
+P.OB.prototype={
gH:function(a){return this.a.a},
gag:function(a){return this.a.a===0},
-gaH:function(a){var s=this.a,r=this.$ti
-r=r.h("@<1>").a7(r.Q[1])
-r=new P.abW(s,H.a([],r.h("Y>")),s.b,s.c,r.h("abW<1,2>"))
-r.AD(s.d)
+gaJ:function(a){var s=this.a,r=this.$ti
+r=r.h("@<1>").a6(r.Q[1])
+r=new P.ac_(s,H.a([],r.h("Z>")),s.b,s.c,r.h("ac_<1,2>"))
+r.AB(s.d)
return r}}
-P.abR.prototype={
-NK:function(a){return a.a}}
-P.abW.prototype={
-NK:function(a){return a.d}}
-P.abT.prototype={
-NK:function(a){return a}}
-P.Vm.prototype={
-gaH:function(a){var s=this.$ti
-return P.vj(this,s.c,s.h("ii<1>"))},
+P.abV.prototype={
+NJ:function(a){return a.a}}
+P.ac_.prototype={
+NJ:function(a){return a.d}}
+P.abX.prototype={
+NJ:function(a){return a}}
+P.Vq.prototype={
+gaJ:function(a){var s=this.$ti
+return P.vk(this,s.c,s.h("ih<1>"))},
gH:function(a){return this.a},
gag:function(a){return this.d==null},
gca:function(a){return this.d!=null},
-ga5:function(a){if(this.a===0)throw H.d(H.f5())
-return this.ga08().a},
-gaS:function(a){if(this.a===0)throw H.d(H.f5())
+ga4:function(a){if(this.a===0)throw H.d(H.f7())
+return this.ga07().a},
+gaS:function(a){if(this.a===0)throw H.d(H.f7())
return this.ga1G().a},
I:function(a,b){return this.f.$1(b)&&this.ne(this.$ti.c.a(b))===0},
F:function(a,b){var s=this.ne(b)
if(s===0)return!1
-this.EA(new P.ii(b,this.$ti.h("ii<1>")),s)
+this.EA(new P.ih(b,this.$ti.h("ih<1>")),s)
return!0},
-P:function(a,b){if(!this.f.$1(b))return!1
+O:function(a,b){if(!this.f.$1(b))return!1
return this.ph(0,this.$ti.c.a(b))!=null},
V:function(a,b){var s,r,q,p
-for(s=J.a3(b),r=this.$ti.h("ii<1>");s.t();){q=s.gC(s)
+for(s=J.a2(b),r=this.$ti.h("ih<1>");s.t();){q=s.gC(s)
p=this.ne(q)
-if(p!==0)this.EA(new P.ii(q,r),p)}},
+if(p!==0)this.EA(new P.ih(q,r),p)}},
JR:function(a){var s,r,q,p
for(s=a.length,r=this.$ti.c,q=0;q"));q.t();){s=q.gC(q)
+Co:function(a,b){var s,r=this,q=r.$ti,p=q.c,o=P.bvi(r.e,r.f,p)
+for(q=P.vk(r,p,q.h("ih<1>"));q.t();){s=q.gC(q)
if(b.I(0,s))o.F(0,s)}return o},
-aq1:function(){var s=this,r=s.$ti,q=P.bvr(s.e,s.f,r.c)
+aq5:function(){var s=this,r=s.$ti,q=P.bvi(s.e,s.f,r.c)
q.a=s.a
-q.d=s.a_9(s.d,r.h("ii<1>"))
+q.d=s.a_8(s.d,r.h("ih<1>"))
return q},
-a_9:function(a,b){var s
+a_8:function(a,b){var s
if(a==null)return null
-s=new P.ii(a.a,this.$ti.h("ii<1>"))
-new P.bvs(this,b).$2(a,s)
+s=new P.ih(a.a,this.$ti.h("ih<1>"))
+new P.bvj(this,b).$2(a,s)
return s},
-jJ:function(a){return this.aq1()},
-j:function(a){return P.a0O(this,"{","}")},
+jH:function(a){return this.aq5()},
+j:function(a){return P.a0Q(this,"{","}")},
$ibf:1,
$iP:1,
$ifE:1,
-giO:function(){return this.d},
-gZT:function(){return this.e},
-siO:function(a){return this.d=a}}
-P.bvt.prototype={
+giL:function(){return this.d},
+gZS:function(){return this.e},
+siL:function(a){return this.d=a}}
+P.bvk.prototype={
$1:function(a){return this.a.b(a)},
-$S:132}
-P.bvs.prototype={
-$2:function(a,b){var s,r,q,p,o,n=this.a.$ti.h("ii<1>")
+$S:129}
+P.bvj.prototype={
+$2:function(a,b){var s,r,q,p,o,n=this.a.$ti.h("ih<1>")
do{s=a.b
r=a.c
-if(s!=null){q=new P.ii(s.a,n)
+if(s!=null){q=new P.ih(s.a,n)
b.b=q
this.$2(s,q)}p=r!=null
-if(p){o=new P.ii(r.a,n)
+if(p){o=new P.ih(r.a,n)
b.c=o
b=o
a=r}}while(p)},
-$S:function(){return this.a.$ti.a7(this.b).h("~(1,ii<2>)")}}
-P.aa4.prototype={}
-P.abS.prototype={}
-P.abU.prototype={}
-P.abV.prototype={}
-P.acv.prototype={}
-P.adG.prototype={}
-P.aDs.prototype={
+$S:function(){return this.a.$ti.a6(this.b).h("~(1,ih<2>)")}}
+P.aa8.prototype={}
+P.abW.prototype={}
+P.abY.prototype={}
+P.abZ.prototype={}
+P.acz.prototype={}
+P.adJ.prototype={}
+P.aDv.prototype={
i:function(a,b){var s,r=this.b
if(r==null)return this.c.i(0,b)
else if(typeof b!="string")return null
else{s=r[b]
-return typeof s=="undefined"?this.aAZ(b):s}},
+return typeof s=="undefined"?this.aB4(b):s}},
gH:function(a){var s
if(this.b==null){s=this.c
-s=s.gH(s)}else s=this.wQ().length
+s=s.gH(s)}else s=this.wP().length
return s},
gag:function(a){return this.gH(this)===0},
gca:function(a){return this.gH(this)>0},
gah:function(a){var s
if(this.b==null){s=this.c
-return s.gah(s)}return new P.aDt(this)},
+return s.gah(s)}return new P.aDw(this)},
gdY:function(a){var s,r=this
if(r.b==null){s=r.c
-return s.gdY(s)}return H.lX(r.wQ(),new P.bV1(r),t.N,t.z)},
+return s.gdY(s)}return H.lY(r.wP(),new P.bUK(r),t.N,t.z)},
E:function(a,b,c){var s,r,q=this
if(q.b==null)q.c.E(0,b,c)
-else if(q.aP(0,b)){s=q.b
+else if(q.aN(0,b)){s=q.b
s[b]=c
r=q.a
-if(r==null?s!=null:r!==s)r[b]=null}else q.a5x().E(0,b,c)},
-V:function(a,b){J.cc(b,new P.bV0(this))},
-aP:function(a,b){if(this.b==null)return this.c.aP(0,b)
+if(r==null?s!=null:r!==s)r[b]=null}else q.a5B().E(0,b,c)},
+V:function(a,b){J.ci(b,new P.bUJ(this))},
+aN:function(a,b){if(this.b==null)return this.c.aN(0,b)
if(typeof b!="string")return!1
return Object.prototype.hasOwnProperty.call(this.a,b)},
-eH:function(a,b,c){var s
-if(this.aP(0,b))return this.i(0,b)
+eE:function(a,b,c){var s
+if(this.aN(0,b))return this.i(0,b)
s=c.$0()
this.E(0,b,s)
return s},
-P:function(a,b){if(this.b!=null&&!this.aP(0,b))return null
-return this.a5x().P(0,b)},
+O:function(a,b){if(this.b!=null&&!this.aN(0,b))return null
+return this.a5B().O(0,b)},
cq:function(a){var s,r=this
if(r.b==null)r.c.cq(0)
else{s=r.c
-if(s!=null)J.aKS(s)
+if(s!=null)J.aKV(s)
r.a=r.b=null
s=t.z
r.c=P.ab(s,s)}},
L:function(a,b){var s,r,q,p,o=this
if(o.b==null)return o.c.L(0,b)
-s=o.wQ()
+s=o.wP()
for(r=0;r"))}return s},
-I:function(a,b){return this.a.aP(0,b)}}
-P.bBZ.prototype={
+I:function(a,b){return this.a.aN(0,b)}}
+P.bBH.prototype={
$0:function(){var s,r
try{s=new TextDecoder("utf-8",{fatal:true})
-return s}catch(r){H.J(r)}return null},
-$S:5}
-P.bC_.prototype={
+return s}catch(r){H.K(r)}return null},
+$S:8}
+P.bBI.prototype={
$0:function(){var s,r
try{s=new TextDecoder("utf-8",{fatal:false})
-return s}catch(r){H.J(r)}return null},
-$S:5}
-P.afm.prototype={
-gaW:function(a){return"us-ascii"},
-c_:function(a){return C.D7.ew(a)},
-fv:function(a,b){var s=C.Vs.ew(b)
+return s}catch(r){H.K(r)}return null},
+$S:8}
+P.afp.prototype={
+gaX:function(a){return"us-ascii"},
+c_:function(a){return C.D7.eu(a)},
+fv:function(a,b){var s=C.Vs.eu(b)
return s},
-giy:function(){return C.D7}}
-P.aIB.prototype={
-ew:function(a){var s,r,q,p,o,n,m=P.k4(0,null,a.length)
-if(m==null)throw H.d(P.hx("Invalid range"))
+gix:function(){return C.D7}}
+P.aIE.prototype={
+eu:function(a){var s,r,q,p,o,n,m=P.k4(0,null,a.length)
+if(m==null)throw H.d(P.hw("Invalid range"))
s=m-0
r=new Uint8Array(s)
-for(q=~this.a,p=J.dB(a),o=0;o>>0!==0){if(!this.a)throw H.d(P.cN("Invalid value in input: "+H.f(q),null,null))
-return this.aqi(a,0,o)}}return P.pW(a,0,o)},
-aqi:function(a,b,c){var s,r,q,p,o
+return this.aql(a,0,o)}}return P.pU(a,0,o)},
+aql:function(a,b,c){var s,r,q,p,o
for(s=~this.b,r=J.am(a),q=b,p="";q>>0!==0?65533:o)}return p.charCodeAt(0)==0?p:p}}
-P.afn.prototype={}
-P.afF.prototype={
-giy:function(){return C.Wu},
-aND:function(a,b,a0,a1){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d,c="Invalid base64 encoding length "
+P.afq.prototype={}
+P.afI.prototype={
+gix:function(){return C.Wu},
+aNJ:function(a,b,a0,a1){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d,c="Invalid base64 encoding length "
a1=P.k4(a0,a1,b.length)
-if(a1==null)throw H.d(P.hx("Invalid range"))
-s=$.cQJ()
+if(a1==null)throw H.d(P.hw("Invalid range"))
+s=$.cQ8()
for(r=J.am(b),q=a0,p=q,o=null,n=-1,m=-1,l=0;q=0){h=C.d.d3(u.U,g)
+if(g>=0){h=C.d.d1(u.U,g)
if(h===j)continue
j=h}else{if(g===-1){if(n<0){f=o==null?null:o.a.length
if(f==null)f=0
@@ -63218,59 +63134,59 @@ n=f+(q-p)
m=q}++l
if(j===61)continue}j=h}if(g!==-2){if(o==null){o=new P.eK("")
f=o}else f=o
-f.a+=C.d.b2(b,p,q)
+f.a+=C.d.b3(b,p,q)
f.a+=H.eI(j)
p=k
-continue}}throw H.d(P.cN("Invalid base64 data",b,q))}if(o!=null){r=o.a+=r.b2(b,p,a1)
+continue}}throw H.d(P.cN("Invalid base64 data",b,q))}if(o!=null){r=o.a+=r.b3(b,p,a1)
f=r.length
-if(n>=0)P.cSs(b,m,a1,n,l,f)
-else{e=C.e.aU(f-1,4)+1
+if(n>=0)P.cRS(b,m,a1,n,l,f)
+else{e=C.e.aT(f-1,4)+1
if(e===1)throw H.d(P.cN(c,b,a1))
for(;e<4;){r+="="
o.a=r;++e}}r=o.a
return C.d.pW(b,a0,a1,r.charCodeAt(0)==0?r:r)}d=a1-a0
-if(n>=0)P.cSs(b,m,a1,n,l,d)
-else{e=C.e.aU(d,4)
+if(n>=0)P.cRS(b,m,a1,n,l,d)
+else{e=C.e.aT(d,4)
if(e===1)throw H.d(P.cN(c,b,a1))
if(e>1)b=r.pW(b,a1,a1,e===2?"==":"=")}return b}}
-P.afH.prototype={
-ew:function(a){var s=J.am(a)
+P.afK.prototype={
+eu:function(a){var s=J.am(a)
if(s.gag(a))return""
-s=new P.bGB(u.U).aJI(a,0,s.gH(a),!0)
+s=new P.bGh(u.U).aJO(a,0,s.gH(a),!0)
s.toString
-return P.pW(s,0,null)}}
-P.bGB.prototype={
-aIe:function(a,b){return new Uint8Array(b)},
-aJI:function(a,b,c,d){var s,r=this,q=(r.a&3)+(c-b),p=C.e.dn(q,3),o=p*4
+return P.pU(s,0,null)}}
+P.bGh.prototype={
+aIk:function(a,b){return new Uint8Array(b)},
+aJO:function(a,b,c,d){var s,r=this,q=(r.a&3)+(c-b),p=C.e.dn(q,3),o=p*4
if(d&&q-p*3>0)o+=4
-s=r.aIe(0,o)
-r.a=P.di4(r.b,a,b,c,d,s,0,r.a)
+s=r.aIk(0,o)
+r.a=P.dhs(r.b,a,b,c,d,s,0,r.a)
if(o>0)return s
return null}}
-P.afG.prototype={
-aHR:function(a,b){var s,r,q=P.k4(b,null,a.length)
-if(q==null)throw H.d(P.hx("Invalid range"))
+P.afJ.prototype={
+aHX:function(a,b){var s,r,q=P.k4(b,null,a.length)
+if(q==null)throw H.d(P.hw("Invalid range"))
if(b===q)return new Uint8Array(0)
-s=new P.bGA()
-r=s.aIA(0,a,b,q)
+s=new P.bGg()
+r=s.aIG(0,a,b,q)
r.toString
-s.aHo(0,a,q)
+s.aHu(0,a,q)
return r},
-ew:function(a){return this.aHR(a,0)}}
-P.bGA.prototype={
-aIA:function(a,b,c,d){var s,r=this,q=r.a
-if(q<0){r.a=P.cXP(b,c,d,q)
+eu:function(a){return this.aHX(a,0)}}
+P.bGg.prototype={
+aIG:function(a,b,c,d){var s,r=this,q=r.a
+if(q<0){r.a=P.cXf(b,c,d,q)
return null}if(c===d)return new Uint8Array(0)
-s=P.di1(b,c,d,q)
-r.a=P.di3(b,c,d,s,0,r.a)
+s=P.dhp(b,c,d,q)
+r.a=P.dhr(b,c,d,s,0,r.a)
return s},
-aHo:function(a,b,c){var s=this.a
+aHu:function(a,b,c){var s=this.a
if(s<-1)throw H.d(P.cN("Missing padding character",b,c))
if(s>0)throw H.d(P.cN("Invalid length, must be multiple of four",b,c))
this.a=-1}}
-P.aOQ.prototype={}
-P.aOR.prototype={}
-P.aA9.prototype={
+P.aOT.prototype={}
+P.aOU.prototype={}
+P.aAc.prototype={
F:function(a,b){var s,r,q=this,p=q.b,o=q.c,n=J.am(b)
if(n.gH(b)>p.length-o){p=q.b
s=n.gH(b)+p.length-1
@@ -63285,126 +63201,127 @@ q.b=r}p=q.b
o=q.c
C.aH.fC(p,o,o+n.gH(b),b)
q.c=q.c+n.gH(b)},
-dD:function(a){this.a.$1(C.aH.f4(this.b,0,this.c))}}
-P.agt.prototype={}
-P.tA.prototype={
-c_:function(a){return this.giy().ew(a)}}
-P.ku.prototype={}
-P.Ag.prototype={}
-P.a0V.prototype={
-j:function(a){var s=P.H6(this.a)
+dC:function(a){this.a.$1(C.aH.f5(this.b,0,this.c))}}
+P.agw.prototype={}
+P.tz.prototype={
+c_:function(a){return this.gix().eu(a)}}
+P.kv.prototype={}
+P.Af.prototype={}
+P.a0X.prototype={
+j:function(a){var s=P.H7(this.a)
return(this.b!=null?"Converting object to an encodable object failed:":"Converting object did not return an encodable object:")+" "+s}}
-P.alW.prototype={
+P.alZ.prototype={
j:function(a){return"Cyclic error in JSON stringify"}}
-P.alV.prototype={
-tq:function(a,b,c){var s=P.cZM(b,this.gaIC().a)
+P.alY.prototype={
+tq:function(a,b,c){var s=P.cZc(b,this.gaII().a)
return s},
fv:function(a,b){return this.tq(a,b,null)},
-C3:function(a,b){var s
+C2:function(a,b){var s
if(b==null)b=null
-if(b==null){s=this.giy()
-return P.cYo(a,s.b,s.a)}return P.cYo(a,b,null)},
-c_:function(a){return this.C3(a,null)},
-giy:function(){return C.a4u},
-gaIC:function(){return C.a4t}}
-P.alY.prototype={
-ew:function(a){var s,r=new P.eK("")
-P.cYn(a,r,this.b,this.a)
+if(b==null){s=this.gix()
+return P.cXP(a,s.b,s.a)}return P.cXP(a,b,null)},
+c_:function(a){return this.C2(a,null)},
+gix:function(){return C.a4u},
+gaII:function(){return C.a4t}}
+P.am0.prototype={
+eu:function(a){var s,r=new P.eK("")
+P.cXO(a,r,this.b,this.a)
s=r.a
return s.charCodeAt(0)==0?s:s}}
-P.alX.prototype={
-ew:function(a){return P.cZM(a,this.a)}}
-P.bV5.prototype={
-W7:function(a){var s,r,q,p,o,n,m=this,l=a.length
-for(s=J.dB(a),r=0,q=0;q92){if(p>=55296){o=p&64512
if(o===55296){n=q+1
-n=!(n=0&&(C.d.d3(a,o)&64512)===55296)}else o=!1
+o=!(o>=0&&(C.d.d1(a,o)&64512)===55296)}else o=!1
else o=!0
if(o){if(q>r)m.Kr(a,r,q)
r=q+1
-m.jq(92)
-m.jq(117)
-m.jq(100)
+m.jo(92)
+m.jo(117)
+m.jo(100)
o=p>>>8&15
-m.jq(o<10?48+o:87+o)
+m.jo(o<10?48+o:87+o)
o=p>>>4&15
-m.jq(o<10?48+o:87+o)
+m.jo(o<10?48+o:87+o)
o=p&15
-m.jq(o<10?48+o:87+o)}}continue}if(p<32){if(q>r)m.Kr(a,r,q)
+m.jo(o<10?48+o:87+o)}}continue}if(p<32){if(q>r)m.Kr(a,r,q)
r=q+1
-m.jq(92)
-switch(p){case 8:m.jq(98)
+m.jo(92)
+switch(p){case 8:m.jo(98)
break
-case 9:m.jq(116)
+case 9:m.jo(116)
break
-case 10:m.jq(110)
+case 10:m.jo(110)
break
-case 12:m.jq(102)
+case 12:m.jo(102)
break
-case 13:m.jq(114)
+case 13:m.jo(114)
break
-default:m.jq(117)
-m.jq(48)
-m.jq(48)
+default:m.jo(117)
+m.jo(48)
+m.jo(48)
o=p>>>4&15
-m.jq(o<10?48+o:87+o)
+m.jo(o<10?48+o:87+o)
o=p&15
-m.jq(o<10?48+o:87+o)
+m.jo(o<10?48+o:87+o)
break}}else if(p===34||p===92){if(q>r)m.Kr(a,r,q)
r=q+1
-m.jq(92)
-m.jq(p)}}if(r===0)m.hQ(a)
+m.jo(92)
+m.jo(p)}}if(r===0)m.hQ(a)
else if(r>>6&63
o.b=p+1
r[p]=128|s&63
-return!0}else{o.Qi()
+return!0}else{o.Qh()
return!1}},
-asf:function(a,b,c){var s,r,q,p,o,n,m,l,k=this
-if(b!==c&&(J.aeA(a,c-1)&64512)===55296)--c
-for(s=k.c,r=s.length,q=J.dB(a),p=b;p=r)break
k.b=n+1
s[n]=o}else{n=o&64512
if(n===55296){if(k.b+4>r)break
m=p+1
-if(k.aFD(o,C.d.b5(a,m)))p=m}else if(n===56320){if(k.b+3>r)break
-k.Qi()}else if(o<=2047){n=k.b
+if(k.aFJ(o,C.d.b7(a,m)))p=m}else if(n===56320){if(k.b+3>r)break
+k.Qh()}else if(o<=2047){n=k.b
l=n+1
if(l>=r)break
k.b=l
@@ -63531,31 +63449,31 @@ n=k.b=l+1
s[l]=128|o>>>6&63
k.b=n+1
s[n]=128|o&63}}}return p}}
-P.W4.prototype={
-ew:function(a){var s=this.a,r=P.dhv(s,a,0,null)
+P.W7.prototype={
+eu:function(a){var s=this.a,r=P.dgT(s,a,0,null)
if(r!=null)return r
-return new P.c6o(s).aHS(a,0,null,!0)}}
-P.c6o.prototype={
-aHS:function(a,b,c,d){var s,r,q,p,o,n=this,m=P.k4(b,c,J.bX(a))
+return new P.c66(s).aHY(a,0,null,!0)}}
+P.c66.prototype={
+aHY:function(a,b,c,d){var s,r,q,p,o,n=this,m=P.k4(b,c,J.bY(a))
if(b===m)return""
if(t.H3.b(a)){s=a
-r=0}else{s=P.djL(a,b,m)
+r=0}else{s=P.dj8(a,b,m)
m-=b
r=b
-b=0}q=n.MT(s,b,m,d)
+b=0}q=n.MS(s,b,m,d)
p=n.b
-if((p&1)!==0){o=P.djM(p)
+if((p&1)!==0){o=P.dj9(p)
n.b=0
throw H.d(P.cN(o,a,r+n.c))}return q},
-MT:function(a,b,c,d){var s,r,q=this
+MS:function(a,b,c,d){var s,r,q=this
if(c-b>1000){s=C.e.dn(b+c,2)
-r=q.MT(a,b,s,!1)
+r=q.MS(a,b,s,!1)
if((q.b&1)!==0)return r
-return r+q.MT(a,s,c,d)}return q.aIB(a,b,c,d)},
-aIB:function(a,b,c,d){var s,r,q,p,o,n,m,l=this,k=65533,j=l.b,i=l.c,h=new P.eK(""),g=b+1,f=a[b]
-$label0$0:for(s=l.a;!0;){for(;!0;g=p){r=C.d.b5("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFFFFFFFFFFFFFFFGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHHHHHHHHIHHHJEEBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBKCCCCCCCCCCCCDCLONNNMEEEEEEEEEEE",f)&31
+return r+q.MS(a,s,c,d)}return q.aIH(a,b,c,d)},
+aIH:function(a,b,c,d){var s,r,q,p,o,n,m,l=this,k=65533,j=l.b,i=l.c,h=new P.eK(""),g=b+1,f=a[b]
+$label0$0:for(s=l.a;!0;){for(;!0;g=p){r=C.d.b7("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFFFFFFFFFFFFFFFGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHHHHHHHHIHHHJEEBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBKCCCCCCCCCCCCDCLONNNMEEEEEEEEEEE",f)&31
i=j<=32?f&61694>>>r:(f&63|i<<6)>>>0
-j=C.d.b5(" \x000:XECCCCCN:lDb \x000:XECCCCCNvlDb \x000:XECCCCCN:lDb AAAAA\x00\x00\x00\x00\x00AAAAA00000AAAAA:::::AAAAAGG000AAAAA00KKKAAAAAG::::AAAAA:IIIIAAAAA000\x800AAAAA\x00\x00\x00\x00 AAAAA",j+r)
+j=C.d.b7(" \x000:XECCCCCN:lDb \x000:XECCCCCNvlDb \x000:XECCCCCN:lDb AAAAA\x00\x00\x00\x00\x00AAAAA00000AAAAA:::::AAAAAGG000AAAAA00KKKAAAAAG::::AAAAA:IIIIAAAAA000\x800AAAAA\x00\x00\x00\x00 AAAAA",j+r)
if(j===0){h.a+=H.eI(i)
if(g===c)break $label0$0
break}else if((j&1)!==0){if(s)switch(j){case 69:case 67:h.a+=H.eI(k)
@@ -63576,7 +63494,7 @@ f=a[p]
if(f>=128){o=n-1
p=n
break}p=n}if(o-g<20)for(m=g;m32)if(s)h.a+=H.eI(k)
else{l.b=77
@@ -63585,229 +63503,229 @@ return""}l.b=j
l.c=i
s=h.a
return s.charCodeAt(0)==0?s:s}}
-P.aJo.prototype={}
-P.crb.prototype={
+P.aJr.prototype={}
+P.cqK.prototype={
$2:function(a,b){this.a.E(0,a.a,b)},
-$S:467}
-P.bfY.prototype={
+$S:477}
+P.bfK.prototype={
$2:function(a,b){var s,r=this.b,q=this.a
r.a+=q.a
s=r.a+=H.f(a.a)
r.a=s+": "
-r.a+=P.H6(b)
+r.a+=P.H7(b)
q.a=", "},
-$S:467}
+$S:477}
P.iy.prototype={
rz:function(a){var s,r,q=this,p=q.c
if(p===0)return q
s=!q.a
r=q.b
-p=P.kN(p,r)
+p=P.kM(p,r)
return new P.iy(p===0?!1:s,r,p)},
-ar7:function(a){var s,r,q,p,o,n,m=this.c
-if(m===0)return $.qi()
+ara:function(a){var s,r,q,p,o,n,m=this.c
+if(m===0)return $.qh()
s=m+a
r=this.b
q=new Uint16Array(s)
for(p=m-1;p>=0;--p)q[p+a]=r[p]
o=this.a
-n=P.kN(s,q)
+n=P.kM(s,q)
return new P.iy(n===0?!1:o,q,n)},
-are:function(a){var s,r,q,p,o,n,m,l=this,k=l.c
-if(k===0)return $.qi()
+arh:function(a){var s,r,q,p,o,n,m,l=this,k=l.c
+if(k===0)return $.qh()
s=k-a
-if(s<=0)return l.a?$.cQL():$.qi()
+if(s<=0)return l.a?$.cQa():$.qh()
r=l.b
q=new Uint16Array(s)
for(p=a;pm?n:m,k=this.b,j=a.b,i=new Uint16Array(l)
+anH:function(a,b){var s,r,q,p,o,n=this.c,m=a.c,l=n>m?n:m,k=this.b,j=a.b,i=new Uint16Array(l)
if(n=0)return q.rO(b,r)
+if(r===b.a)return q.A9(b,r)
+if(P.bGo(q.b,p,b.b,s)>=0)return q.rO(b,r)
return b.rO(q,!r)},
bl:function(a,b){var s,r,q=this,p=q.c
if(p===0)return b.rz(0)
s=b.c
if(s===0)return q
r=q.a
-if(r!==b.a)return q.Ab(b,r)
-if(P.bGI(q.b,p,b.b,s)>=0)return q.rO(b,r)
+if(r!==b.a)return q.A9(b,r)
+if(P.bGo(q.b,p,b.b,s)>=0)return q.rO(b,r)
return b.rO(q,!r)},
-b0:function(a,b){var s,r,q,p,o,n,m,l=this.c,k=b.c
-if(l===0||k===0)return $.qi()
+b1:function(a,b){var s,r,q,p,o,n,m,l=this.c,k=b.c
+if(l===0||k===0)return $.qh()
s=l+k
r=this.b
q=b.b
p=new Uint16Array(s)
-for(o=0;o0?n.rz(0):n},
-aBq:function(a){var s,r,q,p,o,n=this,m=u.cc,l="Field '_lastRem_nsh' has not been initialized."
+aBw:function(a){var s,r,q,p,o,n=this,m=u.cc,l="Field '_lastRem_nsh' has not been initialized."
if(n.c0)o=o.ug(0,s?$.cOw:H.b(H.R(l)))
+s=$.cXh
+if((s?$.cNU:H.b(H.R(l)))>0)o=o.ug(0,s?$.cNU:H.b(H.R(l)))
return n.a&&o.c>0?o.rz(0):o},
-a_G:function(a){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d=this,c=d.c
-if(c===$.cXV&&a.c===$.cXX&&d.b===$.cXU&&a.b===$.cXW)return
+a_F:function(a){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e,d=this,c=d.c
+if(c===$.cXl&&a.c===$.cXn&&d.b===$.cXk&&a.b===$.cXm)return
s=a.b
r=a.c
q=16-C.e.gH2(s[r-1])
if(q>0){p=new Uint16Array(r+5)
-o=P.cXT(s,r,q,p)
+o=P.cXj(s,r,q,p)
n=new Uint16Array(c+5)
-m=P.cXT(d.b,c,q,n)}else{n=P.cOx(d.b,0,c,c+2)
+m=P.cXj(d.b,c,q,n)}else{n=P.cNV(d.b,0,c,c+2)
o=r
p=s
m=c}l=p[o-1]
k=m-o
j=new Uint16Array(m)
-i=P.cOy(p,o,k,j)
+i=P.cNW(p,o,k,j)
h=m+1
-if(P.bGI(n,m,j,i)>=0){n[m]=1
-P.azW(n,h,j,i,n)}else n[m]=0
+if(P.bGo(n,m,j,i)>=0){n[m]=1
+P.azZ(n,h,j,i,n)}else n[m]=0
g=new Uint16Array(o+2)
g[o]=1
-P.azW(g,o+1,p,o,g)
+P.azZ(g,o+1,p,o,g)
f=m-1
-for(;k>0;){e=P.di8(l,n,f);--k
-P.cXZ(e,g,0,n,k,o)
-if(n[f]0;){e=P.dhw(l,n,f);--k
+P.cXp(e,g,0,n,k,o)
+if(n[f]0},
-q3:function(a,b){return this.aG(0,b)>=0},
+return b instanceof P.iy&&this.aI(0,b)===0},
+eG:function(a,b){return C.l.eG(this.u_(0),b.u_(0))},
+m1:function(a,b){return this.aI(0,b)<0},
+q8:function(a,b){return this.aI(0,b)>0},
+q4:function(a,b){return this.aI(0,b)>=0},
u_:function(a){var s,r,q,p,o,n,m,l=this,k={},j=l.c
if(j===0)return 0
s=new Uint8Array(8);--j
@@ -63820,11 +63738,11 @@ s[6]=(p&15)<<4
s[7]=(s[7]|C.e.fZ(p,4))>>>0
k.a=k.b=0
k.c=j
-o=new P.bGL(k,l)
+o=new P.bGr(k,l)
j=o.$1(5)
s[6]=(s[6]|j&15)>>>0
for(n=5;n>=0;--n)s[n]=o.$1(8)
-m=new P.bGM(s)
+m=new P.bGs(s)
if(J.j(o.$1(1),1))if((s[0]&1)===1)m.$0()
else if(k.b!==0)m.$0()
else for(n=k.c;n>=0;--n)if(r[n]!==0){m.$0()
@@ -63835,31 +63753,31 @@ if(l===1){if(m.a)return C.e.j(-m.b[0])
return C.e.j(m.b[0])}s=H.a([],t.s)
l=m.a
r=l?m.rz(0):m
-for(;r.c>1;){q=$.cQK()
+for(;r.c>1;){q=$.cQ9()
p=q.c===0
if(p)H.b(C.DF)
-o=J.aD(r.aBq(q))
+o=J.aD(r.aBw(q))
s.push(o)
n=o.length
if(n===1)s.push("000")
if(n===2)s.push("00")
if(n===3)s.push("0")
if(p)H.b(C.DF)
-r=r.ar6(q)}s.push(C.e.j(r.b[0]))
+r=r.ar9(q)}s.push(C.e.j(r.b[0]))
if(l)s.push("-")
return new H.dd(s,t.Rr).tH(0)},
$idb:1}
-P.bGJ.prototype={
+P.bGp.prototype={
$2:function(a,b){a=536870911&a+b
a=536870911&a+((524287&a)<<10)
return a^a>>>6},
-$S:464}
-P.bGK.prototype={
+$S:472}
+P.bGq.prototype={
$1:function(a){a=536870911&a+((67108863&a)<<3)
a^=a>>>11
return 536870911&a+((16383&a)<<15)},
-$S:312}
-P.bGL.prototype={
+$S:343}
+P.bGr.prototype={
$1:function(a){var s,r,q,p,o,n,m
for(s=this.a,r=this.b,q=r.c-1,r=r.b;p=s.a,p>>8}},
$S:1}
P.db.prototype={}
P.aX.prototype={
-gaQT:function(){if(this.b)return P.c3(0,0,0,0,0,0)
-return P.c3(0,0,0,0,0-H.kE(this).getTimezoneOffset(),0)},
-F:function(a,b){return P.aiX(this.a+C.e.dn(b.a,1000),this.b)},
-js:function(a){return P.aiX(this.a-C.e.dn(a.a,1000),this.b)},
+gaQZ:function(){if(this.b)return P.c3(0,0,0,0,0,0)
+return P.c3(0,0,0,0,0-H.kF(this).getTimezoneOffset(),0)},
+F:function(a,b){return P.aj_(this.a+C.e.dn(b.a,1000),this.b)},
+jq:function(a){return P.aj_(this.a-C.e.dn(a.a,1000),this.b)},
B:function(a,b){if(b==null)return!1
return b instanceof P.aX&&this.a===b.a&&this.b===b.b},
-aG:function(a,b){return C.e.aG(this.a,b.a)},
-lb:function(a,b){var s,r=this.a
+aI:function(a,b){return C.e.aI(this.a,b.a)},
+la:function(a,b){var s,r=this.a
if(Math.abs(r)<=864e13)s=!1
else s=!0
if(s)throw H.d(P.aa("DateTime is outside valid range: "+r))
-P.eB(this.b,"isUtc")},
+P.ez(this.b,"isUtc")},
gG:function(a){var s=this.a
return(s^C.e.fZ(s,30))&1073741823},
-q_:function(){if(this.b)return P.aiX(this.a,!1)
+q_:function(){if(this.b)return P.aj_(this.a,!1)
return this},
wa:function(){if(this.b)return this
-return P.aiX(this.a,!0)},
-j:function(a){var s=this,r=P.cT5(H.bQ(s)),q=P.w7(H.c4(s)),p=P.w7(H.dc(s)),o=P.w7(H.hm(s)),n=P.w7(H.pN(s)),m=P.w7(H.x9(s)),l=P.cT6(H.ari(s))
+return P.aj_(this.a,!0)},
+j:function(a){var s=this,r=P.cSv(H.bQ(s)),q=P.w8(H.c4(s)),p=P.w8(H.dc(s)),o=P.w8(H.hl(s)),n=P.w8(H.pL(s)),m=P.w8(H.x9(s)),l=P.cSw(H.arl(s))
if(s.b)return r+"-"+q+"-"+p+" "+o+":"+n+":"+m+"."+l+"Z"
else return r+"-"+q+"-"+p+" "+o+":"+n+":"+m+"."+l},
-f3:function(){var s=this,r=H.bQ(s)>=-9999&&H.bQ(s)<=9999?P.cT5(H.bQ(s)):P.dbQ(H.bQ(s)),q=P.w7(H.c4(s)),p=P.w7(H.dc(s)),o=P.w7(H.hm(s)),n=P.w7(H.pN(s)),m=P.w7(H.x9(s)),l=P.cT6(H.ari(s))
+f4:function(){var s=this,r=H.bQ(s)>=-9999&&H.bQ(s)<=9999?P.cSv(H.bQ(s)):P.dbc(H.bQ(s)),q=P.w8(H.c4(s)),p=P.w8(H.dc(s)),o=P.w8(H.hl(s)),n=P.w8(H.pL(s)),m=P.w8(H.x9(s)),l=P.cSw(H.arl(s))
if(s.b)return r+"-"+q+"-"+p+"T"+o+":"+n+":"+m+"."+l+"Z"
else return r+"-"+q+"-"+p+"T"+o+":"+n+":"+m+"."+l},
$idb:1}
-P.aWN.prototype={
+P.aWz.prototype={
$1:function(a){if(a==null)return 0
return P.h0(a,null)},
-$S:457}
-P.aWO.prototype={
+$S:469}
+P.aWA.prototype={
$1:function(a){var s,r,q
if(a==null)return 0
for(s=a.length,r=0,q=0;q<6;++q){r*=10
-if(qb.a},
-q3:function(a,b){return this.a>=b.a},
+q4:function(a,b){return this.a>=b.a},
B:function(a,b){if(b==null)return!1
-return b instanceof P.bW&&this.a===b.a},
+return b instanceof P.bV&&this.a===b.a},
gG:function(a){return C.e.gG(this.a)},
-aG:function(a,b){return C.e.aG(this.a,b.a)},
-j:function(a){var s,r,q,p=new P.aZr(),o=this.a
-if(o<0)return"-"+new P.bW(0-o).j(0)
+aI:function(a,b){return C.e.aI(this.a,b.a)},
+j:function(a){var s,r,q,p=new P.aZd(),o=this.a
+if(o<0)return"-"+new P.bV(0-o).j(0)
s=p.$1(C.e.dn(o,6e7)%60)
r=p.$1(C.e.dn(o,1e6)%60)
-q=new P.aZq().$1(o%1e6)
+q=new P.aZc().$1(o%1e6)
return""+C.e.dn(o,36e8)+":"+H.f(s)+":"+H.f(r)+"."+H.f(q)},
$idb:1}
-P.aZq.prototype={
+P.aZc.prototype={
$1:function(a){if(a>=1e5)return""+a
if(a>=1e4)return"0"+a
if(a>=1000)return"00"+a
if(a>=100)return"000"+a
if(a>=10)return"0000"+a
return"00000"+a},
-$S:278}
-P.aZr.prototype={
+$S:257}
+P.aZd.prototype={
$1:function(a){if(a>=10)return""+a
return"0"+a},
-$S:278}
-P.eH.prototype={
-gEc:function(){return H.c7(this.$thrownJsError)}}
-P.Fc.prototype={
+$S:257}
+P.eG.prototype={
+gEb:function(){return H.c7(this.$thrownJsError)}}
+P.Fd.prototype={
j:function(a){var s=this.a
-if(s!=null)return"Assertion failed: "+P.H6(s)
+if(s!=null)return"Assertion failed: "+P.H7(s)
return"Assertion failed"},
-gCD:function(a){return this.a}}
-P.avu.prototype={}
-P.aq3.prototype={
+gCC:function(a){return this.a}}
+P.avx.prototype={}
+P.aq6.prototype={
j:function(a){return"Throw of null."}}
-P.lA.prototype={
-gNm:function(){return"Invalid argument"+(!this.a?"(s)":"")},
-gNl:function(){return""},
-j:function(a){var s,r,q=this,p=q.c,o=p==null?"":" ("+p+")",n=q.d,m=n==null?"":": "+H.f(n),l=q.gNm()+o+m
+P.lB.prototype={
+gNl:function(){return"Invalid argument"+(!this.a?"(s)":"")},
+gNk:function(){return""},
+j:function(a){var s,r,q=this,p=q.c,o=p==null?"":" ("+p+")",n=q.d,m=n==null?"":": "+H.f(n),l=q.gNl()+o+m
if(!q.a)return l
-s=q.gNl()
-r=P.H6(q.b)
+s=q.gNk()
+r=P.H7(q.b)
return l+s+": "+r},
-gaW:function(a){return this.c}}
-P.Tm.prototype={
-gNm:function(){return"RangeError"},
-gNl:function(){var s,r=this.e,q=this.f
+gaX:function(a){return this.c}}
+P.Tq.prototype={
+gNl:function(){return"RangeError"},
+gNk:function(){var s,r=this.e,q=this.f
if(r==null)s=q!=null?": Not less than or equal to "+H.f(q):""
else if(q==null)s=": Not greater than or equal to "+H.f(r)
else if(q>r)s=": Not in inclusive range "+H.f(r)+".."+H.f(q)
else s=qd.length
else s=!1
if(s)e=null
-if(e==null){if(d.length>78)d=C.d.b2(d,0,75)+"..."
-return f+"\n"+d}for(r=1,q=0,p=!1,o=0;o78)d=C.d.b3(d,0,75)+"..."
+return f+"\n"+d}for(r=1,q=0,p=!1,o=0;o1?f+(" (at line "+r+", character "+(e-q+1)+")\n"):f+(" (at character "+(e+1)+")\n")
m=d.length
-for(o=e;o78)if(e-q<75){l=q+75
k=q
@@ -64043,166 +63961,166 @@ l=e+36
i="..."}j="..."}else{l=m
k=q
j=""
-i=""}h=C.d.b2(d,k,l)
-return f+j+h+i+"\n"+C.d.b0(" ",e-k+j.length)+"^\n"}else return e!=null?f+(" (at offset "+H.f(e)+")"):f},
+i=""}h=C.d.b3(d,k,l)
+return f+j+h+i+"\n"+C.d.b1(" ",e-k+j.length)+"^\n"}else return e!=null?f+(" (at offset "+H.f(e)+")"):f},
$iep:1,
-gCD:function(a){return this.a},
+gCC:function(a){return this.a},
gLl:function(a){return this.b},
gfi:function(a){return this.c}}
-P.alJ.prototype={
+P.alM.prototype={
j:function(a){return"IntegerDivisionByZeroException"},
$iep:1}
-P.akr.prototype={
+P.aku.prototype={
i:function(a,b){var s,r,q=this.a
if(typeof q!="string"){if(b!=null)s=typeof b=="number"||typeof b=="string"
else s=!0
-if(s)H.b(P.hK(b,"Expandos are not allowed on strings, numbers, booleans or null",null))
-return q.get(b)}r=H.cNN(b,"expando$values")
-q=r==null?null:H.cNN(r,q)
+if(s)H.b(P.hJ(b,"Expandos are not allowed on strings, numbers, booleans or null",null))
+return q.get(b)}r=H.cNa(b,"expando$values")
+q=r==null?null:H.cNa(r,q)
return this.$ti.h("1?").a(q)},
E:function(a,b,c){var s,r="expando$values",q=this.a
if(typeof q!="string")q.set(b,c)
-else{s=H.cNN(b,r)
+else{s=H.cNa(b,r)
if(s==null){s=new P.an()
-H.cVb(b,r,s)}H.cVb(s,q,c)}},
-j:function(a){return"Expando:"+C.aj.j(null)},
-gaW:function(){return null}}
+H.cUC(b,r,s)}H.cUC(s,q,c)}},
+j:function(a){return"Expando:"+C.ai.j(null)},
+gaX:function(){return null}}
P.P.prototype={
-v9:function(a,b){return H.zd(this,H.F(this).h("P.E"),b)},
-aKK:function(a,b){var s=this,r=H.F(s)
-if(r.h("bf").b(s))return H.dcI(s,b,r.h("P.E"))
-return new H.IW(s,b,r.h("IW"))},
-ep:function(a,b,c){return H.lX(this,b,H.F(this).h("P.E"),c)},
-cQ:function(a,b){return this.ep(a,b,t.z)},
-iM:function(a,b){return new H.ay(this,b,H.F(this).h("ay"))},
+v9:function(a,b){return H.zc(this,H.F(this).h("P.E"),b)},
+aKQ:function(a,b){var s=this,r=H.F(s)
+if(r.h("bf").b(s))return H.dc4(s,b,r.h("P.E"))
+return new H.IX(s,b,r.h("IX"))},
+eq:function(a,b,c){return H.lY(this,b,H.F(this).h("P.E"),c)},
+cQ:function(a,b){return this.eq(a,b,t.z)},
+ip:function(a,b){return new H.az(this,b,H.F(this).h("az"))},
I:function(a,b){var s
-for(s=this.gaH(this);s.t();)if(J.j(s.gC(s),b))return!0
+for(s=this.gaJ(this);s.t();)if(J.j(s.gC(s),b))return!0
return!1},
L:function(a,b){var s
-for(s=this.gaH(this);s.t();)b.$1(s.gC(s))},
-w1:function(a,b){var s,r=this.gaH(this)
-if(!r.t())throw H.d(H.f5())
+for(s=this.gaJ(this);s.t();)b.$1(s.gC(s))},
+w1:function(a,b){var s,r=this.gaJ(this)
+if(!r.t())throw H.d(H.f7())
s=r.gC(r)
for(;r.t();)s=b.$2(s,r.gC(r))
return s},
-dl:function(a,b){var s,r=this.gaH(this)
+dl:function(a,b){var s,r=this.gaJ(this)
if(!r.t())return""
if(b===""){s=""
do s+=H.f(J.aD(r.gC(r)))
while(r.t())}else{s=H.f(J.aD(r.gC(r)))
for(;r.t();)s=s+b+H.f(J.aD(r.gC(r)))}return s.charCodeAt(0)==0?s:s},
tH:function(a){return this.dl(a,"")},
-iw:function(a,b){var s
-for(s=this.gaH(this);s.t();)if(b.$1(s.gC(s)))return!0
+iv:function(a,b){var s
+for(s=this.gaJ(this);s.t();)if(b.$1(s.gC(s)))return!0
return!1},
fX:function(a,b){return P.v(this,b,H.F(this).h("P.E"))},
-eN:function(a){return this.fX(a,!0)},
-jJ:function(a){var s=P.fP(H.F(this).h("P.E"))
+eL:function(a){return this.fX(a,!0)},
+jH:function(a){var s=P.fP(H.F(this).h("P.E"))
s.V(0,this)
return s},
-gH:function(a){var s,r=this.gaH(this)
+gH:function(a){var s,r=this.gaJ(this)
for(s=0;r.t();)++s
return s},
-gag:function(a){return!this.gaH(this).t()},
+gag:function(a){return!this.gaJ(this).t()},
gca:function(a){return!this.gag(this)},
-l2:function(a,b){return H.bwU(this,b,H.F(this).h("P.E"))},
-jP:function(a,b){return H.aua(this,b,H.F(this).h("P.E"))},
-ahs:function(a,b){return new H.a4k(this,b,H.F(this).h("a4k"))},
-ga5:function(a){var s=this.gaH(this)
-if(!s.t())throw H.d(H.f5())
+l1:function(a,b){return H.bwL(this,b,H.F(this).h("P.E"))},
+jN:function(a,b){return H.aud(this,b,H.F(this).h("P.E"))},
+ahw:function(a,b){return new H.a4n(this,b,H.F(this).h("a4n"))},
+ga4:function(a){var s=this.gaJ(this)
+if(!s.t())throw H.d(H.f7())
return s.gC(s)},
-gaS:function(a){var s,r=this.gaH(this)
-if(!r.t())throw H.d(H.f5())
+gaS:function(a){var s,r=this.gaJ(this)
+if(!r.t())throw H.d(H.f7())
do s=r.gC(r)
while(r.t())
return s},
-gfj:function(a){var s,r=this.gaH(this)
-if(!r.t())throw H.d(H.f5())
+gfj:function(a){var s,r=this.gaJ(this)
+if(!r.t())throw H.d(H.f7())
s=r.gC(r)
-if(r.t())throw H.d(H.cNf())
+if(r.t())throw H.d(H.cMD())
return s},
hq:function(a,b,c){var s,r
-for(s=this.gaH(this);s.t();){r=s.gC(s)
+for(s=this.gaJ(this);s.t();){r=s.gC(s)
if(b.$1(r))return r}return c.$0()},
dr:function(a,b){var s,r,q
-P.iw(b,"index")
-for(s=this.gaH(this),r=0;s.t();){q=s.gC(s)
+P.iv(b,"index")
+for(s=this.gaJ(this),r=0;s.t();){q=s.gC(s)
if(b===r)return q;++r}throw H.d(P.fv(b,this,"index",null,r))},
-j:function(a){return P.cNe(this,"(",")")}}
-P.a9r.prototype={
-dr:function(a,b){P.cNT(b,this,null,null)
+j:function(a){return P.cMC(this,"(",")")}}
+P.a9v.prototype={
+dr:function(a,b){P.cNg(b,this,null,null)
return this.b.$1(b)},
gH:function(a){return this.a}}
-P.alT.prototype={}
-P.el.prototype={
+P.alW.prototype={}
+P.ek.prototype={
j:function(a){return"MapEntry("+H.f(J.aD(this.a))+": "+H.f(J.aD(this.b))+")"},
ghr:function(a){return this.a},
gw:function(a){return this.b}}
P.w.prototype={
-gG:function(a){return P.an.prototype.gG.call(C.aj,this)},
+gG:function(a){return P.an.prototype.gG.call(C.ai,this)},
j:function(a){return"null"}}
P.an.prototype={constructor:P.an,$ian:1,
B:function(a,b){return this===b},
gG:function(a){return H.k3(this)},
-j:function(a){return"Instance of '"+H.f(H.bjm(this))+"'"},
-Jd:function(a,b){throw H.d(P.cUJ(this,b.gaaS(),b.gabK(),b.gaaY()))},
+j:function(a){return"Instance of '"+H.f(H.bjd(this))+"'"},
+Jd:function(a,b){throw H.d(P.cU9(this,b.gaaW(),b.gabO(),b.gab1()))},
gdh:function(a){return H.aY(this)},
toString:function(){return this.j(this)}}
-P.aHd.prototype={
+P.aHg.prototype={
j:function(a){return this.a},
$idn:1}
-P.bw1.prototype={
-gaJB:function(){var s,r=this.b
-if(r==null)r=$.arj.$0()
+P.bvT.prototype={
+gaJH:function(){var s,r=this.b
+if(r==null)r=$.arm.$0()
s=r-this.a
-if($.cQm()===1e6)return s
+if($.cPM()===1e6)return s
return s*1000},
-zX:function(a){var s=this,r=s.b
-if(r!=null){s.a=s.a+($.arj.$0()-r)
+zV:function(a){var s=this,r=s.b
+if(r!=null){s.a=s.a+($.arm.$0()-r)
s.b=null}},
-fu:function(a){if(this.b==null)this.b=$.arj.$0()}}
+fu:function(a){if(this.b==null)this.b=$.arm.$0()}}
P.xr.prototype={
-gaH:function(a){return new P.at2(this.a)},
+gaJ:function(a){return new P.at5(this.a)},
gaS:function(a){var s,r,q=this.a,p=q.length
if(p===0)throw H.d(P.bg("No elements."))
-s=C.d.d3(q,p-1)
-if((s&64512)===56320&&p>1){r=C.d.d3(q,p-2)
-if((r&64512)===55296)return P.cZa(r,s)}return s}}
-P.at2.prototype={
+s=C.d.d1(q,p-1)
+if((s&64512)===56320&&p>1){r=C.d.d1(q,p-2)
+if((r&64512)===55296)return P.cYB(r,s)}return s}}
+P.at5.prototype={
gC:function(a){return this.d},
t:function(){var s,r,q,p=this,o=p.b=p.c,n=p.a,m=n.length
if(o===m){p.d=-1
-return!1}s=C.d.b5(n,o)
+return!1}s=C.d.b7(n,o)
r=o+1
-if((s&64512)===55296&&r4)this.a.$2("an IPv6 part can only contain a maximum of 4 hex digits",a)
-s=P.h0(C.d.b2(this.b,a,b),16)
+s=P.h0(C.d.b3(this.b,a,b),16)
if(s<0||s>65535)this.a.$2("each part must be in the range of `0x0..0xFFFF`",a)
return s},
-$S:464}
+$S:472}
P.EJ.prototype={
-ga4B:function(){var s,r,q,p,o=this
+ga4F:function(){var s,r,q,p,o=this
if(!o.y){s=o.a
r=s.length!==0?s+":":""
q=o.c
@@ -64223,345 +64141,345 @@ o.x=s.charCodeAt(0)==0?s:s
o.y=!0}return o.x},
gnK:function(){var s,r,q=this
if(!q.Q){s=q.e
-if(s.length!==0&&C.d.b5(s,0)===47)s=C.d.eD(s,1)
-r=s.length===0?C.a9:P.jD(new H.A(H.a(s.split("/"),t.s),P.dyA(),t.ck),t.N)
+if(s.length!==0&&C.d.b7(s,0)===47)s=C.d.eA(s,1)
+r=s.length===0?C.a9:P.jD(new H.B(H.a(s.split("/"),t.s),P.dxZ(),t.ck),t.N)
if(q.Q)throw H.d(H.R("Field 'pathSegments' has been assigned during initialization."))
q.z=r
q.Q=!0}return q.z},
gG:function(a){var s,r=this
-if(!r.cx){s=J.h(r.ga4B())
+if(!r.cx){s=J.h(r.ga4F())
if(r.cx)throw H.d(H.R("Field 'hashCode' has been assigned during initialization."))
r.ch=s
r.cx=!0}return r.ch},
-gzm:function(){return this.b},
-goD:function(a){var s=this.c
+gzk:function(){return this.b},
+goE:function(a){var s=this.c
if(s==null)return""
-if(C.d.dK(s,"["))return C.d.b2(s,1,s.length-1)
+if(C.d.dK(s,"["))return C.d.b3(s,1,s.length-1)
return s},
grd:function(a){var s=this.d
-return s==null?P.cYL(this.a):s},
+return s==null?P.cYb(this.a):s},
grg:function(a){var s=this.f
return s==null?"":s},
-gyy:function(){var s=this.r
+gyw:function(){var s=this.r
return s==null?"":s},
-ayP:function(a,b){var s,r,q,p,o,n
-for(s=0,r=0;C.d.iZ(b,"../",r);){r+=3;++s}q=C.d.pL(a,"/")
+ayT:function(a,b){var s,r,q,p,o,n
+for(s=0,r=0;C.d.iX(b,"../",r);){r+=3;++s}q=C.d.pL(a,"/")
while(!0){if(!(q>0&&s>0))break
p=C.d.IT(a,"/",q-1)
if(p<0)break
o=q-p
n=o!==2
-if(!n||o===3)if(C.d.d3(a,p+1)===46)n=!n||C.d.d3(a,p+2)===46
+if(!n||o===3)if(C.d.d1(a,p+1)===46)n=!n||C.d.d1(a,p+2)===46
else n=!1
else n=!1
if(n)break;--s
-q=p}return C.d.pW(a,q+1,null,C.d.eD(b,r-3*s))},
-bL:function(a){return this.Da(P.iY(a,0,null))},
-Da:function(a){var s,r,q,p,o,n,m,l,k,j=this,i=null
+q=p}return C.d.pW(a,q+1,null,C.d.eA(b,r-3*s))},
+bL:function(a){return this.D9(P.iY(a,0,null))},
+D9:function(a){var s,r,q,p,o,n,m,l,k,j=this,i=null
if(a.ghT().length!==0){s=a.ghT()
-if(a.gCj()){r=a.gzm()
-q=a.goD(a)
-p=a.gyB()?a.grd(a):i}else{p=i
+if(a.gCi()){r=a.gzk()
+q=a.goE(a)
+p=a.gyz()?a.grd(a):i}else{p=i
q=p
-r=""}o=P.OC(a.ghO(a))
-n=a.gyC()?a.grg(a):i}else{s=j.a
-if(a.gCj()){r=a.gzm()
-q=a.goD(a)
-p=P.cOR(a.gyB()?a.grd(a):i,s)
-o=P.OC(a.ghO(a))
-n=a.gyC()?a.grg(a):i}else{r=j.b
+r=""}o=P.OG(a.ghO(a))
+n=a.gyA()?a.grg(a):i}else{s=j.a
+if(a.gCi()){r=a.gzk()
+q=a.goE(a)
+p=P.cOe(a.gyz()?a.grd(a):i,s)
+o=P.OG(a.ghO(a))
+n=a.gyA()?a.grg(a):i}else{r=j.b
q=j.c
p=j.d
if(a.ghO(a)===""){o=j.e
-n=a.gyC()?a.grg(a):j.f}else{if(a.gSY())o=P.OC(a.ghO(a))
+n=a.gyA()?a.grg(a):j.f}else{if(a.gSX())o=P.OG(a.ghO(a))
else{m=j.e
-if(m.length===0)if(q==null)o=s.length===0?a.ghO(a):P.OC(a.ghO(a))
-else o=P.OC("/"+a.ghO(a))
-else{l=j.ayP(m,a.ghO(a))
+if(m.length===0)if(q==null)o=s.length===0?a.ghO(a):P.OG(a.ghO(a))
+else o=P.OG("/"+a.ghO(a))
+else{l=j.ayT(m,a.ghO(a))
k=s.length===0
-if(!k||q!=null||C.d.dK(m,"/"))o=P.OC(l)
-else o=P.cOT(l,!k||q!=null)}}n=a.gyC()?a.grg(a):i}}}return new P.EJ(s,r,q,p,o,n,a.gT_()?a.gyy():i)},
-ga9i:function(){return this.a.length!==0},
-gCj:function(){return this.c!=null},
-gyB:function(){return this.d!=null},
-gyC:function(){return this.f!=null},
-gT_:function(){return this.r!=null},
-gSY:function(){return C.d.dK(this.e,"/")},
-Vz:function(){var s,r=this,q=r.a
+if(!k||q!=null||C.d.dK(m,"/"))o=P.OG(l)
+else o=P.cOg(l,!k||q!=null)}}n=a.gyA()?a.grg(a):i}}}return new P.EJ(s,r,q,p,o,n,a.gSZ()?a.gyw():i)},
+ga9m:function(){return this.a.length!==0},
+gCi:function(){return this.c!=null},
+gyz:function(){return this.d!=null},
+gyA:function(){return this.f!=null},
+gSZ:function(){return this.r!=null},
+gSX:function(){return C.d.dK(this.e,"/")},
+Vy:function(){var s,r=this,q=r.a
if(q!==""&&q!=="file")throw H.d(P.z("Cannot extract a file path from a "+q+" URI"))
if(r.grg(r)!=="")throw H.d(P.z(u.z))
-if(r.gyy()!=="")throw H.d(P.z(u.A))
-q=$.cR8()
-if(q)q=P.cYX(r)
-else{if(r.c!=null&&r.goD(r)!=="")H.b(P.z(u.Q))
+if(r.gyw()!=="")throw H.d(P.z(u.A))
+q=$.cQy()
+if(q)q=P.cYn(r)
+else{if(r.c!=null&&r.goE(r)!=="")H.b(P.z(u.Q))
s=r.gnK()
-P.djE(s,!1)
-q=P.auM(C.d.dK(r.e,"/")?"/":"",s,"/")
+P.dj1(s,!1)
+q=P.auP(C.d.dK(r.e,"/")?"/":"",s,"/")
q=q.charCodeAt(0)==0?q:q}return q},
-j:function(a){return this.ga4B()},
+j:function(a){return this.ga4F()},
B:function(a,b){var s=this
if(b==null)return!1
if(s===b)return!0
-return t.Xu.b(b)&&s.a===b.ghT()&&s.c!=null===b.gCj()&&s.b===b.gzm()&&s.goD(s)===b.goD(b)&&s.grd(s)===b.grd(b)&&s.e===b.ghO(b)&&s.f!=null===b.gyC()&&s.grg(s)===b.grg(b)&&s.r!=null===b.gT_()&&s.gyy()===b.gyy()},
-$inc:1,
+return t.Xu.b(b)&&s.a===b.ghT()&&s.c!=null===b.gCi()&&s.b===b.gzk()&&s.goE(s)===b.goE(b)&&s.grd(s)===b.grd(b)&&s.e===b.ghO(b)&&s.f!=null===b.gyA()&&s.grg(s)===b.grg(b)&&s.r!=null===b.gSZ()&&s.gyw()===b.gyw()},
+$inb:1,
ghT:function(){return this.a},
ghO:function(a){return this.e}}
-P.c5G.prototype={
-$1:function(a){return P.qa(C.ag3,a,C.aS,!1)},
-$S:133}
-P.avF.prototype={
-goX:function(){var s,r,q,p,o=this,n=null,m=o.c
+P.c5o.prototype={
+$1:function(a){return P.q8(C.ag3,a,C.aS,!1)},
+$S:132}
+P.avI.prototype={
+goY:function(){var s,r,q,p,o=this,n=null,m=o.c
if(m==null){m=o.a
s=o.b[0]+1
-r=C.d.io(m,"?",s)
+r=C.d.il(m,"?",s)
q=m.length
-if(r>=0){p=P.acx(m,r+1,q,C.o2,!1)
+if(r>=0){p=P.acB(m,r+1,q,C.o2,!1)
q=r}else p=n
-m=o.c=new P.aBc("data","",n,n,P.acx(m,s,q,C.O2,!1),p,n)}return m},
+m=o.c=new P.aBf("data","",n,n,P.acB(m,s,q,C.O2,!1),p,n)}return m},
j:function(a){var s=this.a
return this.b[0]===-1?"data:"+s:s}}
-P.cdb.prototype={
+P.ccK.prototype={
$1:function(a){return new Uint8Array(96)},
-$S:1840}
-P.cda.prototype={
+$S:1634}
+P.ccJ.prototype={
$2:function(a,b){var s=this.a[a]
-J.d95(s,0,96,b)
+J.d8s(s,0,96,b)
return s},
-$S:2002}
-P.cdc.prototype={
+$S:1644}
+P.ccL.prototype={
$3:function(a,b,c){var s,r
-for(s=b.length,r=0;r>>0]=c},
-$S:498}
-P.q9.prototype={
-ga9i:function(){return this.b>0},
-gCj:function(){return this.c>0},
-gyB:function(){return this.c>0&&this.d+1>>0]=c},
+$S:431}
+P.q7.prototype={
+ga9m:function(){return this.b>0},
+gCi:function(){return this.c>0},
+gyz:function(){return this.c>0&&this.d+1r?C.d.b2(this.a,r,s-1):""},
-goD:function(a){var s=this.c
-return s>0?C.d.b2(this.a,s,this.d):""},
+return C.d.b3(s.a,0,r)},
+gzk:function(){var s=this.c,r=this.b+3
+return s>r?C.d.b3(this.a,r,s-1):""},
+goE:function(a){var s=this.c
+return s>0?C.d.b3(this.a,s,this.d):""},
grd:function(a){var s=this
-if(s.gyB())return P.h0(C.d.b2(s.a,s.d+1,s.e),null)
-if(s.gOp())return 80
-if(s.gOq())return 443
+if(s.gyz())return P.h0(C.d.b3(s.a,s.d+1,s.e),null)
+if(s.gOo())return 80
+if(s.gOp())return 443
return 0},
-ghO:function(a){return C.d.b2(this.a,this.e,this.f)},
+ghO:function(a){return C.d.b3(this.a,this.e,this.f)},
grg:function(a){var s=this.f,r=this.r
-return s=q.length)return s
-return new P.q9(C.d.b2(q,0,r),s.b,s.c,s.d,s.e,s.f,r,s.x)},
-bL:function(a){return this.Da(P.iY(a,0,null))},
-Da:function(a){if(a instanceof P.q9)return this.aCT(this,a)
-return this.a4P().Da(a)},
-aCT:function(a,b){var s,r,q,p,o,n,m,l,k,j,i,h,g=b.b
+return new P.q7(C.d.b3(q,0,r),s.b,s.c,s.d,s.e,s.f,r,s.x)},
+bL:function(a){return this.D9(P.iY(a,0,null))},
+D9:function(a){if(a instanceof P.q7)return this.aCZ(this,a)
+return this.a4T().D9(a)},
+aCZ:function(a,b){var s,r,q,p,o,n,m,l,k,j,i,h,g=b.b
if(g>0)return b
s=b.c
if(s>0){r=a.b
if(r<=0)return b
-if(a.gOo())q=b.e!==b.f
-else if(a.gOp())q=!b.a1D("80")
-else q=!a.gOq()||!b.a1D("443")
+if(a.gOn())q=b.e!==b.f
+else if(a.gOo())q=!b.a1D("80")
+else q=!a.gOp()||!b.a1D("443")
if(q){p=r+1
-return new P.q9(C.d.b2(a.a,0,p)+C.d.eD(b.a,g+1),r,s+p,b.d+p,b.e+p,b.f+p,b.r+p,a.x)}else return this.a4P().Da(b)}o=b.e
+return new P.q7(C.d.b3(a.a,0,p)+C.d.eA(b.a,g+1),r,s+p,b.d+p,b.e+p,b.f+p,b.r+p,a.x)}else return this.a4T().D9(b)}o=b.e
g=b.f
if(o===g){s=b.r
if(g0){for(;C.d.iZ(s,"../",o);)o+=3
+if(n===m&&a.c>0){for(;C.d.iX(s,"../",o);)o+=3
p=n-o+1
-return new P.q9(C.d.b2(a.a,0,n)+"/"+C.d.eD(s,o),a.b,a.c,a.d,n,g+p,b.r+p,a.x)}l=a.a
-for(k=n;C.d.iZ(l,"../",k);)k+=3
+return new P.q7(C.d.b3(a.a,0,n)+"/"+C.d.eA(s,o),a.b,a.c,a.d,n,g+p,b.r+p,a.x)}l=a.a
+for(k=n;C.d.iX(l,"../",k);)k+=3
j=0
while(!0){i=o+3
-if(!(i<=g&&C.d.iZ(s,"../",o)))break;++j
+if(!(i<=g&&C.d.iX(s,"../",o)))break;++j
o=i}for(h="";m>k;){--m
-if(C.d.d3(l,m)===47){if(j===0){h="/"
+if(C.d.d1(l,m)===47){if(j===0){h="/"
break}--j
-h="/"}}if(m===k&&a.b<=0&&!C.d.iZ(l,"/",n)){o-=j*3
+h="/"}}if(m===k&&a.b<=0&&!C.d.iX(l,"/",n)){o-=j*3
h=""}p=m-o+h.length
-return new P.q9(C.d.b2(l,0,m)+h+C.d.eD(s,o),a.b,a.c,a.d,n,g+p,b.r+p,a.x)},
-Vz:function(){var s,r,q,p=this
-if(p.b>=0&&!p.gOo())throw H.d(P.z("Cannot extract a file path from a "+p.ghT()+" URI"))
+return new P.q7(C.d.b3(l,0,m)+h+C.d.eA(s,o),a.b,a.c,a.d,n,g+p,b.r+p,a.x)},
+Vy:function(){var s,r,q,p=this
+if(p.b>=0&&!p.gOn())throw H.d(P.z("Cannot extract a file path from a "+p.ghT()+" URI"))
s=p.f
r=p.a
if(s0?s.goD(s):r,n=s.gyB()?s.grd(s):r,m=s.a,l=s.f,k=C.d.b2(m,s.e,l),j=s.r
+a4T:function(){var s=this,r=null,q=s.ghT(),p=s.gzk(),o=s.c>0?s.goE(s):r,n=s.gyz()?s.grd(s):r,m=s.a,l=s.f,k=C.d.b3(m,s.e,l),j=s.r
l=l>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a[b]},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -64572,13 +64490,13 @@ $ibf:1,
$idF:1,
$iP:1,
$iD:1}
-W.a_m.prototype={
+W.a_o.prototype={
j:function(a){var s,r=a.left
r.toString
r="Rectangle ("+H.f(r)+", "
s=a.top
s.toString
-return r+H.f(s)+") "+H.f(this.geI(a))+" x "+H.f(this.gey(a))},
+return r+H.f(s)+") "+H.f(this.geF(a))+" x "+H.f(this.gew(a))},
B:function(a,b){var s,r
if(b==null)return!1
if(t.Bb.b(b)){s=a.left
@@ -64586,19 +64504,19 @@ s.toString
r=J.aK(b)
if(s===r.gvE(b)){s=a.top
s.toString
-s=s===r.gro(b)&&this.geI(a)==r.geI(b)&&this.gey(a)==r.gey(b)}else s=!1}else s=!1
+s=s===r.gro(b)&&this.geF(a)==r.geF(b)&&this.gew(a)==r.gew(b)}else s=!1}else s=!1
return s},
gG:function(a){var s,r=a.left
r.toString
r=C.l.gG(r)
s=a.top
s.toString
-return W.cYl(r,C.l.gG(s),J.h(this.geI(a)),J.h(this.gey(a)))},
-gQP:function(a){var s=a.bottom
+return W.cXM(r,C.l.gG(s),J.h(this.geF(a)),J.h(this.gew(a)))},
+gQO:function(a){var s=a.bottom
s.toString
return s},
ga1d:function(a){return a.height},
-gey:function(a){var s=this.ga1d(a)
+gew:function(a){var s=this.ga1d(a)
s.toString
return s},
gvE:function(a){var s=a.left
@@ -64610,18 +64528,18 @@ return s},
gro:function(a){var s=a.top
s.toString
return s},
-ga5E:function(a){return a.width},
-geI:function(a){var s=this.ga5E(a)
+ga5I:function(a){return a.width},
+geF:function(a){var s=this.ga5I(a)
s.toString
return s},
$ik5:1}
-W.ajR.prototype={
+W.ajU.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a[b]},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -64632,10 +64550,10 @@ $ibf:1,
$idF:1,
$iP:1,
$iD:1}
-W.aZe.prototype={
+W.aZ0.prototype={
gH:function(a){return a.length},
gw:function(a){return a.value}}
-W.aAf.prototype={
+W.aAi.prototype={
I:function(a,b){return J.js(this.b,b)},
gag:function(a){return this.a.firstElementChild==null},
gH:function(a){return this.b.length},
@@ -64644,147 +64562,147 @@ E:function(a,b,c){this.a.replaceChild(c,this.b[b])},
sH:function(a,b){throw H.d(P.z("Cannot resize element lists"))},
F:function(a,b){this.a.appendChild(b)
return b},
-gaH:function(a){var s=this.eN(this)
+gaJ:function(a){var s=this.eL(this)
return new J.c8(s,s.length,H.a0(s).h("c8<1>"))},
-V:function(a,b){W.did(this.a,b)},
+V:function(a,b){W.dhB(this.a,b)},
bY:function(a,b){throw H.d(P.z("Cannot sort element lists"))},
-l_:function(a,b){this.AC(0,b,!1)},
-pX:function(a,b){this.AC(0,b,!0)},
-AC:function(a,b,c){var s,r,q=this.a
-if(c){q=J.cM3(q)
-s=new H.ay(q,new W.bHE(b),H.F(q).h("ay"))}else{q=J.cM3(q)
-s=new H.ay(q,b,H.F(q).h("ay"))}for(q=J.a3(s.a),r=new H.nd(q,s.b,s.$ti.h("nd<1>"));r.t();)J.fJ(q.gC(q))},
-dS:function(a,b,c,d,e){throw H.d(P.ff(null))},
-fC:function(a,b,c,d){return this.dS(a,b,c,d,0)},
-P:function(a,b){return W.dif(this.a,b)},
+kZ:function(a,b){this.AA(0,b,!1)},
+pX:function(a,b){this.AA(0,b,!0)},
+AA:function(a,b,c){var s,r,q=this.a
+if(c){q=J.cLr(q)
+s=new H.az(q,new W.bHk(b),H.F(q).h("az"))}else{q=J.cLr(q)
+s=new H.az(q,b,H.F(q).h("az"))}for(q=J.a2(s.a),r=new H.nc(q,s.b,s.$ti.h("nc<1>"));r.t();)J.fJ(q.gC(q))},
+dT:function(a,b,c,d,e){throw H.d(P.fg(null))},
+fC:function(a,b,c,d){return this.dT(a,b,c,d,0)},
+O:function(a,b){return W.dhD(this.a,b)},
hg:function(a,b,c){var s,r,q=this
if(b<0||b>q.b.length)throw H.d(P.ee(b,0,q.gH(q),null,null))
s=q.b
r=q.a
if(b===s.length)r.appendChild(c)
else r.insertBefore(c,t.lU.a(s[b]))},
-f1:function(a,b){var s=t.lU.a(this.b[b])
+f2:function(a,b){var s=t.lU.a(this.b[b])
this.a.removeChild(s)
return s},
kq:function(a){var s=this.gaS(this)
this.a.removeChild(s)
return s},
-ga5:function(a){return W.die(this.a)},
+ga4:function(a){return W.dhC(this.a)},
gaS:function(a){var s=this.a.lastElementChild
if(s==null)throw H.d(P.bg("No elements"))
return s}}
-W.bHE.prototype={
+W.bHk.prototype={
$1:function(a){return!this.a.$1(a)},
-$S:1886}
-W.Om.prototype={
+$S:2053}
+W.Op.prototype={
gH:function(a){return this.a.length},
i:function(a,b){return this.$ti.c.a(this.a[b])},
E:function(a,b,c){throw H.d(P.z("Cannot modify list"))},
sH:function(a,b){throw H.d(P.z("Cannot modify list"))},
bY:function(a,b){throw H.d(P.z("Cannot sort list"))},
-ga5:function(a){return this.$ti.c.a(C.Po.ga5(this.a))},
+ga4:function(a){return this.$ti.c.a(C.Po.ga4(this.a))},
gaS:function(a){return this.$ti.c.a(C.Po.gaS(this.a))}}
-W.cC.prototype={
-gaGi:function(a){return new W.a90(a)},
-gBI:function(a){return new W.aAf(a,a.children)},
-geF:function(a){var s,r=a.clientLeft
+W.cD.prototype={
+gaGo:function(a){return new W.a93(a)},
+gBH:function(a){return new W.aAi(a,a.children)},
+geH:function(a){var s,r=a.clientLeft
r.toString
s=a.clientTop
s.toString
return P.jI(r,s,a.clientWidth,a.clientHeight,t.Jy)},
j:function(a){return a.localName},
pv:function(a,b,c,d){var s,r,q,p
-if(c==null){s=$.cTr
+if(c==null){s=$.cSR
if(s==null){s=H.a([],t.qF)
-r=new W.a2h(s)
-s.push(W.cYh(null))
-s.push(W.cYD())
-$.cTr=r
+r=new W.a2j(s)
+s.push(W.cXI(null))
+s.push(W.cY3())
+$.cSR=r
d=r}else d=s
-s=$.cTq
-if(s==null){s=new W.aIJ(d)
-$.cTq=s
+s=$.cSQ
+if(s==null){s=new W.aIM(d)
+$.cSQ=s
c=s}else{s.a=d
-c=s}}if($.Ab==null){s=document
+c=s}}if($.Aa==null){s=document
r=s.implementation.createHTMLDocument("")
-$.Ab=r
-$.cMQ=r.createRange()
-r=$.Ab.createElement("base")
+$.Aa=r
+$.cMd=r.createRange()
+r=$.Aa.createElement("base")
t.N3.a(r)
s=s.baseURI
s.toString
r.href=s
-$.Ab.head.appendChild(r)}s=$.Ab
+$.Aa.head.appendChild(r)}s=$.Aa
if(s.body==null){r=s.createElement("body")
-s.body=t.C4.a(r)}s=$.Ab
+s.body=t.C4.a(r)}s=$.Aa
if(t.C4.b(a)){s=s.body
s.toString
q=s}else{s.toString
q=s.createElement(a.tagName)
-$.Ab.body.appendChild(q)}if("createContextualFragment" in window.Range.prototype&&!C.b.I(C.adc,a.tagName)){$.cMQ.selectNodeContents(q)
-s=$.cMQ
+$.Aa.body.appendChild(q)}if("createContextualFragment" in window.Range.prototype&&!C.b.I(C.add,a.tagName)){$.cMd.selectNodeContents(q)
+s=$.cMd
s.toString
p=s.createContextualFragment(b==null?"null":b)}else{q.innerHTML=b
-p=$.Ab.createDocumentFragment()
-for(;s=q.firstChild,s!=null;)p.appendChild(s)}if(q!==$.Ab.body)J.fJ(q)
+p=$.Aa.createDocumentFragment()
+for(;s=q.firstChild,s!=null;)p.appendChild(s)}if(q!==$.Aa.body)J.fJ(q)
c.KU(p)
document.adoptNode(p)
return p},
-aIh:function(a,b,c){return this.pv(a,b,c,null)},
-Xc:function(a,b){a.textContent=null
+aIn:function(a,b,c){return this.pv(a,b,c,null)},
+Xb:function(a,b){a.textContent=null
a.appendChild(this.pv(a,b,null,null))},
-aKH:function(a){return a.focus()},
+aKN:function(a){return a.focus()},
ga_:function(a){return a.id},
-gacR:function(a){return a.tagName},
-$icC:1}
-W.aZO.prototype={
+gacV:function(a){return a.tagName},
+$icD:1}
+W.aZA.prototype={
$1:function(a){return t.lU.b(a)},
-$S:398}
-W.ak7.prototype={
-gaW:function(a){return a.name}}
-W.a_C.prototype={
-gaW:function(a){return a.name},
-axt:function(a,b,c){return a.remove(H.ml(b,0),H.ml(c,1))},
+$S:399}
+W.aka.prototype={
+gaX:function(a){return a.name}}
+W.a_E.prototype={
+gaX:function(a){return a.name},
+axx:function(a,b,c){return a.remove(H.ml(b,0),H.ml(c,1))},
h7:function(a){var s=new P.aC($.aG,t.LR),r=new P.b6(s,t.zh)
-this.axt(a,new W.b_M(r),new W.b_N(r))
+this.axx(a,new W.b_w(r),new W.b_x(r))
return s}}
-W.b_M.prototype={
+W.b_w.prototype={
$0:function(){this.a.fF(0)},
$C:"$0",
$R:0,
$S:0}
-W.b_N.prototype={
-$1:function(a){this.a.aB(a)},
-$S:1868}
+W.b_x.prototype={
+$1:function(a){this.a.aC(a)},
+$S:1886}
W.bP.prototype={
-gmq:function(a){return W.ccp(a.target)},
-giI:function(a){return a.type},
+gmq:function(a){return W.cbY(a.target)},
+giG:function(a){return a.type},
a1j:function(a,b,c,d){return a.initEvent(b,!0,!0)},
-abP:function(a){return a.preventDefault()},
+abT:function(a){return a.preventDefault()},
$ibP:1}
W.ba.prototype={
-Br:function(a,b,c,d){if(c!=null)this.anR(a,b,c,d)},
-tb:function(a,b,c){return this.Br(a,b,c,null)},
-aco:function(a,b,c,d){if(c!=null)this.aBt(a,b,c,d)},
-JT:function(a,b,c){return this.aco(a,b,c,null)},
-anR:function(a,b,c,d){return a.addEventListener(b,H.ml(c,1),d)},
-aBt:function(a,b,c,d){return a.removeEventListener(b,H.ml(c,1),d)},
+Bp:function(a,b,c,d){if(c!=null)this.anV(a,b,c,d)},
+tb:function(a,b,c){return this.Bp(a,b,c,null)},
+acs:function(a,b,c,d){if(c!=null)this.aBz(a,b,c,d)},
+JT:function(a,b,c){return this.acs(a,b,c,null)},
+anV:function(a,b,c,d){return a.addEventListener(b,H.ml(c,1),d)},
+aBz:function(a,b,c,d){return a.removeEventListener(b,H.ml(c,1),d)},
$iba:1}
W.l2.prototype={}
-W.b27.prototype={
-gaW:function(a){return a.name}}
-W.aky.prototype={
-gaW:function(a){return a.name}}
-W.lM.prototype={
-gaW:function(a){return a.name},
-$ilM:1}
-W.Rn.prototype={
+W.b1Z.prototype={
+gaX:function(a){return a.name}}
+W.akB.prototype={
+gaX:function(a){return a.name}}
+W.lN.prototype={
+gaX:function(a){return a.name},
+$ilN:1}
+W.Rr.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a[b]},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -64795,36 +64713,36 @@ $ibf:1,
$idF:1,
$iP:1,
$iD:1,
-$iRn:1}
-W.a_T.prototype={
-gVm:function(a){var s=a.result
-if(t.pI.b(s))return H.hR(s,0,null)
+$iRr:1}
+W.a_V.prototype={
+gVl:function(a){var s=a.result
+if(t.pI.b(s))return H.hP(s,0,null)
return s}}
-W.b2f.prototype={
-gaW:function(a){return a.name}}
-W.akB.prototype={
+W.b26.prototype={
+gaX:function(a){return a.name}}
+W.akE.prototype={
gH:function(a){return a.length}}
-W.IY.prototype={$iIY:1}
-W.al3.prototype={
+W.IZ.prototype={$iIZ:1}
+W.al6.prototype={
L:function(a,b){return a.forEach(H.ml(b,3))}}
-W.wp.prototype={
+W.wq.prototype={
gH:function(a){return a.length},
-gaW:function(a){return a.name},
-$iwp:1}
+gaX:function(a){return a.name},
+$iwq:1}
W.ok.prototype={
ga_:function(a){return a.id},
$iok:1}
-W.b3k.prototype={
+W.b3b.prototype={
gw:function(a){return a.value}}
-W.b5k.prototype={
+W.b5a.prototype={
gH:function(a){return a.length}}
-W.Jj.prototype={
+W.Jk.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a[b]},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -64835,10 +64753,10 @@ $ibf:1,
$idF:1,
$iP:1,
$iD:1}
-W.alt.prototype={
+W.alw.prototype={
ghB:function(a){return a.body}}
W.r1.prototype={
-gaQz:function(a){var s,r,q,p,o,n,m,l=t.N,k=P.ab(l,l),j=a.getAllResponseHeaders()
+gaQF:function(a){var s,r,q,p,o,n,m,l=t.N,k=P.ab(l,l),j=a.getAllResponseHeaders()
if(j==null)return k
s=j.split("\r\n")
for(l=s.length,r=0;r=200&&o<300
r=o>307&&o<400
o=s||o===0||o===304||r
q=this.b
-if(o)q.al(0,p)
-else q.aB(a)},
-$S:1825}
-W.Jl.prototype={}
-W.Jn.prototype={
-gaW:function(a){return a.name},
-$iJn:1}
-W.a0q.prototype={$ia0q:1}
-W.Js.prototype={$iJs:1}
-W.JB.prototype={
-gaW:function(a){return a.name},
+if(o)q.am(0,p)
+else q.aC(a)},
+$S:1867}
+W.Jm.prototype={}
+W.Jo.prototype={
+gaX:function(a){return a.name},
+$iJo:1}
+W.a0s.prototype={$ia0s:1}
+W.Jt.prototype={$iJt:1}
+W.JC.prototype={
+gaX:function(a){return a.name},
gw:function(a){return a.value},
-$iJB:1}
-W.wH.prototype={
+$iJC:1}
+W.wI.prototype={
ghr:function(a){return a.key},
-$iwH:1}
-W.am2.prototype={
+$iwI:1}
+W.am5.prototype={
gw:function(a){return a.value}}
-W.a0Y.prototype={}
-W.anw.prototype={
+W.a1_.prototype={}
+W.anz.prototype={
gJv:function(a){if("origin" in a)return a.origin
return H.f(a.protocol)+"//"+H.f(a.host)},
j:function(a){return String(a)}}
-W.anB.prototype={
-gaW:function(a){return a.name}}
-W.apA.prototype={
-h7:function(a){return P.vu(a.remove(),t.z)}}
-W.bee.prototype={
+W.anE.prototype={
+gaX:function(a){return a.name}}
+W.apD.prototype={
+h7:function(a){return P.vv(a.remove(),t.z)}}
+W.be0.prototype={
gH:function(a){return a.length}}
-W.a2_.prototype={
+W.a21.prototype={
dw:function(a,b){return a.addListener(H.ml(b,1))},
-aj:function(a,b){return a.removeListener(H.ml(b,1))}}
-W.Su.prototype={$iSu:1}
-W.apC.prototype={
+ak:function(a,b){return a.removeListener(H.ml(b,1))}}
+W.Sy.prototype={$iSy:1}
+W.apF.prototype={
ga_:function(a){return a.id}}
-W.Sv.prototype={
+W.Sz.prototype={
ga_:function(a){return a.id}}
-W.Sx.prototype={
-Br:function(a,b,c,d){if(b==="message")a.start()
-this.air(a,b,c,!1)},
-$iSx:1}
-W.Bm.prototype={
-gaW:function(a){return a.name},
-$iBm:1}
-W.apE.prototype={
-gw:function(a){return a.value}}
+W.SB.prototype={
+Bp:function(a,b,c,d){if(b==="message")a.start()
+this.aiv(a,b,c,!1)},
+$iSB:1}
+W.Bl.prototype={
+gaX:function(a){return a.name},
+$iBl:1}
W.apH.prototype={
+gw:function(a){return a.value}}
+W.apK.prototype={
V:function(a,b){throw H.d(P.z("Not supported"))},
-aP:function(a,b){return P.qc(a.get(b))!=null},
-i:function(a,b){return P.qc(a.get(b))},
+aN:function(a,b){return P.qa(a.get(b))!=null},
+i:function(a,b){return P.qa(a.get(b))},
L:function(a,b){var s,r=a.entries()
for(;!0;){s=r.next()
if(s.done)return
-b.$2(s.value[0],P.qc(s.value[1]))}},
+b.$2(s.value[0],P.qa(s.value[1]))}},
gah:function(a){var s=H.a([],t.s)
-this.L(a,new W.beY(s))
+this.L(a,new W.beK(s))
return s},
gdY:function(a){var s=H.a([],t.n4)
-this.L(a,new W.beZ(s))
+this.L(a,new W.beL(s))
return s},
gH:function(a){return a.size},
gag:function(a){return a.size===0},
gca:function(a){return a.size!==0},
E:function(a,b,c){throw H.d(P.z("Not supported"))},
-eH:function(a,b,c){throw H.d(P.z("Not supported"))},
-P:function(a,b){throw H.d(P.z("Not supported"))},
+eE:function(a,b,c){throw H.d(P.z("Not supported"))},
+O:function(a,b){throw H.d(P.z("Not supported"))},
cq:function(a){throw H.d(P.z("Not supported"))},
$ibr:1}
-W.beY.prototype={
+W.beK.prototype={
$2:function(a,b){return this.a.push(a)},
-$S:118}
-W.beZ.prototype={
+$S:113}
+W.beL.prototype={
$2:function(a,b){return this.a.push(b)},
-$S:118}
-W.apI.prototype={
+$S:113}
+W.apL.prototype={
V:function(a,b){throw H.d(P.z("Not supported"))},
-aP:function(a,b){return P.qc(a.get(b))!=null},
-i:function(a,b){return P.qc(a.get(b))},
+aN:function(a,b){return P.qa(a.get(b))!=null},
+i:function(a,b){return P.qa(a.get(b))},
L:function(a,b){var s,r=a.entries()
for(;!0;){s=r.next()
if(s.done)return
-b.$2(s.value[0],P.qc(s.value[1]))}},
+b.$2(s.value[0],P.qa(s.value[1]))}},
gah:function(a){var s=H.a([],t.s)
-this.L(a,new W.bf_(s))
+this.L(a,new W.beM(s))
return s},
gdY:function(a){var s=H.a([],t.n4)
-this.L(a,new W.bf0(s))
+this.L(a,new W.beN(s))
return s},
gH:function(a){return a.size},
gag:function(a){return a.size===0},
gca:function(a){return a.size!==0},
E:function(a,b,c){throw H.d(P.z("Not supported"))},
-eH:function(a,b,c){throw H.d(P.z("Not supported"))},
-P:function(a,b){throw H.d(P.z("Not supported"))},
+eE:function(a,b,c){throw H.d(P.z("Not supported"))},
+O:function(a,b){throw H.d(P.z("Not supported"))},
cq:function(a){throw H.d(P.z("Not supported"))},
$ibr:1}
-W.bf_.prototype={
+W.beM.prototype={
$2:function(a,b){return this.a.push(a)},
-$S:118}
-W.bf0.prototype={
+$S:113}
+W.beN.prototype={
$2:function(a,b){return this.a.push(b)},
-$S:118}
-W.L7.prototype={
+$S:113}
+W.L8.prototype={
ga_:function(a){return a.id},
-gaW:function(a){return a.name}}
+gaX:function(a){return a.name}}
W.ot.prototype={$iot:1}
-W.apJ.prototype={
+W.apM.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a[b]},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -64986,13 +64904,13 @@ $idF:1,
$iP:1,
$iD:1}
W.ov.prototype={
-geF:function(a){return new P.bS(a.clientX,a.clientY,t.OB)},
+geH:function(a){return new P.bS(a.clientX,a.clientY,t.OB)},
gfi:function(a){var s,r,q,p,o,n,m
if(!!a.offsetX)return new P.bS(a.offsetX,a.offsetY,t.OB)
else{s=a.target
r=t.lU
-if(!r.b(W.ccp(s)))throw H.d(P.z("offsetX is only supported on elements"))
-q=r.a(W.ccp(s))
+if(!r.b(W.cbY(s)))throw H.d(P.z("offsetX is only supported on elements"))
+q=r.a(W.cbY(s))
s=a.clientX
r=a.clientY
p=t.OB
@@ -65004,14 +64922,14 @@ o.toString
m=new P.bS(s,r,p).bl(0,new P.bS(n,o,p))
return new P.bS(J.jV(m.a),J.jV(m.b),p)}},
$iov:1}
-W.bfJ.prototype={
-glA:function(a){return a.vendor},
+W.bfv.prototype={
+glZ:function(a){return a.vendor},
gmo:function(a){return a.product}}
-W.a2f.prototype={}
-W.bfU.prototype={
-gaW:function(a){return a.name}}
+W.a2h.prototype={}
+W.bfG.prototype={
+gaX:function(a){return a.name}}
W.jR.prototype={
-ga5:function(a){var s=this.a.firstChild
+ga4:function(a){var s=this.a.firstChild
if(s==null)throw H.d(P.bg("No elements"))
return s},
gaS:function(a){var s=this.a.lastChild
@@ -65029,7 +64947,7 @@ if(b instanceof W.jR){s=b.a
r=this.a
if(s!==r)for(q=s.childNodes.length,p=0;pq.a.childNodes.length)throw H.d(P.ee(b,0,q.gH(q),null,null))
s=q.a
@@ -65039,44 +64957,44 @@ else s.insertBefore(c,r[b])},
kq:function(a){var s=this.gaS(this)
this.a.removeChild(s)
return s},
-f1:function(a,b){var s=this.a,r=s.childNodes[b]
+f2:function(a,b){var s=this.a,r=s.childNodes[b]
s.removeChild(r)
return r},
-P:function(a,b){return!1},
-AC:function(a,b,c){var s,r=this.a,q=r.firstChild
+O:function(a,b){return!1},
+AA:function(a,b,c){var s,r=this.a,q=r.firstChild
for(;q!=null;q=s){s=q.nextSibling
if(J.j(b.$1(q),c))r.removeChild(q)}},
-l_:function(a,b){this.AC(0,b,!0)},
-pX:function(a,b){this.AC(0,b,!1)},
+kZ:function(a,b){this.AA(0,b,!0)},
+pX:function(a,b){this.AA(0,b,!1)},
E:function(a,b,c){var s=this.a
s.replaceChild(c,s.childNodes[b])},
-gaH:function(a){var s=this.a.childNodes
-return new W.Rp(s,s.length,H.c2(s).h("Rp"))},
+gaJ:function(a){var s=this.a.childNodes
+return new W.Rt(s,s.length,H.c2(s).h("Rt"))},
bY:function(a,b){throw H.d(P.z("Cannot sort Node list"))},
-dS:function(a,b,c,d,e){throw H.d(P.z("Cannot setRange on Node list"))},
-fC:function(a,b,c,d){return this.dS(a,b,c,d,0)},
+dT:function(a,b,c,d,e){throw H.d(P.z("Cannot setRange on Node list"))},
+fC:function(a,b,c,d){return this.dT(a,b,c,d,0)},
gH:function(a){return this.a.childNodes.length},
sH:function(a,b){throw H.d(P.z("Cannot set length on immutable List."))},
i:function(a,b){return this.a.childNodes[b]}}
-W.bL.prototype={
+W.bM.prototype={
h7:function(a){var s=a.parentNode
if(s!=null)s.removeChild(a)},
-aQq:function(a,b){var s,r,q
+aQw:function(a,b){var s,r,q
try{r=a.parentNode
r.toString
s=r
-J.d8J(s,b,a)}catch(q){H.J(q)}return a},
+J.d85(s,b,a)}catch(q){H.K(q)}return a},
j:function(a){var s=a.nodeValue
-return s==null?this.aiy(a):s},
-aBw:function(a,b,c){return a.replaceChild(b,c)},
-$ibL:1}
-W.SF.prototype={
+return s==null?this.aiC(a):s},
+aBC:function(a,b,c){return a.replaceChild(b,c)},
+$ibM:1}
+W.SJ.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a[b]},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -65087,40 +65005,40 @@ $ibf:1,
$idF:1,
$iP:1,
$iD:1}
-W.aq1.prototype={
+W.aq4.prototype={
ghB:function(a){return a.body}}
-W.aqa.prototype={
-gaW:function(a){return a.name}}
W.aqd.prototype={
+gaX:function(a){return a.name}}
+W.aqg.prototype={
gw:function(a){return a.value}}
-W.aqk.prototype={
-gaW:function(a){return a.name},
+W.aqn.prototype={
+gaX:function(a){return a.name},
gw:function(a){return a.value}}
-W.bgm.prototype={
-gaW:function(a){return a.name}}
-W.a2B.prototype={}
-W.aqJ.prototype={
-gaW:function(a){return a.name},
+W.bgd.prototype={
+gaX:function(a){return a.name}}
+W.a2D.prototype={}
+W.aqM.prototype={
+gaX:function(a){return a.name},
gw:function(a){return a.value}}
-W.bgK.prototype={
-gaW:function(a){return a.name}}
-W.aqP.prototype={
+W.bgB.prototype={
+gaX:function(a){return a.name}}
+W.aqS.prototype={
ga_:function(a){return a.id}}
W.uj.prototype={
-gaW:function(a){return a.name}}
-W.biA.prototype={
-gaW:function(a){return a.name}}
+gaX:function(a){return a.name}}
+W.bir.prototype={
+gaX:function(a){return a.name}}
W.oC.prototype={
gH:function(a){return a.length},
-gaW:function(a){return a.name},
+gaX:function(a){return a.name},
$ioC:1}
-W.ar8.prototype={
+W.arb.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a[b]},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -65132,65 +65050,65 @@ $idF:1,
$iP:1,
$iD:1}
W.rj.prototype={$irj:1}
-W.arf.prototype={
+W.ari.prototype={
gw:function(a){return a.value}}
-W.arg.prototype={
+W.arj.prototype={
ga_:function(a){return a.id}}
-W.aro.prototype={
+W.arr.prototype={
gw:function(a){return a.value}}
W.le.prototype={$ile:1}
-W.bod.prototype={
+W.bo3.prototype={
ga_:function(a){return a.id}}
-W.a3R.prototype={
+W.a3U.prototype={
ga_:function(a){return a.id}}
-W.br8.prototype={
+W.br_.prototype={
ga_:function(a){return a.id}}
-W.at0.prototype={
+W.at3.prototype={
V:function(a,b){throw H.d(P.z("Not supported"))},
-aP:function(a,b){return P.qc(a.get(b))!=null},
-i:function(a,b){return P.qc(a.get(b))},
+aN:function(a,b){return P.qa(a.get(b))!=null},
+i:function(a,b){return P.qa(a.get(b))},
L:function(a,b){var s,r=a.entries()
for(;!0;){s=r.next()
if(s.done)return
-b.$2(s.value[0],P.qc(s.value[1]))}},
+b.$2(s.value[0],P.qa(s.value[1]))}},
gah:function(a){var s=H.a([],t.s)
-this.L(a,new W.br9(s))
+this.L(a,new W.br0(s))
return s},
gdY:function(a){var s=H.a([],t.n4)
-this.L(a,new W.bra(s))
+this.L(a,new W.br1(s))
return s},
gH:function(a){return a.size},
gag:function(a){return a.size===0},
gca:function(a){return a.size!==0},
E:function(a,b,c){throw H.d(P.z("Not supported"))},
-eH:function(a,b,c){throw H.d(P.z("Not supported"))},
-P:function(a,b){throw H.d(P.z("Not supported"))},
+eE:function(a,b,c){throw H.d(P.z("Not supported"))},
+O:function(a,b){throw H.d(P.z("Not supported"))},
cq:function(a){throw H.d(P.z("Not supported"))},
$ibr:1}
-W.br9.prototype={
+W.br0.prototype={
$2:function(a,b){return this.a.push(a)},
-$S:118}
-W.bra.prototype={
+$S:113}
+W.br1.prototype={
$2:function(a,b){return this.a.push(b)},
-$S:118}
-W.atG.prototype={
-aRi:function(a){return a.unlock()}}
-W.atO.prototype={
+$S:113}
+W.atJ.prototype={
+aRo:function(a){return a.unlock()}}
+W.atR.prototype={
gH:function(a){return a.length},
-gaW:function(a){return a.name},
+gaX:function(a){return a.name},
gw:function(a){return a.value}}
-W.au0.prototype={
-gaW:function(a){return a.name}}
-W.aum.prototype={
-gaW:function(a){return a.name}}
-W.n8.prototype={$in8:1}
-W.aus.prototype={
+W.au3.prototype={
+gaX:function(a){return a.name}}
+W.aup.prototype={
+gaX:function(a){return a.name}}
+W.n7.prototype={$in7:1}
+W.auv.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a[b]},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -65201,15 +65119,15 @@ $ibf:1,
$idF:1,
$iP:1,
$iD:1}
-W.Vl.prototype={$iVl:1}
+W.Vp.prototype={$iVp:1}
W.oO.prototype={$ioO:1}
-W.aux.prototype={
+W.auA.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a[b]},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -65223,18 +65141,18 @@ $iD:1}
W.oP.prototype={
gH:function(a){return a.length},
$ioP:1}
-W.auy.prototype={
-gaW:function(a){return a.name}}
-W.bvo.prototype={
-gaW:function(a){return a.name}}
-W.a4E.prototype={
-V:function(a,b){J.cc(b,new W.bw3(a))},
-aP:function(a,b){return a.getItem(H.r(b))!=null},
+W.auB.prototype={
+gaX:function(a){return a.name}}
+W.bvf.prototype={
+gaX:function(a){return a.name}}
+W.a4H.prototype={
+V:function(a,b){J.ci(b,new W.bvV(a))},
+aN:function(a,b){return a.getItem(H.r(b))!=null},
i:function(a,b){return a.getItem(H.r(b))},
E:function(a,b,c){a.setItem(b,c)},
-eH:function(a,b,c){if(a.getItem(b)==null)a.setItem(b,c.$0())
+eE:function(a,b,c){if(a.getItem(b)==null)a.setItem(b,c.$0())
return a.getItem(b)},
-P:function(a,b){var s
+O:function(a,b){var s
H.r(b)
s=a.getItem(b)
a.removeItem(b)
@@ -65247,38 +65165,38 @@ q=a.getItem(r)
q.toString
b.$2(r,q)}},
gah:function(a){var s=H.a([],t.s)
-this.L(a,new W.bw4(s))
+this.L(a,new W.bvW(s))
return s},
gdY:function(a){var s=H.a([],t.s)
-this.L(a,new W.bw5(s))
+this.L(a,new W.bvX(s))
return s},
gH:function(a){return a.length},
gag:function(a){return a.key(0)==null},
gca:function(a){return a.key(0)!=null},
$ibr:1}
-W.bw3.prototype={
+W.bvV.prototype={
$2:function(a,b){this.a.setItem(a,b)},
-$S:161}
-W.bw4.prototype={
+$S:163}
+W.bvW.prototype={
$2:function(a,b){return this.a.push(a)},
-$S:325}
-W.bw5.prototype={
+$S:336}
+W.bvX.prototype={
$2:function(a,b){return this.a.push(b)},
-$S:325}
-W.auK.prototype={
+$S:336}
+W.auN.prototype={
ghr:function(a){return a.key}}
-W.a4L.prototype={}
-W.m7.prototype={$im7:1}
-W.a4Q.prototype={
+W.a4O.prototype={}
+W.m8.prototype={$im8:1}
+W.a4T.prototype={
pv:function(a,b,c,d){var s,r
if("createContextualFragment" in window.Range.prototype)return this.LB(a,b,c,d)
-s=W.ak1("",c,d)
+s=W.ak4("",c,d)
r=document.createDocumentFragment()
r.toString
s.toString
new W.jR(r).V(0,new W.jR(s))
return r}}
-W.auW.prototype={
+W.auZ.prototype={
pv:function(a,b,c,d){var s,r,q,p
if("createContextualFragment" in window.Range.prototype)return this.LB(a,b,c,d)
s=document
@@ -65294,7 +65212,7 @@ r.toString
p.toString
new W.jR(r).V(0,new W.jR(p))
return r}}
-W.auX.prototype={
+W.av_.prototype={
pv:function(a,b,c,d){var s,r,q
if("createContextualFragment" in window.Range.prototype)return this.LB(a,b,c,d)
s=document
@@ -65307,25 +65225,25 @@ r.toString
q.toString
new W.jR(r).V(0,new W.jR(q))
return r}}
-W.VH.prototype={$iVH:1}
-W.VI.prototype={
-gaW:function(a){return a.name},
+W.VK.prototype={$iVK:1}
+W.VL.prototype={
+gaX:function(a){return a.name},
gw:function(a){return a.value},
-agn:function(a){return a.select()},
-$iVI:1}
-W.na.prototype={
+agr:function(a){return a.select()},
+$iVL:1}
+W.n9.prototype={
ga_:function(a){return a.id},
-$ina:1}
+$in9:1}
W.lo.prototype={
ga_:function(a){return a.id},
$ilo:1}
-W.avd.prototype={
+W.avg.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a[b]},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -65336,13 +65254,13 @@ $ibf:1,
$idF:1,
$iP:1,
$iD:1}
-W.ave.prototype={
+W.avh.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a[b]},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -65353,19 +65271,19 @@ $ibf:1,
$idF:1,
$iP:1,
$iD:1}
-W.bzD.prototype={
+W.bzu.prototype={
gH:function(a){return a.length}}
W.oU.prototype={
-geF:function(a){return new P.bS(C.l.aY(a.clientX),C.l.aY(a.clientY),t.OB)},
+geH:function(a){return new P.bS(C.l.aZ(a.clientX),C.l.aZ(a.clientY),t.OB)},
$ioU:1}
W.DM.prototype={$iDM:1}
-W.a5h.prototype={
+W.a5k.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a[b]},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -65376,65 +65294,65 @@ $ibf:1,
$idF:1,
$iP:1,
$iD:1}
-W.bAD.prototype={
+W.bAu.prototype={
gH:function(a){return a.length}}
W.y_.prototype={}
-W.bB_.prototype={
+W.bAR.prototype={
j:function(a){return String(a)}}
-W.bDD.prototype={
+W.bDi.prototype={
ga_:function(a){return a.id}}
-W.avU.prototype={
+W.avX.prototype={
gH:function(a){return a.length}}
-W.bDO.prototype={
+W.bDt.prototype={
ga_:function(a){return a.id}}
-W.O4.prototype={
-gaIX:function(a){var s=a.deltaY
+W.O7.prototype={
+gaJ2:function(a){var s=a.deltaY
if(s!=null)return s
throw H.d(P.z("deltaY is not supported"))},
-gaIW:function(a){var s=a.deltaX
+gaJ1:function(a){var s=a.deltaX
if(s!=null)return s
throw H.d(P.z("deltaX is not supported"))},
-gaIV:function(a){if(!!a.deltaMode)return a.deltaMode
+gaJ0:function(a){if(!!a.deltaMode)return a.deltaMode
return 0},
-$iO4:1}
+$iO7:1}
W.El.prototype={
gnq:function(a){return a.document},
-aOR:function(a,b,c){var s=W.cY3(a.open(b,c))
+aOX:function(a,b,c){var s=W.cXu(a.open(b,c))
return s},
-aBA:function(a,b){return a.requestAnimationFrame(H.ml(b,1))},
-arW:function(a){if(!!(a.requestAnimationFrame&&a.cancelAnimationFrame))return;(function(b){var s=['ms','moz','webkit','o']
+aBG:function(a,b){return a.requestAnimationFrame(H.ml(b,1))},
+arZ:function(a){if(!!(a.requestAnimationFrame&&a.cancelAnimationFrame))return;(function(b){var s=['ms','moz','webkit','o']
for(var r=0;r"))}}
-W.bGF.prototype={
-$1:function(a){this.a.F(0,new W.azV(a))},
-$S:1695}
+$iqA:1}
+W.bGk.prototype={
+aKU:function(a){var s=null,r=t.rJ,q=P.Dj(s,s,s,s,!0,r)
+W.fh(a,"beforeunload",new W.bGl(q),!1,r)
+return new P.hY(q,H.F(q).h("hY<1>"))}}
+W.bGl.prototype={
+$1:function(a){this.a.F(0,new W.azY(a))},
+$S:1823}
W.t6.prototype={
gpO:function(a){return a.navigator},
$it6:1}
-W.WD.prototype={
-gaW:function(a){return a.name},
+W.WG.prototype={
+gaX:function(a){return a.name},
gw:function(a){return a.value},
-$iWD:1}
-W.aAQ.prototype={
+$iWG:1}
+W.aAT.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a[b]},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -65445,7 +65363,7 @@ $ibf:1,
$idF:1,
$iP:1,
$iD:1}
-W.a8O.prototype={
+W.a8R.prototype={
j:function(a){var s,r=a.left
r.toString
r="Rectangle ("+H.f(r)+", "
@@ -65467,9 +65385,9 @@ if(s===r.gvE(b)){s=a.top
s.toString
if(s===r.gro(b)){s=a.width
s.toString
-if(s===r.geI(b)){s=a.height
+if(s===r.geF(b)){s=a.height
s.toString
-r=s===r.gey(b)
+r=s===r.gew(b)
s=r}else s=!1}else s=!1}else s=!1}else s=!1
return s},
gG:function(a){var s,r,q,p=a.left
@@ -65483,22 +65401,22 @@ r.toString
r=C.l.gG(r)
q=a.height
q.toString
-return W.cYl(p,s,r,C.l.gG(q))},
+return W.cXM(p,s,r,C.l.gG(q))},
ga1d:function(a){return a.height},
-gey:function(a){var s=a.height
+gew:function(a){var s=a.height
s.toString
return s},
-ga5E:function(a){return a.width},
-geI:function(a){var s=a.width
+ga5I:function(a){return a.width},
+geF:function(a){var s=a.width
s.toString
return s}}
-W.aCD.prototype={
+W.aCG.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a[b]},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -65509,13 +65427,13 @@ $ibf:1,
$idF:1,
$iP:1,
$iD:1}
-W.aat.prototype={
+W.aax.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a[b]},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -65526,15 +65444,15 @@ $ibf:1,
$idF:1,
$iP:1,
$iD:1}
-W.c1n.prototype={
+W.c15.prototype={
ghB:function(a){return a.body}}
-W.aGW.prototype={
+W.aGZ.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a[b]},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -65545,13 +65463,13 @@ $ibf:1,
$idF:1,
$iP:1,
$iD:1}
-W.aHg.prototype={
+W.aHj.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a[b]},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -65562,11 +65480,11 @@ $ibf:1,
$idF:1,
$iP:1,
$iD:1}
-W.azR.prototype={
-V:function(a,b){J.cc(b,new W.bGs(this))},
-os:function(a,b,c){var s=t.N
-return P.bdT(this,s,s,b,c)},
-eH:function(a,b,c){var s=this.a,r=s.hasAttribute(b)
+W.azU.prototype={
+V:function(a,b){J.ci(b,new W.bG8(this))},
+ou:function(a,b,c){var s=t.N
+return P.bdF(this,s,s,b,c)},
+eE:function(a,b,c){var s=this.a,r=s.hasAttribute(b)
if(!r)s.setAttribute(b,c.$0())
return s.getAttribute(b)},
cq:function(a){var s,r,q,p,o
@@ -65591,177 +65509,177 @@ n.toString
s.push(n)}}return s},
gag:function(a){return this.gah(this).length===0},
gca:function(a){return this.gah(this).length!==0}}
-W.bGs.prototype={
+W.bG8.prototype={
$2:function(a,b){this.a.a.setAttribute(a,b)},
-$S:161}
-W.a90.prototype={
-aP:function(a,b){return typeof b=="string"&&this.a.hasAttribute(b)},
+$S:163}
+W.a93.prototype={
+aN:function(a,b){return typeof b=="string"&&this.a.hasAttribute(b)},
i:function(a,b){return this.a.getAttribute(H.r(b))},
E:function(a,b,c){this.a.setAttribute(b,c)},
-P:function(a,b){var s,r
+O:function(a,b){var s,r
if(typeof b=="string"){s=this.a
r=s.getAttribute(b)
s.removeAttribute(b)
s=r}else s=null
return s},
gH:function(a){return this.gah(this).length}}
-W.aBa.prototype={
-V:function(a,b){J.cc(b,new W.bLn(this))},
-os:function(a,b,c){var s=t.N
-return P.bdT(this,s,s,b,c)},
-aP:function(a,b){var s=this.a.a.hasAttribute("data-"+this.t7(H.r(b)))
+W.aBd.prototype={
+V:function(a,b){J.ci(b,new W.bL1(this))},
+ou:function(a,b,c){var s=t.N
+return P.bdF(this,s,s,b,c)},
+aN:function(a,b){var s=this.a.a.hasAttribute("data-"+this.t7(H.r(b)))
return s},
i:function(a,b){return this.a.a.getAttribute("data-"+this.t7(H.r(b)))},
E:function(a,b,c){this.a.a.setAttribute("data-"+this.t7(b),c)},
-eH:function(a,b,c){return this.a.eH(0,"data-"+this.t7(b),c)},
-P:function(a,b){var s="data-"+this.t7(H.r(b)),r=this.a.a,q=r.getAttribute(s)
+eE:function(a,b,c){return this.a.eE(0,"data-"+this.t7(b),c)},
+O:function(a,b){var s="data-"+this.t7(H.r(b)),r=this.a.a,q=r.getAttribute(s)
r.removeAttribute(s)
return q},
cq:function(a){var s,r,q,p,o=this
for(s=o.gah(o),r=s.length,q=o.a,p=0;p0)p[r]=q[0].toUpperCase()+J.P_(q,1)}return C.b.dl(p,"")},
+if(q.length>0)p[r]=q[0].toUpperCase()+J.P3(q,1)}return C.b.dl(p,"")},
t7:function(a){var s,r,q,p,o
for(s=a.length,r=0,q="";r0?q+"-":q)+o}return q.charCodeAt(0)==0?q:q}}
-W.bLn.prototype={
+W.bL1.prototype={
$2:function(a,b){var s=this.a
s.a.a.setAttribute("data-"+s.t7(a),b)},
-$S:161}
-W.bLo.prototype={
-$2:function(a,b){if(J.dB(a).dK(a,"data-"))this.b.$2(this.a.a4N(C.d.eD(a,5)),b)},
-$S:161}
-W.bLp.prototype={
-$2:function(a,b){if(J.dB(a).dK(a,"data-"))this.b.push(this.a.a4N(C.d.eD(a,5)))},
-$S:161}
-W.bLq.prototype={
-$2:function(a,b){if(J.OZ(a,"data-"))this.b.push(b)},
-$S:161}
-W.cMU.prototype={}
+$S:163}
+W.bL2.prototype={
+$2:function(a,b){if(J.dB(a).dK(a,"data-"))this.b.$2(this.a.a4R(C.d.eA(a,5)),b)},
+$S:163}
+W.bL3.prototype={
+$2:function(a,b){if(J.dB(a).dK(a,"data-"))this.b.push(this.a.a4R(C.d.eA(a,5)))},
+$S:163}
+W.bL4.prototype={
+$2:function(a,b){if(J.P2(a,"data-"))this.b.push(b)},
+$S:163}
+W.cMh.prototype={}
W.tb.prototype={
-goF:function(){return!0},
-h5:function(a,b,c,d,e){return W.fg(this.a,this.b,b,!1,H.F(this).c)},
+goG:function(){return!0},
+h5:function(a,b,c,d,e){return W.fh(this.a,this.b,b,!1,H.F(this).c)},
nJ:function(a,b,c,d){return this.h5(a,b,null,c,d)}}
-W.Oi.prototype={}
-W.a95.prototype={
-bU:function(a){var s=this
+W.Ol.prototype={}
+W.a99.prototype={
+bV:function(a){var s=this
if(s.b==null)return null
-s.PS()
+s.PR()
return s.d=s.b=null},
tO:function(a){var s,r=this
if(r.b==null)throw H.d(P.bg("Subscription has been canceled."))
-r.PS()
-s=W.cPk(new W.bOJ(a),t.I3)
+r.PR()
+s=W.cOI(new W.bOt(a),t.I3)
r.d=s
-r.PQ()},
-z2:function(a,b){if(this.b==null)return;++this.a
-this.PS()},
-vT:function(a){return this.z2(a,null)},
+r.PP()},
+z0:function(a,b){if(this.b==null)return;++this.a
+this.PR()},
+vT:function(a){return this.z0(a,null)},
tV:function(a){var s=this
if(s.b==null||s.a<=0)return;--s.a
-s.PQ()},
-PQ:function(){var s,r=this,q=r.d
+s.PP()},
+PP:function(){var s,r=this,q=r.d
if(q!=null&&r.a<=0){s=r.b
s.toString
-J.aez(s,r.c,q,!1)}},
-PS:function(){var s,r=this.d
+J.aeC(s,r.c,q,!1)}},
+PR:function(){var s,r=this.d
if(r!=null){s=this.b
s.toString
-J.d9T(s,this.c,r,!1)}}}
-W.bOI.prototype={
+J.d9f(s,this.c,r,!1)}}}
+W.bOs.prototype={
$1:function(a){return this.a.$1(a)},
-$S:162}
-W.bOJ.prototype={
+$S:160}
+W.bOt.prototype={
$1:function(a){return this.a.$1(a)},
-$S:162}
-W.Xe.prototype={
-anp:function(a){var s
-if($.a9B.gag($.a9B)){for(s=0;s<262;++s)$.a9B.E(0,C.a5h[s],W.dBX())
-for(s=0;s<12;++s)$.a9B.E(0,C.zb[s],W.dBY())}},
-xK:function(a){return $.d4f().I(0,W.a_u(a))},
-te:function(a,b,c){var s=$.a9B.i(0,H.f(W.a_u(a))+"::"+b)
-if(s==null)s=$.a9B.i(0,"*::"+b)
+$S:160}
+W.Xh.prototype={
+ant:function(a){var s
+if($.a9F.gag($.a9F)){for(s=0;s<262;++s)$.a9F.E(0,C.a5i[s],W.dBk())
+for(s=0;s<12;++s)$.a9F.E(0,C.zb[s],W.dBl())}},
+xJ:function(a){return $.d3G().I(0,W.a_w(a))},
+te:function(a,b,c){var s=$.a9F.i(0,H.f(W.a_w(a))+"::"+b)
+if(s==null)s=$.a9F.i(0,"*::"+b)
if(s==null)return!1
return s.$4(a,b,c,this)},
$iub:1}
W.cr.prototype={
-gaH:function(a){return new W.Rp(a,this.gH(a),H.c2(a).h("Rp"))},
+gaJ:function(a){return new W.Rt(a,this.gH(a),H.c2(a).h("Rt"))},
F:function(a,b){throw H.d(P.z("Cannot add to immutable List."))},
bY:function(a,b){throw H.d(P.z("Cannot sort immutable List."))},
hg:function(a,b,c){throw H.d(P.z("Cannot add to immutable List."))},
-f1:function(a,b){throw H.d(P.z("Cannot remove from immutable List."))},
+f2:function(a,b){throw H.d(P.z("Cannot remove from immutable List."))},
kq:function(a){throw H.d(P.z("Cannot remove from immutable List."))},
-P:function(a,b){throw H.d(P.z("Cannot remove from immutable List."))},
-l_:function(a,b){throw H.d(P.z("Cannot remove from immutable List."))},
+O:function(a,b){throw H.d(P.z("Cannot remove from immutable List."))},
+kZ:function(a,b){throw H.d(P.z("Cannot remove from immutable List."))},
pX:function(a,b){throw H.d(P.z("Cannot remove from immutable List."))},
-dS:function(a,b,c,d,e){throw H.d(P.z("Cannot setRange on immutable List."))},
-fC:function(a,b,c,d){return this.dS(a,b,c,d,0)}}
-W.a2h.prototype={
-xK:function(a){return C.b.iw(this.a,new W.bg_(a))},
-te:function(a,b,c){return C.b.iw(this.a,new W.bfZ(a,b,c))},
+dT:function(a,b,c,d,e){throw H.d(P.z("Cannot setRange on immutable List."))},
+fC:function(a,b,c,d){return this.dT(a,b,c,d,0)}}
+W.a2j.prototype={
+xJ:function(a){return C.b.iv(this.a,new W.bfM(a))},
+te:function(a,b,c){return C.b.iv(this.a,new W.bfL(a,b,c))},
$iub:1}
-W.bg_.prototype={
-$1:function(a){return a.xK(this.a)},
-$S:400}
-W.bfZ.prototype={
+W.bfM.prototype={
+$1:function(a){return a.xJ(this.a)},
+$S:401}
+W.bfL.prototype={
$1:function(a){return a.te(this.a,this.b,this.c)},
-$S:400}
-W.abG.prototype={
-anu:function(a,b,c,d){var s,r,q
+$S:401}
+W.abK.prototype={
+any:function(a,b,c,d){var s,r,q
this.a.V(0,c)
-s=b.iM(0,new W.c26())
-r=b.iM(0,new W.c27())
+s=b.ip(0,new W.c1P())
+r=b.ip(0,new W.c1Q())
this.b.V(0,s)
q=this.c
q.V(0,C.a9)
q.V(0,r)},
-xK:function(a){return this.a.I(0,W.a_u(a))},
-te:function(a,b,c){var s=this,r=W.a_u(a),q=s.c
-if(q.I(0,H.f(r)+"::"+b))return s.d.aG1(c)
-else if(q.I(0,"*::"+b))return s.d.aG1(c)
+xJ:function(a){return this.a.I(0,W.a_w(a))},
+te:function(a,b,c){var s=this,r=W.a_w(a),q=s.c
+if(q.I(0,H.f(r)+"::"+b))return s.d.aG7(c)
+else if(q.I(0,"*::"+b))return s.d.aG7(c)
else{q=s.b
if(q.I(0,H.f(r)+"::"+b))return!0
else if(q.I(0,"*::"+b))return!0
else if(q.I(0,H.f(r)+"::*"))return!0
else if(q.I(0,"*::*"))return!0}return!1},
$iub:1}
-W.c26.prototype={
+W.c1P.prototype={
$1:function(a){return!C.b.I(C.zb,a)},
-$S:80}
-W.c27.prototype={
+$S:79}
+W.c1Q.prototype={
$1:function(a){return C.b.I(C.zb,a)},
-$S:80}
-W.aHM.prototype={
-te:function(a,b,c){if(this.al_(a,b,c))return!0
+$S:79}
+W.aHP.prototype={
+te:function(a,b,c){if(this.al3(a,b,c))return!0
if(b==="template"&&c==="")return!0
if(a.getAttribute("template")==="")return this.e.I(0,b)
return!1}}
-W.c4x.prototype={
+W.c4f.prototype={
$1:function(a){return"TEMPLATE::"+H.f(a)},
-$S:133}
-W.aHh.prototype={
-xK:function(a){var s
+$S:132}
+W.aHk.prototype={
+xJ:function(a){var s
if(t.MF.b(a))return!1
s=t.ry.b(a)
-if(s&&W.a_u(a)==="foreignObject")return!1
+if(s&&W.a_w(a)==="foreignObject")return!1
if(s)return!0
return!1},
te:function(a,b,c){if(b==="is"||C.d.dK(b,"on"))return!1
-return this.xK(a)},
+return this.xJ(a)},
$iub:1}
-W.Rp.prototype={
+W.Rt.prototype={
t:function(){var s=this,r=s.c+1,q=s.b
if(r"
if(typeof console!="undefined")window.console.warn(s)
-return}if(!m.a.xK(a)){m.B1(a,b)
+return}if(!m.a.xJ(a)){m.B_(a,b)
window
s="Removing disallowed element <"+H.f(e)+"> from "+H.f(b)
if(typeof console!="undefined")window.console.warn(s)
-return}if(g!=null)if(!m.a.te(a,"is",g)){m.B1(a,b)
+return}if(g!=null)if(!m.a.te(a,"is",g)){m.B_(a,b)
window
s="Removing disallowed type extension <"+H.f(e)+' is="'+g+'">'
if(typeof console!="undefined")window.console.warn(s)
return}s=f.gah(f)
-r=H.a(s.slice(0),H.a0(s).h("Y<1>"))
+r=H.a(s.slice(0),H.a0(s))
for(q=f.gah(f).length-1,s=f.a;q>=0;--q){p=r[q]
o=m.a
-n=J.daa(p)
+n=J.d9x(p)
H.r(p)
if(!o.te(a,n,s.getAttribute(p))){window
o="Removing disallowed attribute <"+H.f(e)+" "+p+'="'+H.f(s.getAttribute(p))+'">'
@@ -65830,12 +65748,12 @@ if(typeof console!="undefined")window.console.warn(o)
s.removeAttribute(p)}}if(t.aW.b(a)){s=a.content
s.toString
m.KU(s)}}}
-W.c6q.prototype={
+W.c68.prototype={
$2:function(a,b){var s,r,q,p,o,n=this.a
-switch(a.nodeType){case 1:n.aBV(a,b)
+switch(a.nodeType){case 1:n.aC0(a,b)
break
case 8:case 11:case 3:case 4:break
-default:n.B1(a,b)}s=a.lastChild
+default:n.B_(a,b)}s=a.lastChild
for(;null!=s;){r=null
try{r=s.previousSibling
if(r!=null){q=r.nextSibling
@@ -65843,7 +65761,7 @@ p=s
p=q==null?p!=null:q!==p
q=p}else q=!1
if(q){q=P.bg("Corrupt HTML")
-throw H.d(q)}}catch(o){H.J(o)
+throw H.d(q)}}catch(o){H.K(o)
q=s
n.b=!0
p=q.parentNode
@@ -65853,48 +65771,48 @@ if(p!=null)p.removeChild(q)}else a.removeChild(q)
s=null
r=a.lastChild}if(s!=null)this.$2(s,a)
s=r}},
-$S:1646}
-W.aAR.prototype={}
-W.aBL.prototype={}
-W.aBM.prototype={}
-W.aBN.prototype={}
+$S:1707}
+W.aAU.prototype={}
W.aBO.prototype={}
-W.aCj.prototype={}
-W.aCk.prototype={}
-W.aCW.prototype={}
-W.aCX.prototype={}
-W.aE_.prototype={}
-W.aE0.prototype={}
-W.aE1.prototype={}
+W.aBP.prototype={}
+W.aBQ.prototype={}
+W.aBR.prototype={}
+W.aCm.prototype={}
+W.aCn.prototype={}
+W.aCZ.prototype={}
+W.aD_.prototype={}
W.aE2.prototype={}
-W.aEd.prototype={}
-W.aEe.prototype={}
-W.aEU.prototype={}
-W.aEV.prototype={}
-W.aGp.prototype={}
-W.abP.prototype={}
-W.abQ.prototype={}
-W.aGU.prototype={}
-W.aGV.prototype={}
-W.aH7.prototype={}
-W.aI_.prototype={}
-W.aI0.prototype={}
-W.ace.prototype={}
-W.acf.prototype={}
-W.aIf.prototype={}
-W.aIg.prototype={}
-W.aJb.prototype={}
-W.aJc.prototype={}
-W.aJl.prototype={}
-W.aJm.prototype={}
-W.aJs.prototype={}
-W.aJt.prototype={}
-W.aJG.prototype={}
-W.aJH.prototype={}
-W.aJI.prototype={}
+W.aE3.prototype={}
+W.aE4.prototype={}
+W.aE5.prototype={}
+W.aEg.prototype={}
+W.aEh.prototype={}
+W.aEX.prototype={}
+W.aEY.prototype={}
+W.aGs.prototype={}
+W.abT.prototype={}
+W.abU.prototype={}
+W.aGX.prototype={}
+W.aGY.prototype={}
+W.aHa.prototype={}
+W.aI2.prototype={}
+W.aI3.prototype={}
+W.aci.prototype={}
+W.acj.prototype={}
+W.aIi.prototype={}
+W.aIj.prototype={}
+W.aJe.prototype={}
+W.aJf.prototype={}
+W.aJo.prototype={}
+W.aJp.prototype={}
+W.aJv.prototype={}
+W.aJw.prototype={}
W.aJJ.prototype={}
-P.c2x.prototype={
-yw:function(a){var s,r=this.a,q=r.length
+W.aJK.prototype={}
+W.aJL.prototype={}
+W.aJM.prototype={}
+P.c2f.prototype={
+yu:function(a){var s,r=this.a,q=r.length
for(s=0;s")),new P.b2m(),r.h("cQ"))},
+return new H.cQ(new H.az(s,new P.b2c(),r.h("az")),new P.b2d(),r.h("cQ"))},
L:function(a,b){C.b.L(P.v(this.gn7(),!1,t.lU),b)},
E:function(a,b,c){var s=this.gn7()
-J.d9W(s.b.$1(J.vx(s.a,b)),c)},
-sH:function(a,b){var s=J.bX(this.gn7().a)
+J.d9i(s.b.$1(J.vy(s.a,b)),c)},
+sH:function(a,b){var s=J.bY(this.gn7().a)
if(b>=s)return
else if(b<0)throw H.d(P.aa("Invalid list length"))
this.w3(0,b,s)},
F:function(a,b){this.b.a.appendChild(b)},
V:function(a,b){var s,r
-for(s=J.a3(b),r=this.b.a;s.t();)r.appendChild(s.gC(s))},
+for(s=J.a2(b),r=this.b.a;s.t();)r.appendChild(s.gC(s))},
I:function(a,b){if(!t.lU.b(b))return!1
return b.parentNode===this.a},
gK0:function(a){var s=P.v(this.gn7(),!1,t.lU)
return new H.dd(s,H.a0(s).h("dd<1>"))},
bY:function(a,b){throw H.d(P.z("Cannot sort filtered list"))},
-dS:function(a,b,c,d,e){throw H.d(P.z("Cannot setRange on filtered list"))},
-fC:function(a,b,c,d){return this.dS(a,b,c,d,0)},
+dT:function(a,b,c,d,e){throw H.d(P.z("Cannot setRange on filtered list"))},
+fC:function(a,b,c,d){return this.dT(a,b,c,d,0)},
w3:function(a,b,c){var s=this.gn7()
-s=H.aua(s,b,s.$ti.h("P.E"))
-C.b.L(P.v(H.bwU(s,c-b,H.F(s).h("P.E")),!0,t.z),new P.b2n())},
-kq:function(a){var s=this.gn7(),r=s.b.$1(J.ER(s.a))
+s=H.aud(s,b,s.$ti.h("P.E"))
+C.b.L(P.v(H.bwL(s,c-b,H.F(s).h("P.E")),!0,t.z),new P.b2e())},
+kq:function(a){var s=this.gn7(),r=s.b.$1(J.ES(s.a))
if(r!=null)J.fJ(r)
return r},
hg:function(a,b,c){var s,r
-if(b==J.bX(this.gn7().a))this.b.a.appendChild(c)
+if(b==J.bY(this.gn7().a))this.b.a.appendChild(c)
else{s=this.gn7()
-r=s.b.$1(J.vx(s.a,b))
+r=s.b.$1(J.vy(s.a,b))
r.parentNode.insertBefore(c,r)}},
-f1:function(a,b){var s=this.gn7()
-s=s.b.$1(J.vx(s.a,b))
+f2:function(a,b){var s=this.gn7()
+s=s.b.$1(J.vy(s.a,b))
J.fJ(s)
return s},
-P:function(a,b){return!1},
-gH:function(a){return J.bX(this.gn7().a)},
+O:function(a,b){return!1},
+gH:function(a){return J.bY(this.gn7().a)},
i:function(a,b){var s=this.gn7()
-return s.b.$1(J.vx(s.a,b))},
-gaH:function(a){var s=P.v(this.gn7(),!1,t.lU)
+return s.b.$1(J.vy(s.a,b))},
+gaJ:function(a){var s=P.v(this.gn7(),!1,t.lU)
return new J.c8(s,s.length,H.a0(s).h("c8<1>"))}}
-P.b2l.prototype={
+P.b2c.prototype={
$1:function(a){return t.lU.b(a)},
-$S:398}
-P.b2m.prototype={
+$S:399}
+P.b2d.prototype={
$1:function(a){return t.lU.a(a)},
-$S:1582}
-P.b2n.prototype={
+$S:1676}
+P.b2e.prototype={
$1:function(a){return J.fJ(a)},
-$S:8}
-P.aiI.prototype={
+$S:7}
+P.aiL.prototype={
ghr:function(a){return a.key}}
-P.aVq.prototype={
+P.aVb.prototype={
gw:function(a){return new P.t7([],[]).qL(a.value,!1)}}
-P.aiS.prototype={
-gaW:function(a){return a.name}}
-P.b6h.prototype={
-gaW:function(a){return a.name}}
-P.a0X.prototype={$ia0X:1}
-P.bge.prototype={
-gaW:function(a){return a.name}}
-P.bgf.prototype={
+P.aiV.prototype={
+gaX:function(a){return a.name}}
+P.b67.prototype={
+gaX:function(a){return a.name}}
+P.a0Z.prototype={$ia0Z:1}
+P.bg0.prototype={
+gaX:function(a){return a.name}}
+P.bg1.prototype={
ghr:function(a){return a.key},
gw:function(a){return a.value}}
-P.avR.prototype={
+P.avU.prototype={
gmq:function(a){return a.target}}
P.uc.prototype={
j:function(a){var s,r=this.a
@@ -66067,41 +65985,41 @@ s=this.b
if(s!==-1)r=r+", errno = "+J.aD(s)}else{r=this.b
r=r!==-1?"OS Error: errno = "+J.aD(r):"OS Error"}return r.charCodeAt(0)==0?r:r},
$iep:1}
-P.WS.prototype={
+P.WV.prototype={
ghO:function(a){return this.a},
-lO:function(a){return P.bPE(36,[null,this.b]).R(0,new P.bMz(this),t.C9)},
-Rr:function(a,b){var s=this,r=t.O0
-if(b)return s.lO(0).R(0,new P.bMx(s),r)
-else return P.bPE(34,[null,s.b]).R(0,new P.bMy(s),r)},
-a7l:function(a){return this.Rr(a,!1)},
+lN:function(a){return P.bPo(36,[null,this.b]).R(0,new P.bMc(this),t.C9)},
+Rq:function(a,b){var s=this,r=t.O0
+if(b)return s.lN(0).R(0,new P.bMa(s),r)
+else return P.bPo(34,[null,s.b]).R(0,new P.bMb(s),r)},
+a7p:function(a){return this.Rq(a,!1)},
j:function(a){return"Directory: '"+H.f(this.a)+"'"},
a1z:function(a){a.i(0,0)
return!0},
-a04:function(a,b){switch(a.i(0,0)){case 1:return new P.lA(!1,null,null,null)
+a03:function(a,b){switch(a.i(0,0)){case 1:return new P.lB(!1,null,null,null)
case 2:return new P.l3(b,this.a,new P.uc(a.i(0,2),a.i(0,1)))
-default:return new P.Ok("Unknown error")}},
-$imC:1}
-P.bMz.prototype={
+default:return new P.On("Unknown error")}},
+$imB:1}
+P.bMc.prototype={
$1:function(a){var s=this.a
-if(s.a1z(a))throw H.d(s.a04(a,"Exists failed"))
+if(s.a1z(a))throw H.d(s.a03(a,"Exists failed"))
return!1},
-$S:132}
-P.bMx.prototype={
+$S:129}
+P.bMa.prototype={
$1:function(a){var s
if(a)return this.a
s=this.a
-if(s.a!=P.aYl(P.cTF(s.ghO(s))).a)return P.aYl(P.cTF(s.ghO(s))).Rr(0,!0).R(0,new P.bMw(s),t.O0)
-else return s.a7l(0)},
-$S:1551}
-P.bMw.prototype={
-$1:function(a){return this.a.a7l(0)},
-$S:1541}
-P.bMy.prototype={
+if(s.a!=P.aY7(P.cT5(s.ghO(s))).a)return P.aY7(P.cT5(s.ghO(s))).Rq(0,!0).R(0,new P.bM9(s),t.O0)
+else return s.a7p(0)},
+$S:1584}
+P.bM9.prototype={
+$1:function(a){return this.a.a7p(0)},
+$S:1582}
+P.bMb.prototype={
$1:function(a){var s=this.a
-if(s.a1z(a))throw H.d(s.a04(a,"Creation failed"))
+if(s.a1z(a))throw H.d(s.a03(a,"Creation failed"))
return s},
-$S:1508}
-P.Hf.prototype={}
+$S:1543}
+P.Hg.prototype={}
P.l3.prototype={
j:function(a){var s,r=this,q="FileSystemException",p=r.a
if(p.length!==0){p=q+(": "+p)
@@ -66114,51 +66032,51 @@ s=r.b
if(s!=null)p+=", path = '"+s+"'"}else{p=r.b
p=p!=null?q+(": "+p):q}}return p.charCodeAt(0)==0?p:p},
$iep:1}
-P.a9c.prototype={
+P.a9g.prototype={
gqo:function(){return this.b?this.a:H.b(H.R(u.v))},
-ga2q:function(){return this.e?this.d:H.b(H.R("Field '_openedFile' has not been initialized."))},
-h5:function(a,b,c,d,e){var s=this,r=P.Dj(new P.bPD(s),s.gay2(s),null,s.gaBe(),!0,t.H3)
+ga2t:function(){return this.e?this.d:H.b(H.R("Field '_openedFile' has not been initialized."))},
+h5:function(a,b,c,d,e){var s=this,r=P.Dj(new P.bPn(s),s.gay6(s),null,s.gaBk(),!0,t.H3)
s.b=!0
s.a=r
r=s.gqo()
r.toString
-return new P.i_(r,H.F(r).h("i_<1>")).h5(0,b,c,d,e)},
+return new P.hY(r,H.F(r).h("hY<1>")).h5(0,b,c,d,e)},
nJ:function(a,b,c,d){return this.h5(a,b,null,c,d)},
-wM:function(){var s=this
+wL:function(){var s=this
if(s.z||s.Q)return s.x.a
s.Q=!0
-s.ga2q().dD(0).a3(s.gqo().gQo()).iL(new P.bPw(s))
+s.ga2t().dC(0).a3(s.gqo().gQn()).iJ(new P.bPg(s))
return s.x.a},
-P4:function(){var s=this,r={}
+P3:function(){var s=this,r={}
if(s.z)return
-if(s.ch){s.wM()
+if(s.ch){s.wL()
return}s.z=!0
r.a=65536
-s.ga2q().D2(0,65536).R(0,new P.bPx(r,s),t.P).a3(new P.bPy(s))},
-ay3:function(a){var s,r,q,p=this,o=new P.bPz(p,new P.bPB(p)),n=new P.bPC(p),m=p.c
-if(m!=null)P.cTG(m).aOQ(0,C.Gh).jG(0,o,n,t.n)
-else try{P.dis(0)
-o.$1(null)}catch(q){s=H.J(q)
+s.ga2t().D1(0,65536).R(0,new P.bPh(r,s),t.P).a3(new P.bPi(s))},
+ay7:function(a){var s,r,q,p=this,o=new P.bPj(p,new P.bPl(p)),n=new P.bPm(p),m=p.c
+if(m!=null)P.cT6(m).aOW(0,C.Gh).jE(0,o,n,t.n)
+else try{P.dhQ(0)
+o.$1(null)}catch(q){s=H.K(q)
r=H.c7(q)
n.$2(s,r)}}}
-P.bPD.prototype={
+P.bPn.prototype={
$0:function(){var s=this.a
s.y=!0
-return s.wM()},
+return s.wL()},
$C:"$0",
$R:0,
-$S:508}
-P.bPw.prototype={
+$S:511}
+P.bPg.prototype={
$0:function(){var s=this.a
s.x.fF(0)
-s.gqo().dD(0)},
+s.gqo().dC(0)},
$C:"$0",
$R:0,
$S:1}
-P.bPx.prototype={
+P.bPh.prototype={
$1:function(a){var s,r,q=this.b
q.z=!1
-if(q.y){q.wM()
+if(q.y){q.wL()
return}s=q.f
r=a.length
q.f=s+r
@@ -66168,184 +66086,184 @@ if(s)q.ch=!0
if(!q.ch){s=q.gqo()
r=s.b
s=!((r&1)!==0?(s.gqv().e&4)!==0:(r&2)===0)}else s=!1
-if(s)q.P4()
+if(s)q.P3()
q.gqo().F(0,a)
-if(q.ch)q.wM()},
-$S:1481}
-P.bPy.prototype={
+if(q.ch)q.wL()},
+$S:1541}
+P.bPi.prototype={
$2:function(a,b){var s=this.a
-if(!s.y){s.gqo().iv(a,b)
-s.wM()
+if(!s.y){s.gqo().iu(a,b)
+s.wL()
s.y=!0}},
$C:"$2",
$R:2,
-$S:72}
-P.bPB.prototype={
+$S:74}
+P.bPl.prototype={
$1:function(a){var s=this.a
s.e=!0
s.d=a
s.z=!1
-s.P4()},
-$S:410}
-P.bPz.prototype={
+s.P3()},
+$S:409}
+P.bPj.prototype={
$1:function(a){var s=this.a,r=s.f,q=this.b
-if(r>0)a.agT(0,r).jG(0,q,new P.bPA(s),t.n)
+if(r>0)a.agX(0,r).jE(0,q,new P.bPk(s),t.n)
else q.$1(a)},
-$S:410}
-P.bPA.prototype={
+$S:409}
+P.bPk.prototype={
$2:function(a,b){var s=this.a
-s.gqo().iv(a,b)
+s.gqo().iu(a,b)
s.z=!1
-s.wM()},
+s.wL()},
$C:"$2",
$R:2,
-$S:72}
-P.bPC.prototype={
+$S:74}
+P.bPm.prototype={
$2:function(a,b){var s=this.a
-s.gqo().iv(a,b)
-s.gqo().dD(0)
+s.gqo().iu(a,b)
+s.gqo().dC(0)
s.x.fF(0)},
$C:"$2",
$R:2,
-$S:1373}
-P.a9a.prototype={
+$S:1484}
+P.a9e.prototype={
ghO:function(a){return this.a},
-aOQ:function(a,b){if(b!==C.Gh&&b!==C.qz&&b!==C.Gi&&b!==C.xm&&b!==C.Gj)return P.al9(new P.lA(!1,null,null,"Invalid file mode for this operation"),null,t.YK)
-return P.bPE(5,[null,this.b,b.a]).R(0,new P.bPG(this),t.YK)},
-tI:function(a){return P.bPE(12,[null,this.b]).R(0,new P.bPF(this),t.S)},
+aOW:function(a,b){if(b!==C.Gh&&b!==C.qy&&b!==C.Gi&&b!==C.xm&&b!==C.Gj)return P.alc(new P.lB(!1,null,null,"Invalid file mode for this operation"),null,t.YK)
+return P.bPo(5,[null,this.b,b.a]).R(0,new P.bPq(this),t.YK)},
+tI:function(a){return P.bPo(12,[null,this.b]).R(0,new P.bPp(this),t.S)},
j:function(a){return"File: '"+H.f(this.a)+"'"},
-$iakz:1}
-P.bPG.prototype={
-$1:function(a){if(P.aK8(a))throw H.d(P.aK3(a,"Cannot open file",this.a.a))
-return P.djh(a,this.a.a)},
-$S:416}
-P.bPF.prototype={
-$1:function(a){if(P.aK8(a))throw H.d(P.aK3(a,"Cannot retrieve length of file",this.a.a))
+$iakC:1}
+P.bPq.prototype={
+$1:function(a){if(P.aKb(a))throw H.d(P.aK6(a,"Cannot open file",this.a.a))
+return P.diF(a,this.a.a)},
+$S:413}
+P.bPp.prototype={
+$1:function(a){if(P.aKb(a))throw H.d(P.aK6(a,"Cannot retrieve length of file",this.a.a))
return a},
-$S:417}
-P.Ot.prototype={
-ga3m:function(){return this.d?this.c:H.b(H.R("Field '_resourceInfo' has not been initialized."))},
-dD:function(a){return this.a1x(7,[null],!0).R(0,new P.c0c(this),t.n)},
-D2:function(a,b){P.eB(b,"bytes")
-return this.Ok(20,[null,b]).R(0,new P.c0e(this),t.H3)},
-agT:function(a,b){return this.Ok(9,[null,b]).R(0,new P.c0f(this),t.YK)},
-tI:function(a){return this.Ok(11,[null]).R(0,new P.c0d(this),t.S)},
-aAO:function(){return this.e.aRL()},
+$S:418}
+P.Ow.prototype={
+ga3p:function(){return this.d?this.c:H.b(H.R("Field '_resourceInfo' has not been initialized."))},
+dC:function(a){return this.a1x(7,[null],!0).R(0,new P.c_V(this),t.n)},
+D1:function(a,b){P.ez(b,"bytes")
+return this.Oj(20,[null,b]).R(0,new P.c_X(this),t.H3)},
+agX:function(a,b){return this.Oj(9,[null,b]).R(0,new P.c_Y(this),t.YK)},
+tI:function(a){return this.Oj(11,[null]).R(0,new P.c_W(this),t.S)},
+aAU:function(){return this.e.aRR()},
a1x:function(a,b,c){var s=this,r=null
-if(s.f)return P.al9(new P.l3("File closed",s.a,r),r,t.z)
-if(s.b)return P.al9(new P.l3("An async operation is currently pending",s.a,r),r,t.z)
+if(s.f)return P.alc(new P.l3("File closed",s.a,r),r,t.z)
+if(s.b)return P.alc(new P.l3("An async operation is currently pending",s.a,r),r,t.z)
if(c)s.f=!0
s.b=!0
-b[0]=s.aAO()},
-Ok:function(a,b){return this.a1x(a,b,!1)},
-$ibmL:1}
-P.c0c.prototype={
-$1:function(a){var s,r=J.eT(a)
-if(r.B(a,-1))throw H.d(P.dcA("Cannot close file",this.a.a,null))
+b[0]=s.aAU()},
+Oj:function(a,b){return this.a1x(a,b,!1)},
+$ibmB:1}
+P.c_V.prototype={
+$1:function(a){var s,r=J.eU(a)
+if(r.B(a,-1))throw H.d(P.dbX("Cannot close file",this.a.a,null))
s=this.a
r=s.f||r.B(a,0)
s.f=r
-if(r){r=s.ga3m()
-$.dio.P(0,r.b)}},
+if(r){r=s.ga3p()
+$.dhM.O(0,r.b)}},
$S:11}
-P.c0e.prototype={
+P.c_X.prototype={
$1:function(a){var s
-if(P.aK8(a))throw H.d(P.aK3(a,"read failed",this.a.a))
+if(P.aKb(a))throw H.d(P.aK6(a,"read failed",this.a.a))
s=J.am(a)
-this.a.ga3m().aRS(J.bX(s.i(a,1)))
+this.a.ga3p().aRY(J.bY(s.i(a,1)))
return s.i(a,1)},
-$S:1166}
-P.c0f.prototype={
-$1:function(a){if(P.aK8(a))throw H.d(P.aK3(a,"setPosition failed",this.a.a))
+$S:1302}
+P.c_Y.prototype={
+$1:function(a){if(P.aKb(a))throw H.d(P.aK6(a,"setPosition failed",this.a.a))
return this.a},
-$S:416}
-P.c0d.prototype={
-$1:function(a){if(P.aK8(a))throw H.d(P.aK3(a,"length failed",this.a.a))
+$S:413}
+P.c_W.prototype={
+$1:function(a){if(P.aKb(a))throw H.d(P.aK6(a,"length failed",this.a.a))
return a},
-$S:417}
-P.a_V.prototype={
-j:function(a){return C.adA[this.a]}}
-P.lP.prototype={}
-P.ccw.prototype={
-$1:function(a){var s=function(b,c,d){return function(){return b(c,d,this,Array.prototype.slice.apply(arguments))}}(P.dls,a,!1)
-P.cP3(s,$.aKw(),a)
+$S:418}
+P.a_X.prototype={
+j:function(a){return C.adB[this.a]}}
+P.lQ.prototype={}
+P.cc4.prototype={
+$1:function(a){var s=function(b,c,d){return function(){return b(c,d,this,Array.prototype.slice.apply(arguments))}}(P.dkQ,a,!1)
+P.cOr(s,$.aKz(),a)
return s},
-$S:8}
-P.ccx.prototype={
+$S:7}
+P.cc5.prototype={
$1:function(a){return new this.a(a)},
-$S:8}
-P.csX.prototype={
-$1:function(a){return new P.a0T(a)},
-$S:1095}
-P.csY.prototype={
-$1:function(a){return new P.JK(a,t.sW)},
-$S:1084}
-P.csZ.prototype={
-$1:function(a){return new P.wG(a)},
-$S:1081}
-P.wG.prototype={
+$S:7}
+P.csv.prototype={
+$1:function(a){return new P.a0V(a)},
+$S:1228}
+P.csw.prototype={
+$1:function(a){return new P.JL(a,t.sW)},
+$S:1192}
+P.csx.prototype={
+$1:function(a){return new P.wH(a)},
+$S:1097}
+P.wH.prototype={
i:function(a,b){if(typeof b!="string"&&typeof b!="number")throw H.d(P.aa("property is not a String or num"))
-return P.cP_(this.a[b])},
+return P.cOn(this.a[b])},
E:function(a,b,c){if(typeof b!="string"&&typeof b!="number")throw H.d(P.aa("property is not a String or num"))
-this.a[b]=P.cP0(c)},
+this.a[b]=P.cOo(c)},
B:function(a,b){if(b==null)return!1
-return b instanceof P.wG&&this.a===b.a},
+return b instanceof P.wH&&this.a===b.a},
j:function(a){var s,r
try{s=String(this.a)
-return s}catch(r){H.J(r)
+return s}catch(r){H.K(r)
s=this.fE(0)
return s}},
-xZ:function(a,b){var s=this.a,r=b==null?null:P.v(new H.A(b,P.dCV(),H.a0(b).h("A<1,@>")),!0,t.z)
-return P.cP_(s[a].apply(s,r))},
-aGZ:function(a){return this.xZ(a,null)},
+xX:function(a,b){var s=this.a,r=b==null?null:P.v(new H.B(b,P.dCh(),H.a0(b).h("B<1,@>")),!0,t.z)
+return P.cOn(s[a].apply(s,r))},
+aH4:function(a){return this.xX(a,null)},
gG:function(a){return 0}}
-P.a0T.prototype={}
-P.JK.prototype={
+P.a0V.prototype={}
+P.JL.prototype={
My:function(a){var s=this,r=a<0||a>=s.gH(s)
if(r)throw H.d(P.ee(a,0,s.gH(s),null,null))},
i:function(a,b){if(H.bE(b))this.My(b)
-return this.aiF(0,b)},
+return this.aiJ(0,b)},
E:function(a,b,c){if(H.bE(b))this.My(b)
-this.Y2(0,b,c)},
+this.Y1(0,b,c)},
gH:function(a){var s=this.a.length
if(typeof s==="number"&&s>>>0===s)return s
throw H.d(P.bg("Bad JsArray length"))},
-sH:function(a,b){this.Y2(0,"length",b)},
-F:function(a,b){this.xZ("push",[b])},
+sH:function(a,b){this.Y1(0,"length",b)},
+F:function(a,b){this.xX("push",[b])},
hg:function(a,b,c){var s,r=this
if(H.bE(b))s=b<0||b>=r.gH(r)+1
else s=!1
if(s)H.b(P.ee(b,0,r.gH(r),null,null))
-r.xZ("splice",[b,0,c])},
-f1:function(a,b){this.My(b)
-return J.e(this.xZ("splice",[b,1]),0)},
-kq:function(a){if(this.gH(this)===0)throw H.d(P.hx(-1))
-return this.aGZ("pop")},
-dS:function(a,b,c,d,e){var s,r
-P.ddw(b,c,this.gH(this))
+r.xX("splice",[b,0,c])},
+f2:function(a,b){this.My(b)
+return J.e(this.xX("splice",[b,1]),0)},
+kq:function(a){if(this.gH(this)===0)throw H.d(P.hw(-1))
+return this.aH4("pop")},
+dT:function(a,b,c,d,e){var s,r
+P.dcT(b,c,this.gH(this))
s=c-b
if(s===0)return
if(e<0)throw H.d(P.aa(e))
r=[b,s]
-C.b.V(r,J.aeB(d,e).l2(0,s))
-this.xZ("splice",r)},
-fC:function(a,b,c,d){return this.dS(a,b,c,d,0)},
-bY:function(a,b){this.xZ("sort",b==null?[]:[b])},
+C.b.V(r,J.aeE(d,e).l1(0,s))
+this.xX("splice",r)},
+fC:function(a,b,c,d){return this.dT(a,b,c,d,0)},
+bY:function(a,b){this.xX("sort",b==null?[]:[b])},
$ibf:1,
$iP:1,
$iD:1}
-P.a9W.prototype={}
-P.cJq.prototype={
-$1:function(a){return this.a.al(0,a)},
-$S:48}
-P.cJr.prototype={
-$1:function(a){return this.a.aB(a)},
-$S:48}
-P.bUT.prototype={
-mO:function(a){if(a<=0||a>4294967296)throw H.d(P.hx(u.b4+a))
+P.aa_.prototype={}
+P.cIR.prototype={
+$1:function(a){return this.a.am(0,a)},
+$S:47}
+P.cIS.prototype={
+$1:function(a){return this.a.aC(a)},
+$S:47}
+P.bUB.prototype={
+mP:function(a){if(a<=0||a>4294967296)throw H.d(P.hw(u.b4+a))
return Math.random()*a>>>0}}
-P.c0b.prototype={
-ans:function(a){var s,r,q,p,o,n,m,l=this,k=4294967296,j=a<0?-1:0
+P.c_U.prototype={
+anw:function(a){var s,r,q,p,o,n,m,l=this,k=4294967296,j=a<0?-1:0
do{s=(a&4294967295)>>>0
a=C.e.dn(a-s,k)
r=(a&4294967295)>>>0
@@ -66373,19 +66291,19 @@ l.a=n
o=(m^r+((r<<31|s>>>1)>>>0)+o&4294967295)>>>0
l.b=o}while(a!==j)
if(o===0&&n===0)l.a=23063
-l.xl()
-l.xl()
-l.xl()
-l.xl()},
-xl:function(){var s=this,r=s.a,q=4294901760*r,p=(q&4294967295)>>>0,o=55905*r,n=(o&4294967295)>>>0,m=n+p+s.b
+l.xk()
+l.xk()
+l.xk()
+l.xk()},
+xk:function(){var s=this,r=s.a,q=4294901760*r,p=(q&4294967295)>>>0,o=55905*r,n=(o&4294967295)>>>0,m=n+p+s.b
r=(m&4294967295)>>>0
s.a=r
s.b=(C.e.dn(o-n+(q-p)+(m-r),4294967296)&4294967295)>>>0},
-mO:function(a){var s,r,q,p=this
-if(a<=0||a>4294967296)throw H.d(P.hx(u.b4+a))
+mP:function(a){var s,r,q,p=this
+if(a<=0||a>4294967296)throw H.d(P.hw(u.b4+a))
s=a-1
-if((a&s)>>>0===0){p.xl()
-return(p.a&s)>>>0}do{p.xl()
+if((a&s)>>>0===0){p.xk()
+return(p.a&s)>>>0}do{p.xk()
r=p.a
q=r%a}while(r-q+a>=4294967296)
return q}}
@@ -66394,18 +66312,18 @@ j:function(a){return"Point("+H.f(this.a)+", "+H.f(this.b)+")"},
B:function(a,b){if(b==null)return!1
return b instanceof P.bS&&this.a==b.a&&this.b==b.b},
gG:function(a){var s=J.h(this.a),r=J.h(this.b)
-return P.cYk(P.a9V(P.a9V(0,s),r))},
-a8:function(a,b){var s=H.F(this),r=s.h("bS.T")
+return P.cXL(P.a9Z(P.a9Z(0,s),r))},
+a7:function(a,b){var s=H.F(this),r=s.h("bS.T")
return new P.bS(r.a(this.a+b.a),r.a(this.b+b.b),s.h("bS"))},
bl:function(a,b){var s=H.F(this),r=s.h("bS.T")
return new P.bS(r.a(this.a-b.a),r.a(this.b-b.b),s.h("bS"))},
-b0:function(a,b){var s=H.F(this),r=s.h("bS.T")
+b1:function(a,b){var s=H.F(this),r=s.h("bS.T")
return new P.bS(r.a(this.a*b),r.a(this.b*b),s.h("bS"))},
-Sd:function(a){var s=this.a-a.a,r=this.b-a.b
+Sc:function(a){var s=this.a-a.a,r=this.b-a.b
return Math.sqrt(s*s+r*r)}}
-P.aFD.prototype={
+P.aFG.prototype={
gK2:function(a){return this.$ti.c.a(this.a+this.c)},
-gQP:function(a){return this.$ti.c.a(this.b+this.d)},
+gQO:function(a){return this.$ti.c.a(this.b+this.d)},
j:function(a){var s=this
return"Rectangle ("+H.f(s.a)+", "+H.f(s.b)+") "+H.f(s.c)+" x "+H.f(s.d)},
B:function(a,b){var s,r,q,p,o=this
@@ -66414,12 +66332,12 @@ if(t.Bb.b(b)){s=o.a
r=J.aK(b)
if(s==r.gvE(b)){q=o.b
if(q==r.gro(b)){p=o.$ti.c
-s=p.a(s+o.c)===r.gK2(b)&&p.a(q+o.d)===r.gQP(b)}else s=!1}else s=!1}else s=!1
+s=p.a(s+o.c)===r.gK2(b)&&p.a(q+o.d)===r.gQO(b)}else s=!1}else s=!1}else s=!1
return s},
gG:function(a){var s=this,r=s.a,q=J.h(r),p=s.b,o=J.h(p),n=s.$ti.c
r=C.l.gG(n.a(r+s.c))
p=C.l.gG(n.a(p+s.d))
-return P.cYk(P.a9V(P.a9V(P.a9V(P.a9V(0,q),o),r),p))},
+return P.cXL(P.a9Z(P.a9Z(P.a9Z(P.a9Z(0,q),o),r),p))},
Hp:function(a,b){var s=this,r=b.a,q=s.a
if(r>=q)if(r<=q+s.c){r=b.b
q=s.b
@@ -66435,20 +66353,20 @@ return new P.bS(s.a,r.c.a(s.b+s.d),r.h("bS<1>"))}}
P.k5.prototype={
gvE:function(a){return this.a},
gro:function(a){return this.b},
-geI:function(a){return this.c},
-gey:function(a){return this.d}}
-P.aLB.prototype={
+geF:function(a){return this.c},
+gew:function(a){return this.d}}
+P.aLE.prototype={
gw:function(a){return a.value}}
P.r8.prototype={
gw:function(a){return a.value},
$ir8:1}
-P.amf.prototype={
+P.ami.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a.getItem(b)},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -66460,13 +66378,13 @@ $iD:1}
P.rd.prototype={
gw:function(a){return a.value},
$ird:1}
-P.aq7.prototype={
+P.aqa.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a.getItem(b)},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -66475,16 +66393,16 @@ dr:function(a,b){return this.i(a,b)},
$ibf:1,
$iP:1,
$iD:1}
-P.biV.prototype={
+P.biM.prototype={
gH:function(a){return a.length}}
-P.UT.prototype={$iUT:1}
-P.auO.prototype={
+P.UX.prototype={$iUX:1}
+P.auR.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a.getItem(b)},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -66494,17 +66412,17 @@ $ibf:1,
$iP:1,
$iD:1}
P.ca.prototype={
-gBI:function(a){return new P.akS(a,new W.jR(a))},
+gBH:function(a){return new P.akV(a,new W.jR(a))},
pv:function(a,b,c,d){var s,r,q,p,o,n=H.a([],t.qF)
-n.push(W.cYh(null))
-n.push(W.cYD())
-n.push(new W.aHh())
-c=new W.aIJ(new W.a2h(n))
+n.push(W.cXI(null))
+n.push(W.cY3())
+n.push(new W.aHk())
+c=new W.aIM(new W.a2j(n))
s='"
n=document
r=n.body
r.toString
-q=C.Ds.aIh(r,s,c)
+q=C.Ds.aIn(r,s,c)
p=n.createDocumentFragment()
q.toString
n=new W.jR(q)
@@ -66513,13 +66431,13 @@ for(;n=o.firstChild,n!=null;)p.appendChild(n)
return p},
$ica:1}
P.rM.prototype={$irM:1}
-P.avs.prototype={
+P.avv.prototype={
gH:function(a){return a.length},
i:function(a,b){if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
return a.getItem(b)},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -66528,40 +66446,40 @@ dr:function(a,b){return this.i(a,b)},
$ibf:1,
$iP:1,
$iD:1}
-P.aDy.prototype={}
-P.aDz.prototype={}
-P.aEo.prototype={}
-P.aEp.prototype={}
-P.aHb.prototype={}
-P.aHc.prototype={}
-P.aIl.prototype={}
-P.aIm.prototype={}
-P.aka.prototype={}
-P.agB.prototype={
+P.aDB.prototype={}
+P.aDC.prototype={}
+P.aEr.prototype={}
+P.aEs.prototype={}
+P.aHe.prototype={}
+P.aHf.prototype={}
+P.aIo.prototype={}
+P.aIp.prototype={}
+P.akd.prototype={}
+P.agE.prototype={
j:function(a){return this.b}}
-P.aqN.prototype={
+P.aqQ.prototype={
j:function(a){return this.b}}
P.EF.prototype={
-gQX:function(a){return this.b},
-v7:function(a,b){return this.gQX(this).$1(b)}}
-P.abp.prototype={
+gQW:function(a){return this.b},
+v7:function(a,b){return this.gQW(this).$1(b)}}
+P.abt.prototype={
gH:function(a){var s=this.a
return s.gH(s)},
gag:function(a){var s=this.a
return s.b===s.c},
vZ:function(a,b){var s,r=this.b
if(r<=0)return!0
-else{s=this.aru(r-1)
+else{s=this.arx(r-1)
this.a.mz(0,b)
return s>0}},
-aru:function(a){var s,r,q,p
+arx:function(a){var s,r,q,p
for(s=this.a,r=0;(s.c-s.b&s.a.length-1)>>>0>a;){q=s.w2()
p=this.c
if(p!=null)p.$1(q);++r}return r}}
-P.agp.prototype={
-azu:function(a){a.v7(0,null)},
-HU:function(a,b){return this.aJh(a,b)},
-aJh:function(a,b){var s=0,r=P.X(t.n),q=this,p,o,n,m
+P.ags.prototype={
+azy:function(a){a.v7(0,null)},
+HU:function(a,b){return this.aJn(a,b)},
+aJn:function(a,b){var s=0,r=P.X(t.n),q=this,p,o,n,m
var $async$HU=P.Q(function(c,d){if(c===1)return P.U(d,r)
while(true)switch(s){case 0:m=q.a
case 2:if(!!0){s=3
@@ -66578,28 +66496,28 @@ case 4:s=2
break
case 3:return P.V(null,r)}})
return P.W($async$HU,r)}}
-P.aqc.prototype={
-m1:function(a,b){return C.l.m1(this.a,b.garB())&&C.l.m1(this.b,b.garC())},
+P.aqf.prototype={
+m1:function(a,b){return C.l.m1(this.a,b.garE())&&C.l.m1(this.b,b.garF())},
q8:function(a,b){return this.a>b.a&&this.b>b.b},
-q3:function(a,b){return C.l.q3(this.a,b.garB())&&C.l.q3(this.b,b.garC())},
+q4:function(a,b){return C.l.q4(this.a,b.garE())&&C.l.q4(this.b,b.garF())},
B:function(a,b){if(b==null)return!1
-return b instanceof P.aqc&&b.a==this.a&&b.b==this.b},
-gG:function(a){return P.bC(this.a,this.b,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
+return b instanceof P.aqf&&b.a==this.a&&b.b==this.b},
+gG:function(a){return P.bB(this.a,this.b,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
j:function(a){return"OffsetBase("+J.dr(this.a,1)+", "+J.dr(this.b,1)+")"}}
P.a_.prototype={
-gaJy:function(a){return this.a},
-gaJz:function(a){return this.b},
-gih:function(){var s=this.a,r=this.b
+gaJE:function(a){return this.a},
+gaJF:function(a){return this.b},
+gie:function(){var s=this.a,r=this.b
return Math.sqrt(s*s+r*r)},
gvl:function(){var s=this.a,r=this.b
return s*s+r*r},
bl:function(a,b){return new P.a_(this.a-b.a,this.b-b.b)},
-a8:function(a,b){return new P.a_(this.a+b.a,this.b+b.b)},
-b0:function(a,b){return new P.a_(this.a*b,this.b*b)},
-eJ:function(a,b){return new P.a_(this.a/b,this.b/b)},
+a7:function(a,b){return new P.a_(this.a+b.a,this.b+b.b)},
+b1:function(a,b){return new P.a_(this.a*b,this.b*b)},
+eG:function(a,b){return new P.a_(this.a/b,this.b/b)},
B:function(a,b){if(b==null)return!1
return b instanceof P.a_&&b.a==this.a&&b.b==this.b},
-gG:function(a){return P.bC(this.a,this.b,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
+gG:function(a){return P.bB(this.a,this.b,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
j:function(a){return"Offset("+J.dr(this.a,1)+", "+J.dr(this.b,1)+")"}}
P.aZ.prototype={
gag:function(a){return this.a<=0||this.b<=0},
@@ -66607,10 +66525,10 @@ bl:function(a,b){var s=this
if(b instanceof P.aZ)return new P.a_(s.a-b.a,s.b-b.b)
if(b instanceof P.a_)return new P.aZ(s.a-b.a,s.b-b.b)
throw H.d(P.aa(b))},
-a8:function(a,b){return new P.aZ(this.a+b.a,this.b+b.b)},
-b0:function(a,b){return new P.aZ(this.a*b,this.b*b)},
-eJ:function(a,b){return new P.aZ(this.a/b,this.b/b)},
-lL:function(a){return new P.a_(a.a+this.a/2,a.b+this.b/2)},
+a7:function(a,b){return new P.aZ(this.a+b.a,this.b+b.b)},
+b1:function(a,b){return new P.aZ(this.a*b,this.b*b)},
+eG:function(a,b){return new P.aZ(this.a/b,this.b/b)},
+lK:function(a){return new P.a_(a.a+this.a/2,a.b+this.b/2)},
H5:function(a,b){return new P.a_(b.a+this.a,b.b+this.b)},
I:function(a,b){var s=b.a
if(s>=0)if(s=s.c||s.b>=s.d},
fD:function(a){var s=this,r=a.a,q=a.b
-return new P.ax(s.a+r,s.b+q,s.c+r,s.d+q)},
+return new P.ay(s.a+r,s.b+q,s.c+r,s.d+q)},
dm:function(a,b,c){var s=this
-return new P.ax(s.a+b,s.b+c,s.c+b,s.d+c)},
+return new P.ay(s.a+b,s.b+c,s.c+b,s.d+c)},
kl:function(a){var s=this
-return new P.ax(s.a-a,s.b-a,s.c+a,s.d+a)},
+return new P.ay(s.a-a,s.b-a,s.c+a,s.d+a)},
nH:function(a){var s,r,q,p=this,o=a.a
o=Math.max(H.aq(p.a),H.aq(o))
s=a.b
@@ -66647,24 +66565,24 @@ s=Math.max(H.aq(p.b),H.aq(s))
r=a.c
r=Math.min(H.aq(p.c),H.aq(r))
q=a.d
-return new P.ax(o,s,r,Math.min(H.aq(p.d),H.aq(q)))},
-Ca:function(a){var s,r,q,p=this,o=a.a
+return new P.ay(o,s,r,Math.min(H.aq(p.d),H.aq(q)))},
+C9:function(a){var s,r,q,p=this,o=a.a
o=Math.min(H.aq(p.a),H.aq(o))
s=a.b
s=Math.min(H.aq(p.b),H.aq(s))
r=a.c
r=Math.max(H.aq(p.c),H.aq(r))
q=a.d
-return new P.ax(o,s,r,Math.max(H.aq(p.d),H.aq(q)))},
-aP3:function(a){var s=this
+return new P.ay(o,s,r,Math.max(H.aq(p.d),H.aq(q)))},
+aP9:function(a){var s=this
if(s.c<=a.a||a.c<=s.a)return!1
if(s.d<=a.b||a.d<=s.b)return!1
return!0},
gm2:function(){var s=this
return Math.min(Math.abs(s.c-s.a),Math.abs(s.d-s.b))},
-gaH3:function(){var s=this.b
+gaH9:function(){var s=this.b
return new P.a_(this.a,s+(this.d-s)/2)},
-gef:function(){var s=this,r=s.a,q=s.b
+ged:function(){var s=this,r=s.a,q=s.b
return new P.a_(r+(s.c-r)/2,q+(s.d-q)/2)},
I:function(a,b){var s=this,r=b.a
if(r>=s.a)if(r>>16},
-gafL:function(){return(65280&this.gw(this))>>>8},
-gaGt:function(){return(255&this.gw(this))>>>0},
+P.a3.prototype={
+gaQ7:function(){return(16711680&this.gw(this))>>>16},
+gafP:function(){return(65280&this.gw(this))>>>8},
+gaGz:function(){return(255&this.gw(this))>>>0},
B:function(a,b){var s=this
if(b==null)return!1
if(s===b)return!0
if(J.bk(b)!==H.aY(s))return!1
-return b instanceof P.a4&&b.gw(b)===s.gw(s)},
+return b instanceof P.a3&&b.gw(b)===s.gw(s)},
gG:function(a){return C.e.gG(this.gw(this))},
-j:function(a){return"Color(0x"+C.d.h6(C.e.jp(this.gw(this),16),8,"0")+")"},
+j:function(a){return"Color(0x"+C.d.h6(C.e.jn(this.gw(this),16),8,"0")+")"},
gw:function(a){return this.a}}
-P.a4J.prototype={
+P.a4M.prototype={
j:function(a){return this.b}}
-P.a4K.prototype={
+P.a4N.prototype={
j:function(a){return this.b}}
-P.aqI.prototype={
+P.aqL.prototype={
j:function(a){return this.b}}
P.fx.prototype={
j:function(a){return this.b}}
-P.Q9.prototype={
+P.Qd.prototype={
j:function(a){return this.b}}
-P.aO5.prototype={
+P.aO8.prototype={
j:function(a){return this.b}}
-P.L_.prototype={
+P.L0.prototype={
B:function(a,b){if(b==null)return!1
-return b instanceof P.L_&&b.a===this.a&&b.b===this.b},
-gG:function(a){return P.bC(this.a,this.b,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
-j:function(a){return"MaskFilter.blur("+this.a.j(0)+", "+C.l.e8(this.b,1)+")"}}
-P.b2k.prototype={
+return b instanceof P.L0&&b.a===this.a&&b.b===this.b},
+gG:function(a){return P.bB(this.a,this.b,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
+j:function(a){return"MaskFilter.blur("+this.a.j(0)+", "+C.l.e6(this.b,1)+")"}}
+P.b2b.prototype={
j:function(a){return this.b}}
-P.cHU.prototype={
-$1:function(a){return P.dqd(this.a,a)},
-$S:423}
-P.cL5.prototype={
-$1:function(a){return P.dqe(this.a,this.b,a)},
-$S:423}
-P.au_.prototype={
+P.cHl.prototype={
+$1:function(a){return P.dpB(this.a,a)},
+$S:422}
+P.cKu.prototype={
+$1:function(a){return P.dpC(this.a,this.b,a)},
+$S:422}
+P.au2.prototype={
B:function(a,b){var s=this
if(b==null)return!1
if(s===b)return!0
-return b instanceof P.au_&&J.j(b.a,s.a)&&J.j(b.b,s.b)&&b.c==s.c},
-gG:function(a){return P.bC(this.a,this.b,this.c,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
+return b instanceof P.au2&&J.j(b.a,s.a)&&J.j(b.b,s.b)&&b.c==s.c},
+gG:function(a){return P.bB(this.a,this.b,this.c,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
j:function(a){return"TextShadow("+H.f(this.a)+", "+H.f(this.b)+", "+H.f(this.c)+")"}}
P.x5.prototype={
j:function(a){return this.b}}
P.BK.prototype={
j:function(a){return this.b}}
-P.a2T.prototype={
+P.a2V.prototype={
j:function(a){return this.b}}
-P.T6.prototype={
+P.Ta.prototype={
j:function(a){return"PointerData(x: "+H.f(this.x)+", y: "+H.f(this.y)+")"}}
-P.T7.prototype={}
-P.hU.prototype={
+P.Tb.prototype={}
+P.hS.prototype={
j:function(a){switch(this.a){case 1:return"SemanticsAction.tap"
case 2:return"SemanticsAction.longPress"
case 4:return"SemanticsAction.scrollLeft"
@@ -66823,7 +66741,7 @@ case 131072:return"SemanticsAction.customAction"
case 262144:return"SemanticsAction.dismiss"
case 524288:return"SemanticsAction.moveCursorForwardByWord"
case 1048576:return"SemanticsAction.moveCursorBackwardByWord"}return""}}
-P.hy.prototype={
+P.hx.prototype={
j:function(a){switch(this.a){case 1:return"SemanticsFlag.hasCheckedState"
case 2:return"SemanticsFlag.isChecked"
case 4:return"SemanticsFlag.isSelected"
@@ -66847,35 +66765,35 @@ case 131072:return"SemanticsFlag.isToggled"
case 262144:return"SemanticsFlag.hasImplicitScrolling"
case 524288:return"SemanticsFlag.isMultiline"
case 1048576:return"SemanticsFlag.isReadOnly"}return""}}
-P.bsx.prototype={}
-P.al5.prototype={
+P.bso.prototype={}
+P.al8.prototype={
j:function(a){return this.b}}
P.BJ.prototype={
j:function(a){return this.b}}
-P.pB.prototype={
+P.pz.prototype={
j:function(a){var s=C.alG.i(0,this.a)
s.toString
return s}}
-P.a05.prototype={
+P.a07.prototype={
B:function(a,b){var s
if(b==null)return!1
if(this===b)return!0
if(J.bk(b)!==H.aY(this))return!1
-if(b instanceof P.a05)s=!0
+if(b instanceof P.a07)s=!0
else s=!1
return s},
-gG:function(a){return P.bC("tnum",1,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
+gG:function(a){return P.bB("tnum",1,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
j:function(a){return"FontFeature(tnum, 1)"},
gw:function(){return 1}}
P.xQ.prototype={
j:function(a){return this.b}}
-P.a4V.prototype={
+P.a4Y.prototype={
j:function(a){return this.b}}
-P.MX.prototype={
+P.N_.prototype={
I:function(a,b){var s=this.a
return(s|b.a)===s},
B:function(a,b){if(b==null)return!1
-return b instanceof P.MX&&b.a===this.a},
+return b instanceof P.N_&&b.a===this.a},
gG:function(a){return C.e.gG(this.a)},
j:function(a){var s,r=this.a
if(r===0)return"TextDecoration.none"
@@ -66885,36 +66803,36 @@ if((r&2)!==0)s.push("overline")
if((r&4)!==0)s.push("lineThrough")
if(s.length===1)return"TextDecoration."+s[0]
return"TextDecoration.combine(["+C.b.dl(s,", ")+"])"}}
-P.MY.prototype={
+P.N0.prototype={
j:function(a){return this.b}}
-P.MZ.prototype={
+P.N1.prototype={
j:function(a){return this.b}}
P.rI.prototype={
-ged:function(a){return this.e===C.R?this.a:this.c},
-ge9:function(a){return this.e===C.R?this.c:this.a},
+geb:function(a){return this.e===C.Q?this.a:this.c},
+ge7:function(a){return this.e===C.Q?this.c:this.a},
B:function(a,b){var s=this
if(b==null)return!1
if(s===b)return!0
if(J.bk(b)!==H.aY(s))return!1
return b instanceof P.rI&&b.a==s.a&&b.b==s.b&&b.c==s.c&&b.d==s.d&&b.e===s.e},
gG:function(a){var s=this
-return P.bC(s.a,s.b,s.c,s.d,s.e,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
+return P.bB(s.a,s.b,s.c,s.d,s.e,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
j:function(a){var s=this
return"TextBox.fromLTRBD("+J.dr(s.a,1)+", "+J.dr(s.b,1)+", "+J.dr(s.c,1)+", "+J.dr(s.d,1)+", "+s.e.j(0)+")"}}
-P.av8.prototype={
+P.avb.prototype={
j:function(a){return this.b}}
P.fZ.prototype={
B:function(a,b){if(b==null)return!1
if(J.bk(b)!==H.aY(this))return!1
return b instanceof P.fZ&&b.a==this.a&&b.b===this.b},
-gG:function(a){return P.bC(this.a,this.b,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
+gG:function(a){return P.bB(this.a,this.b,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
j:function(a){return H.aY(this).j(0)+"(offset: "+H.f(this.a)+", affinity: "+this.b.j(0)+")"}}
P.uY.prototype={
-goJ:function(){return this.a>=0&&this.b>=0},
+goK:function(){return this.a>=0&&this.b>=0},
B:function(a,b){if(b==null)return!1
if(this===b)return!0
return b instanceof P.uY&&b.a==this.a&&b.b==this.b},
-gG:function(a){return P.bC(J.h(this.a),J.h(this.b),C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
+gG:function(a){return P.bB(J.h(this.a),J.h(this.b),C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
j:function(a){return"TextRange(start: "+H.f(this.a)+", end: "+H.f(this.b)+")"}}
P.wV.prototype={
B:function(a,b){if(b==null)return!1
@@ -66922,32 +66840,32 @@ if(J.bk(b)!==H.aY(this))return!1
return b instanceof P.wV&&b.a==this.a},
gG:function(a){return J.h(this.a)},
j:function(a){return H.aY(this).j(0)+"(width: "+H.f(this.a)+")"}}
-P.afV.prototype={
+P.afY.prototype={
j:function(a){return this.b}}
-P.aOi.prototype={
+P.aOl.prototype={
j:function(a){return"BoxWidthStyle.tight"}}
-P.bzs.prototype={
+P.bzj.prototype={
j:function(a){return this.b}}
-P.Ps.prototype={
+P.Pw.prototype={
j:function(a){return this.b}}
P.ld.prototype={
-gip:function(a){var s=this.a,r=C.ee.i(0,s)
+gim:function(a){var s=this.a,r=C.eg.i(0,s)
return r==null?s:r},
-gkd:function(){var s=this.c,r=C.f5.i(0,s)
+gkd:function(){var s=this.c,r=C.f6.i(0,s)
return r==null?s:r},
B:function(a,b){var s,r=this
if(b==null)return!1
if(r===b)return!0
-if(b instanceof P.ld)if(b.gip(b)==r.gip(r))s=b.gkd()==r.gkd()
+if(b instanceof P.ld)if(b.gim(b)==r.gim(r))s=b.gkd()==r.gkd()
else s=!1
else s=!1
return s},
-gG:function(a){return P.bC(this.gip(this),null,this.gkd(),C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
-j:function(a){var s=this,r=H.f(s.gip(s))
+gG:function(a){return P.bB(this.gim(this),null,this.gkd(),C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a,C.a)},
+j:function(a){var s=this,r=H.f(s.gim(s))
if(s.c!=null)r+="_"+H.f(s.gkd())
return r.charCodeAt(0)==0?r:r}}
-P.bED.prototype={}
-P.aeD.prototype={
+P.bEi.prototype={}
+P.aeG.prototype={
j:function(a){var s=H.a([],t.s),r=this.a
if((1&r)!==0)s.push("accessibleNavigation")
if((2&r)!==0)s.push("invertColors")
@@ -66958,81 +66876,81 @@ if((32&r)!==0)s.push("highContrast")
return"AccessibilityFeatures"+H.f(s)},
B:function(a,b){if(b==null)return!1
if(J.bk(b)!==H.aY(this))return!1
-return b instanceof P.aeD&&b.a===this.a},
+return b instanceof P.aeG&&b.a===this.a},
gG:function(a){return C.e.gG(this.a)}}
-P.afY.prototype={
+P.ag0.prototype={
j:function(a){return this.b}}
-P.aPi.prototype={
+P.aPl.prototype={
B:function(a,b){if(b==null)return!1
return this===b},
gG:function(a){return P.an.prototype.gG.call(this,this)}}
P.qW.prototype={
j:function(a){var s=this.a
return H.aY(this).j(0)+"(buildDuration: "+(H.f((P.c3(0,0,s[2],0,0,0).a-P.c3(0,0,s[1],0,0,0).a)*0.001)+"ms")+", rasterDuration: "+(H.f((P.c3(0,0,s[4],0,0,0).a-P.c3(0,0,s[3],0,0,0).a)*0.001)+"ms")+", vsyncOverhead: "+(H.f((P.c3(0,0,s[1],0,0,0).a-P.c3(0,0,s[0],0,0,0).a)*0.001)+"ms")+", totalSpan: "+(H.f((P.c3(0,0,s[4],0,0,0).a-P.c3(0,0,s[0],0,0,0).a)*0.001)+"ms")+")"}}
-P.biS.prototype={
-aQ7:function(a,b){var s=this.a
-if(s.aP(0,a))return!1
+P.biJ.prototype={
+aQd:function(a,b){var s=this.a
+if(s.aN(0,a))return!1
s.E(0,a,b)
return!0}}
-P.ciJ.prototype={
+P.cih.prototype={
$1:function(a){var s=this.a
-if(a==null)s.aB(new P.Ok("operation failed"))
-else s.al(0,a)},
+if(a==null)s.aC(new P.On("operation failed"))
+else s.am(0,a)},
$S:function(){return this.b.h("w(0)")}}
-P.aMd.prototype={
+P.aMg.prototype={
gH:function(a){return a.length}}
-P.f1.prototype={
-gax:function(a){return a.context}}
-P.aMe.prototype={
+P.f2.prototype={
+gaw:function(a){return a.context}}
+P.aMh.prototype={
gw:function(a){return a.value}}
-P.afs.prototype={
+P.afv.prototype={
V:function(a,b){throw H.d(P.z("Not supported"))},
-aP:function(a,b){return P.qc(a.get(b))!=null},
-i:function(a,b){return P.qc(a.get(b))},
+aN:function(a,b){return P.qa(a.get(b))!=null},
+i:function(a,b){return P.qa(a.get(b))},
L:function(a,b){var s,r=a.entries()
for(;!0;){s=r.next()
if(s.done)return
-b.$2(s.value[0],P.qc(s.value[1]))}},
+b.$2(s.value[0],P.qa(s.value[1]))}},
gah:function(a){var s=H.a([],t.s)
-this.L(a,new P.aMf(s))
+this.L(a,new P.aMi(s))
return s},
gdY:function(a){var s=H.a([],t.n4)
-this.L(a,new P.aMg(s))
+this.L(a,new P.aMj(s))
return s},
gH:function(a){return a.size},
gag:function(a){return a.size===0},
gca:function(a){return a.size!==0},
E:function(a,b,c){throw H.d(P.z("Not supported"))},
-eH:function(a,b,c){throw H.d(P.z("Not supported"))},
-P:function(a,b){throw H.d(P.z("Not supported"))},
+eE:function(a,b,c){throw H.d(P.z("Not supported"))},
+O:function(a,b){throw H.d(P.z("Not supported"))},
cq:function(a){throw H.d(P.z("Not supported"))},
$ibr:1}
-P.aMf.prototype={
+P.aMi.prototype={
$2:function(a,b){return this.a.push(a)},
-$S:118}
-P.aMg.prototype={
+$S:113}
+P.aMj.prototype={
$2:function(a,b){return this.a.push(b)},
-$S:118}
-P.aMh.prototype={
+$S:113}
+P.aMk.prototype={
ga_:function(a){return a.id}}
-P.aft.prototype={
+P.afw.prototype={
gH:function(a){return a.length}}
-P.z2.prototype={}
-P.aqb.prototype={
+P.z1.prototype={}
+P.aqe.prototype={
gH:function(a){return a.length}}
-P.azS.prototype={}
-P.aLq.prototype={
-gaW:function(a){return a.name}}
-P.auE.prototype={
+P.azV.prototype={}
+P.aLt.prototype={
+gaX:function(a){return a.name}}
+P.auH.prototype={
gH:function(a){return a.length},
i:function(a,b){var s
if(b>>>0!==b||b>=a.length)throw H.d(P.fv(b,a,null,null,null))
-s=P.qc(a.item(b))
+s=P.qa(a.item(b))
s.toString
return s},
E:function(a,b,c){throw H.d(P.z("Cannot assign element of immutable List."))},
sH:function(a,b){throw H.d(P.z("Cannot resize immutable List."))},
-ga5:function(a){if(a.length>0)return a[0]
+ga4:function(a){if(a.length>0)return a[0]
throw H.d(P.bg("No elements"))},
gaS:function(a){var s=a.length
if(s>0)return a[s-1]
@@ -67041,106 +66959,106 @@ dr:function(a,b){return this.i(a,b)},
$ibf:1,
$iP:1,
$iD:1}
-P.aH2.prototype={}
-P.aH3.prototype={}
-D.b3j.prototype={
-c_:function(a){var s,r,q,p,o,n,m,l=null,k=Q.cUP(32768)
-k.aRK(35615)
+P.aH5.prototype={}
+P.aH6.prototype={}
+D.b3a.prototype={
+c_:function(a){var s,r,q,p,o,n,m,l=null,k=Q.cUf(32768)
+k.aRQ(35615)
k.oZ(8)
s=C.e.dn(Date.now(),1000)
k.oZ(0)
-k.W8(s)
+k.W7(s)
k.oZ(0)
k.oZ(255)
if(t._w.b(a)){r=new Uint16Array(16)
q=new Uint32Array(573)
p=new Uint8Array(573)
-o=T.cNa(a,0,l,0)
+o=T.cMy(a,0,l,0)
n=k
-m=new T.ajc(o,n,new T.Eu(),new T.Eu(),new T.Eu(),r,q,p)
+m=new T.ajf(o,n,new T.Eu(),new T.Eu(),new T.Eu(),r,q,p)
m.a=0
m.a1h(l)
-m.a_s(4)}else{t.JV.a(a)
+m.a_r(4)}else{t.JV.a(a)
r=new Uint16Array(16)
q=new Uint32Array(573)
p=new Uint8Array(573)
o=k
-m=new T.ajc(a,o,new T.Eu(),new T.Eu(),new T.Eu(),r,q,p)
+m=new T.ajf(a,o,new T.Eu(),new T.Eu(),new T.Eu(),r,q,p)
m.a=0
m.a1h(l)
-m.a_s(4)}k.W8(m.a)
-k.W8(J.bX(a))
-r=H.hR(k.c.buffer,0,k.a)
+m.a_r(4)}k.W7(m.a)
+k.W7(J.bY(a))
+r=H.hP(k.c.buffer,0,k.a)
return r}}
-R.af5.prototype={}
-T.a0y.prototype={}
-T.alE.prototype={
+R.af8.prototype={}
+T.a0A.prototype={}
+T.alH.prototype={
gH:function(a){return this.e-(this.b-this.c)},
-gyL:function(){return this.b>=this.c+this.e},
+gyJ:function(){return this.b>=this.c+this.e},
i:function(a,b){return J.e(this.a,this.b+b)},
JL:function(){return J.e(this.a,this.b++)},
-V5:function(a){var s=this,r=s.c,q=s.b-r+r,p=a==null||a<0?s.e-(q-r):a,o=T.cNa(s.a,s.d,p,q)
+V4:function(a){var s=this,r=s.c,q=s.b-r+r,p=a==null||a<0?s.e-(q-r):a,o=T.cMy(s.a,s.d,p,q)
s.b=s.b+o.gH(o)
return o},
-ac3:function(){var s,r,q,p,o=this,n=H.a([],t.W)
-if(o.gyL())return""
+ac7:function(){var s,r,q,p,o=this,n=H.a([],t.W)
+if(o.gyJ())return""
for(s=o.c,r=o.a,q=J.am(r);p=o.b,p>>0
return(m<<24|n<<16|o<<8|p)>>>0},
-aR0:function(){var s,r,q,p=this,o=p.gH(p),n=p.a
+aR6:function(){var s,r,q,p=this,o=p.gH(p),n=p.a
if(t.NG.b(n)){s=p.b
r=n.length
if(s+o>r)o=r-s
-return H.hR(n.buffer,n.byteOffset+s,o)}q=p.b+o
+return H.hP(n.buffer,n.byteOffset+s,o)}q=p.b+o
s=J.am(n)
if(q>s.gH(n))q=s.gH(n)
-return new Uint8Array(H.vp(s.f4(n,p.b,q)))}}
-Q.bgl.prototype={}
-Q.bgk.prototype={
+return new Uint8Array(H.vq(s.f5(n,p.b,q)))}}
+Q.bgc.prototype={}
+Q.bgb.prototype={
gH:function(a){return this.a},
oZ:function(a){var s=this
-if(s.a===s.c.length)s.as4()
+if(s.a===s.c.length)s.as7()
s.c[s.a++]=a&255},
-adN:function(a,b){var s,r,q,p,o=this
+adR:function(a,b){var s,r,q,p,o=this
if(b==null)b=a.length
-for(;s=o.a,r=s+b,q=o.c,p=q.length,r>p;)o.No(r-p)
+for(;s=o.a,r=s+b,q=o.c,p=q.length,r>p;)o.Nn(r-p)
C.aH.fC(q,s,r,a)
o.a+=b},
-W6:function(a){return this.adN(a,null)},
-aRI:function(a){var s,r,q,p,o,n=this
-for(s=a.c;r=n.a,q=r+(a.e-(a.b-s)),p=n.c,o=p.length,q>o;)n.No(q-o)
-C.aH.dS(p,r,r+a.gH(a),a.a,a.b)
+W5:function(a){return this.adR(a,null)},
+aRO:function(a){var s,r,q,p,o,n=this
+for(s=a.c;r=n.a,q=r+(a.e-(a.b-s)),p=n.c,o=p.length,q>o;)n.Nn(q-o)
+C.aH.dT(p,r,r+a.gH(a),a.a,a.b)
n.a=n.a+a.gH(a)},
-aRK:function(a){this.oZ(a&255)
+aRQ:function(a){this.oZ(a&255)
this.oZ(a>>>8&255)},
-W8:function(a){var s=this
+W7:function(a){var s=this
s.oZ(a&255)
s.oZ(C.e.fZ(a,8)&255)
s.oZ(C.e.fZ(a,16)&255)
s.oZ(C.e.fZ(a,24)&255)},
-XG:function(a,b){var s=this
+XF:function(a,b){var s=this
if(a<0)a=s.a+a
if(b==null)b=s.a
else if(b<0)b=s.a+b
-return H.hR(s.c.buffer,a,b-a)},
-XF:function(a){return this.XG(a,null)},
-No:function(a){var s=a!=null?a>32768?a:32768:32768,r=this.c,q=new Uint8Array((r.length+s)*2)
+return H.hP(s.c.buffer,a,b-a)},
+XE:function(a){return this.XF(a,null)},
+Nn:function(a){var s=a!=null?a>32768?a:32768:32768,r=this.c,q=new Uint8Array((r.length+s)*2)
r=this.c
C.aH.fC(q,0,r.length,r)
this.c=q},
-as4:function(){return this.No(null)}}
-T.ajc.prototype={
+as7:function(){return this.Nn(null)}}
+T.ajf.prototype={
a1h:function(a){var s,r=this
-$.ajd=r.asS(6)
-r.O=new Uint16Array(1146)
-r.a6=new Uint16Array(122)
+$.ajg=r.asV(6)
+r.P=new Uint16Array(1146)
+r.a5=new Uint16Array(122)
r.a0=new Uint16Array(78)
r.cy=15
r.cx=32768
@@ -67156,54 +67074,54 @@ r.fr=new Uint16Array(s)
s=r.go
if(!H.bE(s))H.b(P.aa("Invalid length "+H.f(s)))
r.fx=new Uint16Array(s)
-r.aO=16384
+r.aM=16384
r.f=new Uint8Array(65536)
-s=r.aO
+s=r.aM
r.r=s*4
-r.bP=s
-r.bV=3*s
+r.bR=s
+r.bW=3*s
r.y1=6
r.x=r.y=r.y2=0
r.e=113
r.a=0
-s=r.a4
-s.a=r.O
-s.c=$.d4w()
-s=r.au
-s.a=r.a6
-s.c=$.d4v()
-s=r.aL
+s=r.ae
+s.a=r.P
+s.c=$.d3Y()
+s=r.ad
+s.a=r.a5
+s.c=$.d3X()
+s=r.aG
s.a=r.a0
-s.c=$.d4u()
-r.av=r.ae=0
+s.c=$.d3W()
+r.av=r.aj=0
r.U=8
r.a1i()
-r.ayn()},
-a_s:function(a){var s,r,q,p,o=this
-if(a>4||!1)throw H.d(R.ts("Invalid Deflate Parameter"))
-if(o.y!==0)o.N4()
-if(o.c.gyL())if(o.x1===0)s=a!==0&&o.e!==666
+r.ayr()},
+a_r:function(a){var s,r,q,p,o=this
+if(a>4||!1)throw H.d(R.tr("Invalid Deflate Parameter"))
+if(o.y!==0)o.N3()
+if(o.c.gyJ())if(o.x1===0)s=a!==0&&o.e!==666
else s=!0
else s=!0
-if(s){switch($.ajd.e){case 0:r=o.aqO(a)
+if(s){switch($.ajg.e){case 0:r=o.aqR(a)
break
-case 1:r=o.aqM(a)
+case 1:r=o.aqP(a)
break
-case 2:r=o.aqN(a)
+case 2:r=o.aqQ(a)
break
default:r=-1
break}s=r===2
if(s||r===3)o.e=666
if(r===0||s)return 0
-if(r===1){if(a===1){o.jv(2,3)
-o.xw(256,C.rN)
-o.a6A()
-if(1+o.U+10-o.av<9){o.jv(2,3)
-o.xw(256,C.rN)
-o.a6A()}o.U=7}else{o.a4T(0,0,!1)
-if(a===3)for(s=o.go,q=o.fx,p=0;p>>0
-for(s=this.bF;r=this.aN,n<=r;b=n,n=q){if(n>>0
+for(s=this.bF;r=this.aV,n<=r;b=n,n=q){if(n>>0}p[b]=o},
-a3A:function(a,b){var s,r,q,p,o,n,m,l,k=a[1]
+a3D:function(a,b){var s,r,q,p,o,n,m,l,k=a[1]
if(k===0){s=138
r=3}else{s=7
r=4}a[(b+1)*2+1]=65535
@@ -67239,22 +67157,22 @@ r=3}else if(k===m){s=6
r=3}else{s=7
r=4}o=k
n=0}},
-aoQ:function(){var s,r,q=this
-q.a3A(q.O,q.a4.b)
-q.a3A(q.a6,q.au.b)
-q.aL.Mq(q)
+aoU:function(){var s,r,q=this
+q.a3D(q.P,q.ae.b)
+q.a3D(q.a5,q.ad.b)
+q.aG.Mq(q)
for(s=q.a0,r=18;r>=3;--r)if(s[C.za[r]*2+1]!==0)break
-q.b4=q.b4+(3*(r+1)+5+5+4)
+q.b5=q.b5+(3*(r+1)+5+5+4)
return r},
-aCt:function(a,b,c){var s,r,q=this
-q.jv(a-257,5)
+aCz:function(a,b,c){var s,r,q=this
+q.jt(a-257,5)
s=b-1
-q.jv(s,5)
-q.jv(c-4,4)
-for(r=0;r16-b){r=s.ae=(q|C.e.hz(a,r)&65535)>>>0
+xv:function(a,b){var s=a*2
+this.jt(b[s]&65535,b[s+1]&65535)},
+jt:function(a,b){var s=this,r=s.av,q=s.aj
+if(r>16-b){r=s.aj=(q|C.e.hz(a,r)&65535)>>>0
s.na(r)
-s.na(T.nj(r,8))
+s.na(T.ni(r,8))
r=s.av
-s.ae=T.nj(a,16-r)
-s.av=r+(b-16)}else{s.ae=(q|C.e.hz(a,r)&65535)>>>0
+s.aj=T.ni(a,16-r)
+s.av=r+(b-16)}else{s.aj=(q|C.e.hz(a,r)&65535)>>>0
s.av=r+b}},
-Bd:function(a,b){var s,r,q,p=this,o=p.f,n=p.bP,m=p.aw
+Bb:function(a,b){var s,r,q,p=this,o=p.f,n=p.bR,m=p.aA
n+=m*2
-o[n]=T.nj(a,8)
+o[n]=T.ni(a,8)
o[n+1]=a
-o[p.bV+m]=b
-p.aw=m+1
-if(a===0){o=p.O
+o[p.bW+m]=b
+p.aA=m+1
+if(a===0){o=p.P
n=b*2
-o[n]=o[n]+1}else{p.Y=p.Y+1
-o=p.O
+o[n]=o[n]+1}else{p.Z=p.Z+1
+o=p.P
n=(C.Lo[b]+256+1)*2
o[n]=o[n]+1
-n=p.a6
-o=T.cYi(a-1)*2
-n[o]=n[o]+1}o=p.aw
+n=p.a5
+o=T.cXJ(a-1)*2
+n[o]=n[o]+1}o=p.aA
if((o&8191)===0&&p.y1>2){s=o*8
n=p.rx
m=p.k3
-for(r=p.a6,q=0;q<30;++q)s+=r[q*2]*(5+C.rL[q])
-s=T.nj(s,3)
-if(p.YT.nj(p,2)?0:1},
-a6A:function(){var s=this,r=s.av
-if(r===16){r=s.ae
+agN:function(){var s,r,q,p
+for(s=this.P,r=0,q=0;r<7;){q+=s[r*2];++r}for(p=0;r<128;){p+=s[r*2];++r}for(;r<256;){q+=s[r*2];++r}this.z=q>T.ni(p,2)?0:1},
+a6E:function(){var s=this,r=s.av
+if(r===16){r=s.aj
s.na(r)
-s.na(T.nj(r,8))
-s.av=s.ae=0}else if(r>=8){s.na(s.ae)
-s.ae=T.nj(s.ae,8)
+s.na(T.ni(r,8))
+s.av=s.aj=0}else if(r>=8){s.na(s.aj)
+s.aj=T.ni(s.aj,8)
s.av=s.av-8}},
-Z5:function(){var s=this,r=s.av
-if(r>8){r=s.ae
+Z4:function(){var s=this,r=s.av
+if(r>8){r=s.aj
s.na(r)
-s.na(T.nj(r,8))}else if(r>0)s.na(s.ae)
-s.av=s.ae=0},
+s.na(T.ni(r,8))}else if(r>0)s.na(s.aj)
+s.av=s.aj=0},
t_:function(a){var s,r,q,p=this,o=p.k3,n=o>=0?o:-1
o=p.rx-o
-if(p.y1>0){if(p.z===2)p.agJ()
-p.a4.Mq(p)
-p.au.Mq(p)
-s=p.aoQ()
-r=T.nj(p.b4+3+7,3)
-q=T.nj(p.a2+3+7,3)
+if(p.y1>0){if(p.z===2)p.agN()
+p.ae.Mq(p)
+p.ad.Mq(p)
+s=p.aoU()
+r=T.ni(p.b5+3+7,3)
+q=T.ni(p.a2+3+7,3)
if(q<=r)r=q}else{q=o+5
r=q
-s=0}if(o+4<=r&&n!==-1)p.a4T(n,o,a)
-else if(q===r){p.jv(2+(a?1:0),3)
-p.ZV(C.rN,C.Nh)}else{p.jv(4+(a?1:0),3)
-p.aCt(p.a4.b+1,p.au.b+1,s+1)
-p.ZV(p.O,p.a6)}p.a1i()
-if(a)p.Z5()
+s=0}if(o+4<=r&&n!==-1)p.a4X(n,o,a)
+else if(q===r){p.jt(2+(a?1:0),3)
+p.ZU(C.rM,C.Ng)}else{p.jt(4+(a?1:0),3)
+p.aCz(p.ae.b+1,p.ad.b+1,s+1)
+p.ZU(p.P,p.a5)}p.a1i()
+if(a)p.Z4()
p.k3=p.rx
-p.N4()},
-aqO:function(a){var s,r,q,p,o=this,n=o.r-5
+p.N3()},
+aqR:function(a){var s,r,q,p,o=this,n=o.r-5
n=65535>n?n:65535
for(s=a===0;!0;){r=o.x1
-if(r<=1){o.Nu()
+if(r<=1){o.Nt()
r=o.x1
q=r===0
if(q&&s)return 0
@@ -67379,24 +67297,24 @@ o.rx=p
o.t_(!1)}if(o.rx-o.k3>=o.cx-262)o.t_(!1)}s=a===4
o.t_(s)
return s?3:1},
-a4T:function(a,b,c){var s,r=this
-r.jv(c?1:0,3)
-r.Z5()
+a4X:function(a,b,c){var s,r=this
+r.jt(c?1:0,3)
+r.Z4()
r.U=8
r.na(b)
-r.na(T.nj(b,8))
+r.na(T.ni(b,8))
s=(~b>>>0)+65536&65535
r.na(s)
-r.na(T.nj(s,8))
-r.aB4(r.dx,a,b)},
-Nu:function(){var s,r,q,p,o,n,m,l,k,j=this,i=j.c
+r.na(T.ni(s,8))
+r.aBa(r.dx,a,b)},
+Nt:function(){var s,r,q,p,o,n,m,l,k,j=this,i=j.c
do{s=j.dy
r=j.x1
q=j.rx
p=s-r-q
if(p===0&&q===0&&r===0)p=j.cx
else{s=j.cx
-if(q>=s+s-262){r=j.dx;(r&&C.aH).dS(r,0,s,r,s)
+if(q>=s+s-262){r=j.dx;(r&&C.aH).dT(r,0,s,r,s)
s=j.ry
o=j.cx
j.ry=s-o
@@ -67414,17 +67332,17 @@ n=m
do{--m
l=s[m]&65535
s[m]=l>=o?l-o:0}while(--n,n!==0)
-p+=o}}if(i.gyL())return
-o=j.aBf(j.dx,j.rx+j.x1,p)
+p+=o}}if(i.gyJ())return
+o=j.aBl(j.dx,j.rx+j.x1,p)
s=j.x1=j.x1+o
if(s>=3){r=j.dx
q=j.rx
k=r[q]&255
j.fy=k
-j.fy=((C.e.hz(k,j.k2)^r[q+1]&255)&j.k1)>>>0}}while(s<262&&!i.gyL())},
-aqM:function(a){var s,r,q,p,o,n,m,l,k=this
+j.fy=((C.e.hz(k,j.k2)^r[q+1]&255)&j.k1)>>>0}}while(s<262&&!i.gyJ())},
+aqP:function(a){var s,r,q,p,o,n,m,l,k=this
for(s=a===0,r=0;!0;){q=k.x1
-if(q<262){k.Nu()
+if(q<262){k.Nt()
q=k.x1
if(q<262&&s)return 0
if(q===0)break}if(q>=3){q=C.e.hz(k.fy,k.k2)
@@ -67438,12 +67356,12 @@ k.fr[(o&k.db)>>>0]=n
q[p]=o}if(r!==0&&(k.rx-r&65535)<=k.cx-262)if(k.y2!==2)k.k4=k.a1T(r)
q=k.k4
p=k.rx
-if(q>=3){m=k.Bd(p-k.ry,q-3)
+if(q>=3){m=k.Bb(p-k.ry,q-3)
q=k.x1
p=k.k4
q-=p
k.x1=q
-if(p<=$.ajd.b&&q>=3){q=k.k4=p-1
+if(p<=$.ajg.b&&q>=3){q=k.k4=p-1
do{p=k.rx=k.rx+1
o=k.fy=((C.e.hz(k.fy,k.k2)^k.dx[p+2]&255)&k.k1)>>>0
n=k.fx
@@ -67456,14 +67374,14 @@ k.k4=0
p=k.dx
o=p[q]&255
k.fy=o
-k.fy=((C.e.hz(o,k.k2)^p[q+1]&255)&k.k1)>>>0}}else{m=k.Bd(0,k.dx[p]&255)
+k.fy=((C.e.hz(o,k.k2)^p[q+1]&255)&k.k1)>>>0}}else{m=k.Bb(0,k.dx[p]&255)
k.x1=k.x1-1
k.rx=k.rx+1}if(m)k.t_(!1)}s=a===4
k.t_(s)
return s?3:1},
-aqN:function(a){var s,r,q,p,o,n,m,l,k,j=this
+aqQ:function(a){var s,r,q,p,o,n,m,l,k,j=this
for(s=a===0,r=0,q=null;!0;){p=j.x1
-if(p<262){j.Nu()
+if(p<262){j.Nt()
p=j.x1
if(p<262&&s)return 0
if(p===0)break}if(p>=3){p=C.e.hz(j.fy,j.k2)
@@ -67478,7 +67396,7 @@ p[o]=n}p=j.k4
j.x2=p
j.r1=j.ry
j.k4=2
-if(r!==0&&p<$.ajd.b&&(j.rx-r&65535)<=j.cx-262){if(j.y2!==2){p=j.a1T(r)
+if(r!==0&&p<$.ajg.b&&(j.rx-r&65535)<=j.cx-262){if(j.y2!==2){p=j.a1T(r)
j.k4=p}else p=2
if(p<=5)if(j.y2!==1)o=p===3&&j.rx-j.ry>4096
else o=!0
@@ -67488,7 +67406,7 @@ p=2}}else p=2
o=j.x2
if(o>=3&&p<=o){p=j.rx
l=p+j.x1-3
-q=j.Bd(p-1-j.r1,o-3)
+q=j.Bb(p-1-j.r1,o-3)
o=j.x1
p=j.x2
j.x1=o-(p-1)
@@ -67503,16 +67421,16 @@ m[n]=o}}while(p=j.x2=p-1,p!==0)
j.r2=0
j.k4=2
j.rx=o+1
-if(q)j.t_(!1)}else if(j.r2!==0){q=j.Bd(0,j.dx[j.rx-1]&255)
+if(q)j.t_(!1)}else if(j.r2!==0){q=j.Bb(0,j.dx[j.rx-1]&255)
if(q)j.t_(!1)
j.rx=j.rx+1
j.x1=j.x1-1}else{j.r2=1
j.rx=j.rx+1
-j.x1=j.x1-1}}if(j.r2!==0){j.Bd(0,j.dx[j.rx-1]&255)
+j.x1=j.x1-1}}if(j.r2!==0){j.Bb(0,j.dx[j.rx-1]&255)
j.r2=0}s=a===4
j.t_(s)
return s?3:1},
-a1T:function(a){var s,r,q,p,o,n,m,l=this,k=$.ajd,j=k.d,i=l.rx,h=l.x2,g=l.cx-262,f=i>g?i-g:0,e=k.c,d=l.db,c=i+258
+a1T:function(a){var s,r,q,p,o,n,m,l=this,k=$.ajg,j=k.d,i=l.rx,h=l.x2,g=l.cx-262,f=i>g?i-g:0,e=k.c,d=l.db,c=i+258
g=l.dx
s=i+h
r=g[s-1]
@@ -67552,39 +67470,39 @@ k=j!==0}else k=!1}while(k)
k=l.x1
if(h<=k)return h
return k},
-aBf:function(a,b,c){var s,r,q,p,o=this
-if(c===0||o.c.gyL())return 0
-s=o.c.V5(c)
+aBl:function(a,b,c){var s,r,q,p,o=this
+if(c===0||o.c.gyJ())return 0
+s=o.c.V4(c)
r=s.gH(s)
if(r===0)return 0
-q=s.aR0()
+q=s.aR6()
p=q.length
if(r>p)r=p;(a&&C.aH).fC(a,b,b+r,q)
o.b+=r
-o.a=X.dBi(q,o.a)
+o.a=X.dAG(q,o.a)
return r},
-N4:function(){var s,r=this,q=r.y
-r.d.adN(r.f,q)
+N3:function(){var s,r=this,q=r.y
+r.d.adR(r.f,q)
r.x=r.x+q
s=r.y-q
r.y=s
if(s===0)r.x=0},
-asS:function(a){switch(a){case 0:return new T.q4(0,0,0,0,0)
-case 1:return new T.q4(4,4,8,4,1)
-case 2:return new T.q4(4,5,16,8,1)
-case 3:return new T.q4(4,6,32,32,1)
-case 4:return new T.q4(4,4,16,16,2)
-case 5:return new T.q4(8,16,32,32,2)
-case 6:return new T.q4(8,16,128,128,2)
-case 7:return new T.q4(8,32,128,256,2)
-case 8:return new T.q4(32,128,258,1024,2)
-case 9:return new T.q4(32,258,258,4096,2)}return null}}
-T.q4.prototype={}
+asV:function(a){switch(a){case 0:return new T.q2(0,0,0,0,0)
+case 1:return new T.q2(4,4,8,4,1)
+case 2:return new T.q2(4,5,16,8,1)
+case 3:return new T.q2(4,6,32,32,1)
+case 4:return new T.q2(4,4,16,16,2)
+case 5:return new T.q2(8,16,32,32,2)
+case 6:return new T.q2(8,16,128,128,2)
+case 7:return new T.q2(8,32,128,256,2)
+case 8:return new T.q2(32,128,258,1024,2)
+case 9:return new T.q2(32,258,258,4096,2)}return null}}
+T.q2.prototype={}
T.Eu.prototype={
-asK:function(a0){var s,r,q,p,o,n,m,l,k,j,i,h,g=this,f=g.a,e=g.c,d=e.a,c=e.b,b=e.c,a=e.e
-for(e=a0.aV,s=0;s<=15;++s)e[s]=0
-r=a0.aZ
-q=a0.aT
+asN:function(a0){var s,r,q,p,o,n,m,l,k,j,i,h,g=this,f=g.a,e=g.c,d=e.a,c=e.b,b=e.c,a=e.e
+for(e=a0.aU,s=0;s<=15;++s)e[s]=0
+r=a0.aO
+q=a0.aW
f[r[q]*2+1]=0
for(p=q+1,q=d!=null,o=null,n=null,m=0;p<573;++p){l=r[p]
k=l*2
@@ -67596,7 +67514,7 @@ if(l>g.b)continue
e[s]=e[s]+1
o=l>=b?c[l-b]:0
n=f[k]
-a0.b4=a0.b4+n*(s+o)
+a0.b5=a0.b5+n*(s+o)
if(q)a0.a2=a0.a2+n*(d[j]+o)}if(m===0)return
s=a-1
do{for(i=s;q=e[i],q===0;)--i
@@ -67612,37 +67530,37 @@ if(h>g.b)continue
q=h*2
k=q+1
j=f[k]
-if(j!==s){a0.b4=a0.b4+(s-j)*f[q]
+if(j!==s){a0.b5=a0.b5+(s-j)*f[q]
f[k]=s}--l}}},
Mq:function(a){var s,r,q,p,o,n,m,l,k,j,i=this,h=i.a,g=i.c,f=g.a,e=g.d
-a.aN=0
-a.aT=573
-for(g=a.aZ,s=a.bF,r=0,q=-1;r=1;--r)a.OX(h,r)
+for(r=C.e.dn(o,2);r>=1;--r)a.OW(h,r)
n=e
do{r=g[1]
-p=a.aN
-a.aN=p-1
+p=a.aV
+a.aV=p-1
g[1]=g[p]
-a.OX(h,1)
+a.OW(h,1)
m=g[1]
-p=a.aT=a.aT-1
+p=a.aW=a.aW-1
g[p]=r;--p
-a.aT=p
+a.aW=p
g[p]=m
p=r*2
o=m*2
@@ -67654,17 +67572,17 @@ h[o+1]=n
h[p+1]=n
j=n+1
g[1]=n
-a.OX(h,1)
-if(a.aN>=2){n=j
+a.OW(h,1)
+if(a.aV>=2){n=j
continue}else break}while(!0)
-s=a.aT-1
-a.aT=s
+s=a.aW-1
+a.aW=s
g[s]=g[1]
-i.asK(a)
-T.diC(h,q,a.aV)}}
-T.c2k.prototype={}
-Y.Jm.prototype={
-A9:function(a){var s,r,q,p,o,n,m,l,k,j,i,h,g=this,f=a.length
+i.asN(a)
+T.di_(h,q,a.aU)}}
+T.c22.prototype={}
+Y.Jn.prototype={
+A7:function(a){var s,r,q,p,o,n,m,l,k,j,i,h,g=this,f=a.length
for(s=0;sg.b)g.b=r
if(r>>1}for(h=(l|s)>>>0,i=j;i>>0
m=m<<1>>>0}}}
-S.b6k.prototype={
-axC:function(){var s,r,q=this
+S.b6a.prototype={
+axG:function(){var s,r,q=this
q.d=q.c=0
-for(s=q.a,r=s.c;s.b>>1
switch(r){case 0:o.d=o.c=0
q=o.nb(16)
p=o.nb(16)
-if(q!==0&&q!==(p^65535)>>>0)H.b(R.ts("Invalid uncompressed block header"))
-if(q>n.gH(n))H.b(R.ts("Input buffer is broken"))
-o.b.aRI(n.V5(q))
+if(q!==0&&q!==(p^65535)>>>0)H.b(R.tr("Invalid uncompressed block header"))
+if(q>n.gH(n))H.b(R.tr("Input buffer is broken"))
+o.b.aRO(n.V4(q))
break
-case 1:o.a_p(o.f,o.r)
+case 1:o.a_o(o.f,o.r)
break
-case 2:o.aAh()
+case 2:o.aAn()
break
-default:throw H.d(R.ts("unknown BTYPE: "+r))}return(s&1)===0},
+default:throw H.d(R.tr("unknown BTYPE: "+r))}return(s&1)===0},
nb:function(a){var s,r,q,p,o,n,m,l=this
if(a===0)return 0
for(s=l.a,r=s.a,q=J.am(r),p=s.c;o=l.d,o=p+s.e)throw H.d(R.ts("input buffer is broken"))
+if(o>=p+s.e)throw H.d(R.tr("input buffer is broken"))
s.b=o+1
o=q.i(r,o)
n=l.c
@@ -67705,10 +67623,10 @@ m=l.d
l.c=(n|C.e.hz(o,m))>>>0
l.d=m+8}s=l.c
r=C.e.t5(1,a)
-l.c=C.e.xy(s,a)
+l.c=C.e.xx(s,a)
l.d=o-a
return(s&r-1)>>>0},
-P5:function(a){var s,r,q,p,o,n,m,l,k,j=this,i=a.a,h=a.b
+P4:function(a){var s,r,q,p,o,n,m,l,k,j=this,i=a.a,h=a.b
for(s=j.a,r=s.a,q=J.am(r),p=s.c;o=j.d,o=p+s.e)break
s.b=n+1
@@ -67719,37 +67637,37 @@ j.c=(n|C.e.hz(o,m))>>>0
j.d=m+8}s=j.c
l=i[(s&C.e.t5(1,h)-1)>>>0]
k=l>>>16
-j.c=C.e.xy(s,k)
+j.c=C.e.xx(s,k)
j.d=o-k
return l&65535},
-aAh:function(){var s,r,q,p,o,n,m,l,k=this,j=k.nb(5)+257,i=k.nb(5)+1,h=k.nb(4)+4,g=new Uint8Array(19)
+aAn:function(){var s,r,q,p,o,n,m,l,k=this,j=k.nb(5)+257,i=k.nb(5)+1,h=k.nb(4)+4,g=new Uint8Array(19)
for(s=0;s285)throw H.d(R.ts("Invalid Huffman Code "+r))
+o=k.a_n(j,r,q)
+n=k.a_n(i,r,p)
+m=new Y.Jn()
+m.A7(o)
+l=new Y.Jn()
+l.A7(n)
+k.a_o(m,l)},
+a_o:function(a,b){var s,r,q,p,o,n,m,l=this
+for(s=l.b;!0;){r=l.P4(a)
+if(r>285)throw H.d(R.tr("Invalid Huffman Code "+r))
if(r===256)break
if(r<256){s.oZ(r&255)
continue}q=r-257
-p=C.ag_[q]+l.nb(C.adb[q])
-o=l.P5(b)
-if(o<=29){n=C.aea[o]+l.nb(C.rL[o])
-for(m=-n;p>n;){s.W6(s.XF(m))
-p-=n}if(p===n)s.W6(s.XF(m))
-else s.W6(s.XG(m,p-n))}else throw H.d(R.ts("Illegal unused distance symbol"))}for(s=l.a;m=l.d,m>=8;){l.d=m-8
+p=C.ag_[q]+l.nb(C.adc[q])
+o=l.P4(b)
+if(o<=29){n=C.aeb[o]+l.nb(C.rK[o])
+for(m=-n;p>n;){s.W5(s.XE(m))
+p-=n}if(p===n)s.W5(s.XE(m))
+else s.W5(s.XF(m,p-n))}else throw H.d(R.tr("Illegal unused distance symbol"))}for(s=l.a;m=l.d,m>=8;){l.d=m-8
if(--s.b<0)s.b=0}},
-a_o:function(a,b,c){var s,r,q,p,o,n,m=this
-for(s=0,r=0;r0;p=o,r=n){n=r+1
c[r]=s}break
@@ -67761,61 +67679,61 @@ case 18:p=11+m.nb(7)
for(;o=p-1,p>0;p=o,r=n){n=r+1
c[r]=0}s=0
break
-default:if(q>15)throw H.d(R.ts("Invalid Huffman Code: "+q))
+default:if(q>15)throw H.d(R.tr("Invalid Huffman Code: "+q))
n=r+1
c[r]=q
r=n
s=q
break}}return c}}
-Q.bv.prototype={
-gH:function(a){return J.bX(this.c)},
+Q.bu.prototype={
+gH:function(a){return J.bY(this.c)},
i:function(a,b){return J.e(this.c,b)},
-a8:function(a,b){return J.bb(this.c,b)},
-iw:function(a,b){return J.d8N(this.c,b)},
-QG:function(a){return J.cRT(this.c)},
-v9:function(a,b){return new Q.bv(!0,J.vw(this.c,b.h("0*")),b.h("bv<0*>"))},
+a7:function(a,b){return J.bb(this.c,b)},
+iv:function(a,b){return J.d89(this.c,b)},
+QF:function(a){return J.cRi(this.c)},
+v9:function(a,b){return new Q.bu(!0,J.vx(this.c,b.h("0*")),b.h("bu<0*>"))},
I:function(a,b){return J.js(this.c,b)},
-dr:function(a,b){return J.vx(this.c,b)},
-ga5:function(a){return J.nm(this.c)},
-hq:function(a,b,c){return J.d96(this.c,b,c)},
-L:function(a,b){return J.cc(this.c,b)},
-io:function(a,b,c){return J.d9I(this.c,b,c)},
-fh:function(a,b){return this.io(a,b,0)},
-gag:function(a){return J.eU(this.c)},
-gca:function(a){return J.kl(this.c)},
-gaH:function(a){return J.a3(this.c)},
-dl:function(a,b){return J.aKW(this.c,b)},
-gaS:function(a){return J.ER(this.c)},
-ep:function(a,b,c){return J.fj(this.c,b,c.h("0*"))},
-cQ:function(a,b){return this.ep(a,b,t.z)},
-gK0:function(a){return J.cM4(this.c)},
-jP:function(a,b){return J.aeB(this.c,b)},
-f4:function(a,b,c){return J.cSg(this.c,b,c)},
-kv:function(a,b){return this.f4(a,b,null)},
-l2:function(a,b){return J.cSh(this.c,b)},
-fX:function(a,b){return J.da9(this.c,!0)},
-eN:function(a){return this.fX(a,!0)},
-jJ:function(a){return J.cSi(this.c)},
-iM:function(a,b){return J.iA(this.c,b)},
+dr:function(a,b){return J.vy(this.c,b)},
+ga4:function(a){return J.nl(this.c)},
+hq:function(a,b,c){return J.d8t(this.c,b,c)},
+L:function(a,b){return J.ci(this.c,b)},
+il:function(a,b,c){return J.d94(this.c,b,c)},
+fh:function(a,b){return this.il(a,b,0)},
+gag:function(a){return J.eV(this.c)},
+gca:function(a){return J.kQ(this.c)},
+gaJ:function(a){return J.a2(this.c)},
+dl:function(a,b){return J.aKZ(this.c,b)},
+gaS:function(a){return J.ES(this.c)},
+eq:function(a,b,c){return J.fd(this.c,b,c.h("0*"))},
+cQ:function(a,b){return this.eq(a,b,t.z)},
+gK0:function(a){return J.cLs(this.c)},
+jN:function(a,b){return J.aeE(this.c,b)},
+f5:function(a,b,c){return J.cRG(this.c,b,c)},
+kv:function(a,b){return this.f5(a,b,null)},
+l1:function(a,b){return J.cRH(this.c,b)},
+fX:function(a,b){return J.d9w(this.c,!0)},
+eL:function(a){return this.fX(a,!0)},
+jH:function(a){return J.cRI(this.c)},
+ip:function(a,b){return J.iB(this.c,b)},
E:function(a,b,c){this.kD()
J.c0(this.c,b,c)},
F:function(a,b){this.kD()
J.fI(this.c,b)},
bY:function(a,b){this.kD()
-J.nn(this.c,b)},
-lF:function(a){return this.bY(a,null)},
+J.nm(this.c,b)},
+lE:function(a){return this.bY(a,null)},
hg:function(a,b,c){this.kD()
-J.cM8(this.c,b,c)},
-P:function(a,b){this.kD()
-return J.km(this.c,b)},
-f1:function(a,b){this.kD()
-return J.cS9(this.c,b)},
+J.cLw(this.c,b,c)},
+O:function(a,b){this.kD()
+return J.kn(this.c,b)},
+f2:function(a,b){this.kD()
+return J.cRz(this.c,b)},
kq:function(a){this.kD()
-return J.cSb(this.c)},
-l_:function(a,b){this.kD()
-J.cSc(this.c,b)},
+return J.cRB(this.c)},
+kZ:function(a,b){this.kD()
+J.cRC(this.c,b)},
pX:function(a,b){this.kD()
-J.cSe(this.c,b)},
+J.cRE(this.c,b)},
j:function(a){return J.aD(this.c)},
kD:function(){var s=this
if(!s.a)return
@@ -67824,46 +67742,46 @@ s.c=P.v(s.c,!0,s.$ti.h("1*"))},
$ibf:1,
$iP:1,
$iD:1}
-A.Qk.prototype={
+A.Qo.prototype={
gH:function(a){var s=this.c
return s.gH(s)},
-Cp:function(a,b){return this.c.Cp(0,b)},
-Rj:function(a){return this.c.Rj(a)},
+Co:function(a,b){return this.c.Co(0,b)},
+Ri:function(a){return this.c.Ri(a)},
I:function(a,b){return this.c.I(0,b)},
dr:function(a,b){return this.c.dr(0,b)},
-ga5:function(a){var s=this.c
-return s.ga5(s)},
+ga4:function(a){var s=this.c
+return s.ga4(s)},
L:function(a,b){return this.c.L(0,b)},
gag:function(a){var s=this.c
return s.gag(s)},
gca:function(a){var s=this.c
return s.gca(s)},
-gaH:function(a){var s=this.c
-return s.gaH(s)},
+gaJ:function(a){var s=this.c
+return s.gaJ(s)},
dl:function(a,b){return this.c.dl(0,b)},
gaS:function(a){var s=this.c
return s.gaS(s)},
-ep:function(a,b,c){return this.c.ep(0,b,c.h("0*"))},
-cQ:function(a,b){return this.ep(a,b,t.z)},
-jP:function(a,b){return this.c.jP(0,b)},
-l2:function(a,b){return this.c.l2(0,b)},
+eq:function(a,b,c){return this.c.eq(0,b,c.h("0*"))},
+cQ:function(a,b){return this.eq(a,b,t.z)},
+jN:function(a,b){return this.c.jN(0,b)},
+l1:function(a,b){return this.c.l1(0,b)},
fX:function(a,b){return this.c.fX(0,!0)},
-eN:function(a){return this.fX(a,!0)},
-jJ:function(a){return this.c.jJ(0)},
-iM:function(a,b){return this.c.iM(0,b)},
+eL:function(a){return this.fX(a,!0)},
+jH:function(a){return this.c.jH(0)},
+ip:function(a,b){return this.c.ip(0,b)},
F:function(a,b){this.EK()
return this.c.F(0,b)},
V:function(a,b){this.EK()
this.c.V(0,b)},
-P:function(a,b){this.EK()
-return this.c.P(0,b)},
-l_:function(a,b){this.EK()
-this.c.l_(0,b)},
+O:function(a,b){this.EK()
+return this.c.O(0,b)},
+kZ:function(a,b){this.EK()
+this.c.kZ(0,b)},
j:function(a){return J.aD(this.c)},
EK:function(){var s,r=this
if(!r.b)return
r.b=!1
-s=P.hu(r.c,r.$ti.h("1*"))
+s=P.ht(r.c,r.$ti.h("1*"))
r.c=s},
$ibf:1,
$iP:1,
@@ -67873,7 +67791,7 @@ q:function(a){var s=S.S(this,this.$ti.h("C.E*"))
a.$1(s)
return s.p(0)},
gG:function(a){var s=this.b
-return s==null?this.b=X.Yk(this.a):s},
+return s==null?this.b=X.Ym(this.a):s},
B:function(a,b){var s,r,q,p=this
if(b==null)return!1
if(b===p)return!0
@@ -67886,55 +67804,55 @@ for(q=0;q!==r.length;++q)if(!J.j(s[q],r[q]))return!1
return!0},
j:function(a){return J.aD(this.a)},
i:function(a,b){return this.a[b]},
-a8:function(a,b){var s,r=this.a
-r=(r&&C.b).a8(r,b.a)
+a7:function(a,b){var s,r=this.a
+r=(r&&C.b).a7(r,b.a)
s=this.$ti
-if(H.Z(s.h("C.E*"))===C.j)H.b(P.z(u.p))
+if(H.Y(s.h("C.E*"))===C.j)H.b(P.z(u.p))
return new S.bo(r,s.h("bo"))},
gH:function(a){return this.a.length},
-gaH:function(a){var s=this.a
+gaJ:function(a){var s=this.a
return new J.c8(s,s.length,H.c2(s).h("c8<1>"))},
-ep:function(a,b,c){var s=this.a
+eq:function(a,b,c){var s=this.a
s.toString
-return new H.A(s,b,H.a0(s).h("@<1>").a7(c.h("0*")).h("A<1,2>"))},
-cQ:function(a,b){return this.ep(a,b,t.z)},
-iM:function(a,b){var s=this.a
+return new H.B(s,b,H.a0(s).h("@<1>").a6(c.h("0*")).h("B<1,2>"))},
+cQ:function(a,b){return this.eq(a,b,t.z)},
+ip:function(a,b){var s=this.a
s.toString
-return new H.ay(s,b,H.a0(s).h("ay<1>"))},
+return new H.az(s,b,H.a0(s).h("az<1>"))},
I:function(a,b){var s=this.a
return(s&&C.b).I(s,b)},
L:function(a,b){var s=this.a
return(s&&C.b).L(s,b)},
dl:function(a,b){var s=this.a
return(s&&C.b).dl(s,b)},
-fX:function(a,b){return new Q.bv(!0,this.a,this.$ti.h("bv"))},
-eN:function(a){return this.fX(a,!0)},
-jJ:function(a){var s=this.a
+fX:function(a,b){return new Q.bu(!0,this.a,this.$ti.h("bu
';
- }
-
- return sprintf($div, $this->getSection('footer'), $signature, $logo);
- }
-
- public function getBody()
- {
- return $this->getSection('body');
- }
-
- public function getHtml():string
- {
- return $this->html;
- }
-
- public function setHtml()
- {
- $this->html = '';
-
- return $this;
- }
-
- private function setDesign($section)
- {
- $this->html .= $section;
-
- return $this;
- }
-
- /**
- * Returns the template section on with the
- * stacked variables replaced with single variables.
- *
- * @param string $section the method name to be executed ie header/body/table/footer
- * @return string The HTML of the template section
- */
- public function getSection($section):string
- {
- return strtr($this->design->{$section}, $this->exported_variables);
- // return str_replace(array_keys($this->exported_variables), array_values($this->exported_variables), $this->design->{$section});
- }
-
- private function exportVariables()
- {
- //$s = microtime(true);
- $company = $this->entity->company;
-
- $this->exported_variables['$custom_css'] = $this->entity->generateCustomCSS();
- $this->exported_variables['$app_url'] = $this->entity->generateAppUrl();
- $this->exported_variables['$client_details'] = $this->processVariables($this->input_variables['client_details'], $this->clientDetails($company));
- $this->exported_variables['$company_details'] = $this->processVariables($this->input_variables['company_details'], $this->companyDetails($company));
- $this->exported_variables['$company_address'] = $this->processVariables($this->input_variables['company_address'], $this->companyAddress($company));
-
- if ($this->entity_string == 'invoice') {
- //$this->exported_variables['$entity_labels'] = $this->processLabels($this->input_variables['invoice_details'], $this->invoiceDetails($company));
- $this->exported_variables['$entity_details'] = $this->processVariables($this->input_variables['invoice_details'], $this->invoiceDetails($company));
- } elseif ($this->entity_string == 'credit') {
- //$this->exported_variables['$entity_labels'] = $this->processLabels($this->input_variables['credit_details'], $this->creditDetails($company));
- $this->exported_variables['$entity_details'] = $this->processVariables($this->input_variables['credit_details'], $this->creditDetails($company));
- } elseif ($this->entity_string == 'quote') {
- //$this->exported_variables['$entity_labels'] = $this->processLabels($this->input_variables['quote_details'], $this->quoteDetails($company));
- $this->exported_variables['$entity_details'] = $this->processVariables($this->input_variables['quote_details'], $this->quoteDetails($company));
- } else {
- $this->exported_variables['$entity_details'] = $this->processVariables($this->input_variables['invoice_details'], $this->quoteDetails($company));
- }
-
- $this->exported_variables['$product_table_header'] = $this->entity->buildTableHeader($this->input_variables['product_columns']);
- $this->exported_variables['$product_table_body'] = $this->entity->buildTableBody($this->input_variables['product_columns'], $this->design->product, '$product');
- $this->exported_variables['$task_table_header'] = $this->entity->buildTableHeader($this->input_variables['task_columns']);
- $this->exported_variables['$task_table_body'] = $this->entity->buildTableBody($this->input_variables['task_columns'], $this->design->task, '$task');
-
- if (strlen($this->exported_variables['$task_table_body']) == 0) {
- $this->exported_variables['$task_table_header'] = '';
- }
-
- if (strlen($this->exported_variables['$product_table_body']) == 0) {
- $this->exported_variables['$product_table_header'] = '';
- }
-
- return $this;
- }
-
- private function processVariables($input_variables, $variables):string
- {
- $output = '';
-
- foreach (array_values($input_variables) as $value) {
- if (array_key_exists($value, $variables)) {
- $output .= $variables[$value];
- }
- }
-
- return $output;
- }
-
- private function processLabels($input_variables, $variables):string
- {
- $output = '';
-
- foreach (array_keys($input_variables) as $value) {
- if (array_key_exists($value, $variables)) {
- //$tmp = str_replace("", "_label", $variables[$value]);
- $tmp = strtr($variables[$value], '', '_label');
- $output .= $tmp;
- }
- }
-
- return $output;
- }
-
- private function clientDetails(Company $company)
- {
- $data = [
- '$client.name' => '