diff --git a/VERSION.txt b/VERSION.txt
index 2eb4062f4529..6d00630e87c6 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.3.68
\ No newline at end of file
+5.3.69
\ No newline at end of file
diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index 138486fdaea8..684629c268d7 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -482,7 +482,7 @@ class CheckData extends Command
payments.id = paymentables.payment_id
WHERE paymentable_type = ?
AND paymentables.deleted_at is NULL
- AND payments.amount > 0
+ AND paymentables.amount > 0
AND payments.is_deleted = 0
AND payments.client_id = ?;
"), [App\Models\Credit::class, $client->id] );
diff --git a/app/DataMapper/EmailTemplateDefaults.php b/app/DataMapper/EmailTemplateDefaults.php
index ef42c513e612..8b9a9f7660c5 100644
--- a/app/DataMapper/EmailTemplateDefaults.php
+++ b/app/DataMapper/EmailTemplateDefaults.php
@@ -128,6 +128,13 @@ class EmailTemplateDefaults
return $invoice_message;
}
+ public static function emailInvoiceReminderTemplate()
+ {
+ $invoice_message = '$client
'.self::transformText('reminder_message').'
$view_button
';
+
+ return $invoice_message;
+ }
+
public static function emailQuoteSubject()
{
return ctrans('texts.quote_subject', ['number'=>'$number', 'account'=>'$company.name']);
diff --git a/app/DataMapper/Transactions/BaseTransaction.php b/app/DataMapper/Transactions/BaseTransaction.php
index 80d211d90733..da7b750c1c9d 100644
--- a/app/DataMapper/Transactions/BaseTransaction.php
+++ b/app/DataMapper/Transactions/BaseTransaction.php
@@ -66,7 +66,7 @@ class BaseTransaction implements TransactionInterface
$data['payment'],
$data['client'],
$data['credit'],
- $data['metadata'],
+ ['metadata' => $data['metadata']],
['event_id' => $this->event_id, 'timestamp' =>time()],
);
// return [
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 7e0993d30d70..1cd89bf2643c 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -217,6 +217,12 @@ class LoginController extends BaseController
$cu = CompanyUser::query()
->where('user_id', auth()->user()->id);
+ $truth = app()->make(TruthSource::class);
+
+ $truth->setCompanyUser($cu->first());
+ $truth->setUser(auth()->user());
+ $truth->setCompany($user->account->default_company);
+
if(!$cu->exists())
return response()->json(['message' => 'User not linked to any companies'], 403);
diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php
index 6dad4a19ab79..42cd3598d1b4 100644
--- a/app/Http/Controllers/ClientPortal/InvoiceController.php
+++ b/app/Http/Controllers/ClientPortal/InvoiceController.php
@@ -101,7 +101,6 @@ class InvoiceController extends Controller
return $this->makePayment((array) $transformed_ids);
} elseif ($request->input('action') == 'download') {
return $this->downloadInvoices((array) $transformed_ids);
- // return $this->downloadInvoicePDF((array) $transformed_ids);
}
return redirect()
@@ -113,7 +112,7 @@ class InvoiceController extends Controller
{
$data['invoices'] = Invoice::whereIn('id', $ids)
- ->whereClientId(auth()->user()->client->id)
+ ->whereClientId(auth()->guard('contact')->user()->client->id)
->withTrashed()
->get();
@@ -135,7 +134,7 @@ class InvoiceController extends Controller
private function makePayment(array $ids)
{
$invoices = Invoice::whereIn('id', $ids)
- ->whereClientId(auth()->user()->client->id)
+ ->whereClientId(auth()->guard('contact')->user()->client->id)
->withTrashed()
->get();
@@ -172,14 +171,14 @@ class InvoiceController extends Controller
});
//format totals
- $formatted_total = Number::formatMoney($total, auth()->user()->client);
+ $formatted_total = Number::formatMoney($total, auth()->guard('contact')->user()->client);
- $payment_methods = auth()->user()->client->service()->getPaymentMethods($total);
+ $payment_methods = auth()->guard('contact')->user()->client->service()->getPaymentMethods($total);
//if there is only one payment method -> lets return straight to the payment page
$data = [
- 'settings' => auth()->user()->client->getMergedSettings(),
+ 'settings' => auth()->guard('contact')->user()->client->getMergedSettings(),
'invoices' => $invoices,
'formatted_total' => $formatted_total,
'payment_methods' => $payment_methods,
@@ -201,7 +200,7 @@ class InvoiceController extends Controller
{
$invoices = Invoice::whereIn('id', $ids)
->withTrashed()
- ->whereClientId(auth()->user()->client->id)
+ ->whereClientId(auth()->guard('contact')->user()->client->id)
->get();
//generate pdf's of invoices locally
@@ -212,9 +211,8 @@ class InvoiceController extends Controller
//if only 1 pdf, output to buffer for download
if ($invoices->count() == 1) {
$invoice = $invoices->first();
- $invitation = $invoice->invitations->first();
- $file = $invoice->service()->getInvoicePdf(auth()->user());
+ $file = $invoice->service()->getInvoicePdf(auth()->guard('contact')->user());
// return response()->download(file_get_contents(public_path($file)));
diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php
index 7d6e0814df3c..16ea05ceb235 100644
--- a/app/Http/Controllers/CompanyController.php
+++ b/app/Http/Controllers/CompanyController.php
@@ -14,6 +14,7 @@ namespace App\Http\Controllers;
use App\DataMapper\Analytics\AccountDeleted;
use App\DataMapper\CompanySettings;
use App\DataMapper\DefaultSettings;
+use App\Factory\CompanyFactory;
use App\Http\Requests\Company\CreateCompanyRequest;
use App\Http\Requests\Company\DefaultCompanyRequest;
use App\Http\Requests\Company\DestroyCompanyRequest;
@@ -229,9 +230,13 @@ class CompanyController extends BaseController
'permissions' => '',
'settings' => null,
'notifications' => CompanySettings::notificationDefaults(),
- //'settings' => DefaultSettings::userSettings(),
]);
+ if(auth()->user()->company()->account->companies()->where('is_large', 1)->exists())
+ {
+ $company->account->companies()->update(['is_large' => true]);
+ }
+
/*
* Required dependencies
*/
@@ -417,7 +422,6 @@ class CompanyController extends BaseController
if ($request->hasFile('company_logo') || (is_array($request->input('settings')) && !array_key_exists('company_logo', $request->input('settings'))))
$this->removeLogo($company);
-
$company = $this->company_repo->save($request->all(), $company);
$company->saveSettings($request->input('settings'), $company);
diff --git a/app/Http/Controllers/DocumentController.php b/app/Http/Controllers/DocumentController.php
index 4d0e81101eb1..cf673fcbe7d5 100644
--- a/app/Http/Controllers/DocumentController.php
+++ b/app/Http/Controllers/DocumentController.php
@@ -8,6 +8,7 @@ use App\Http\Requests\Document\EditDocumentRequest;
use App\Http\Requests\Document\ShowDocumentRequest;
use App\Http\Requests\Document\StoreDocumentRequest;
use App\Http\Requests\Document\UpdateDocumentRequest;
+use App\Jobs\Document\ZipDocuments;
use App\Models\Document;
use App\Repositories\DocumentRepository;
use App\Transformers\DocumentTransformer;
@@ -173,10 +174,16 @@ class DocumentController extends BaseController
$documents = Document::withTrashed()->whereIn('id', $this->transformKeys($ids))->company()->get();
- if (! $invoices) {
+ if (! $documents) {
return response()->json(['message' => ctrans('texts.no_documents_found')]);
}
+ if($action == 'download'){
+
+ ZipDocuments::dispatch($documents->pluck('id'), auth()->user()->company(), auth()->user());
+
+ return response()->json(['message' => ctrans('texts.sent_message')], 200);
+ }
/*
* Send the other actions to the switch
*/
diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php
index 3581cba35c22..994fa5019b84 100644
--- a/app/Http/Controllers/PreviewController.php
+++ b/app/Http/Controllers/PreviewController.php
@@ -147,7 +147,7 @@ class PreviewController extends BaseController
->build();
if (request()->query('html') == 'true') {
- return $maker->getCompiledHTML;
+ return $maker->getCompiledHTML();
}
//if phantom js...... inject here..
@@ -266,7 +266,7 @@ class PreviewController extends BaseController
DB::connection(config('database.default'))->rollBack();
if (request()->query('html') == 'true') {
- return $maker->getCompiledHTML;
+ return $maker->getCompiledHTML();
}
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 8864eb6fc9d0..0b0db9f7859a 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -380,7 +380,7 @@ class UserController extends BaseController
*/
public function update(UpdateUserRequest $request, User $user)
{
- $old_company_user = $user->company_user();
+ $old_company_user = $user->company_users()->where('company_id', auth()->user()->company()->id)->first();
$old_user = json_encode($user);
$old_user_email = $user->getOriginal('email');
@@ -395,14 +395,8 @@ class UserController extends BaseController
$user->save();
UserEmailChanged::dispatch($new_user, json_decode($old_user), auth()->user()->company());
}
-
-
- if(
- strcasecmp($old_company_user->permissions, $user->company_user()->permissions) != 0 ||
- $old_company_user->is_admin != $user->company_user()->is_admin
- ){
- $user->company_user()->update(["permissions_updated_at" => now()]);
- }
+
+ $user->company_users()->update(["permissions_updated_at" => now()]);
event(new UserWasUpdated($user, auth()->user(), auth()->user()->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php
index 0e398c40ba80..105df50ec9ba 100644
--- a/app/Http/Middleware/QueryLogging.php
+++ b/app/Http/Middleware/QueryLogging.php
@@ -41,7 +41,6 @@ class QueryLogging
$timeStart = microtime(true);
DB::enableQueryLog();
- $response = $next($request);
// hide requests made by debugbar
if (strstr($request->url(), '_debugbar') === false) {
@@ -73,6 +72,6 @@ class QueryLogging
}
- return $response;
+ return $next($request);
}
}
diff --git a/app/Http/Middleware/StartupCheck.php b/app/Http/Middleware/StartupCheck.php
index dc6158ac6ff6..fe22bdb63591 100644
--- a/app/Http/Middleware/StartupCheck.php
+++ b/app/Http/Middleware/StartupCheck.php
@@ -66,9 +66,8 @@ class StartupCheck
$this->buildTemplates();
}
- $response = $next($request);
+ return $next($request);
- return $response;
}
diff --git a/app/Http/Middleware/TokenAuth.php b/app/Http/Middleware/TokenAuth.php
index 53924c89cc17..4778719a04f2 100644
--- a/app/Http/Middleware/TokenAuth.php
+++ b/app/Http/Middleware/TokenAuth.php
@@ -32,6 +32,7 @@ class TokenAuth
public function handle($request, Closure $next)
{
if ($request->header('X-API-TOKEN') && ($company_token = CompanyToken::with(['user', 'company', 'cu'])->where('token', $request->header('X-API-TOKEN'))->first())) {
+
$user = $company_token->user;
$error = [
diff --git a/app/Jobs/Document/ZipDocuments.php b/app/Jobs/Document/ZipDocuments.php
new file mode 100644
index 000000000000..12312acb207e
--- /dev/null
+++ b/app/Jobs/Document/ZipDocuments.php
@@ -0,0 +1,118 @@
+document_ids = $document_ids;
+
+ $this->company = $company;
+
+ $this->user = $user;
+
+ $this->settings = $company->settings;
+ }
+
+ /**
+ * Execute the job.
+ *
+ * @return void
+ * @throws \ZipStream\Exception\FileNotFoundException
+ * @throws \ZipStream\Exception\FileNotReadableException
+ * @throws \ZipStream\Exception\OverflowException
+ */
+
+ public function handle()
+ {
+ MultiDB::setDb($this->company->db);
+
+ # create new zip object
+ $zipFile = new \PhpZip\ZipFile();
+ $file_name = date('Y-m-d').'_'.str_replace(' ', '_', trans('texts.documents')).'.zip';
+ $path = $this->company->file_path();
+
+ try{
+
+ $documents = Document::whereIn('id', $this->document_ids)->get();
+
+ foreach ($documents as $document) {
+
+ $zipFile->addFromString($document->name, $document->getFile());
+
+ }
+
+ Storage::put($path.$file_name, $zipFile->outputAsString());
+
+ $nmo = new NinjaMailerObject;
+ $nmo->mailable = new DownloadDocuments(Storage::url($path.$file_name), $this->company);
+ $nmo->to_user = $this->user;
+ $nmo->settings = $this->settings;
+ $nmo->company = $this->company;
+
+ NinjaMailerJob::dispatch($nmo);
+
+ UnlinkFile::dispatch(config('filesystems.default'), $path.$file_name)->delay(now()->addHours(1));
+
+ }
+ catch(\PhpZip\Exception\ZipException $e){
+ nlog("could not make zip => ". $e->getMessage());
+ }
+ finally{
+ $zipFile->close();
+ }
+
+
+ }
+
+}
diff --git a/app/Jobs/Ninja/CompanySizeCheck.php b/app/Jobs/Ninja/CompanySizeCheck.php
index 79a530d1eb01..def948a3b122 100644
--- a/app/Jobs/Ninja/CompanySizeCheck.php
+++ b/app/Jobs/Ninja/CompanySizeCheck.php
@@ -69,16 +69,5 @@ class CompanySizeCheck implements ShouldQueue
});
- // Company::where('is_large', false)->cursor()->each(function ($company) {
-
- // if ($company->invoices()->count() > 500 || $company->products()->count() > 500 || $company->clients()->count() > 500) {
-
- // nlog("Marking company {$company->id} as large");
-
- // $company->account->companies->update(['is_large' => true])
-
- // }
-
- // });
}
}
diff --git a/app/Jobs/Ninja/TransactionLog.php b/app/Jobs/Ninja/TransactionLog.php
index 06f9eef5a3ee..8694f65c1990 100644
--- a/app/Jobs/Ninja/TransactionLog.php
+++ b/app/Jobs/Ninja/TransactionLog.php
@@ -86,8 +86,8 @@ class TransactionLog implements ShouldQueue
*/
public function handle()
{
- if(!Ninja::isHosted())
- return;
+ // if(!Ninja::isHosted())
+ // return;
$this->setTransformer();
diff --git a/app/Jobs/Payment/EmailRefundPayment.php b/app/Jobs/Payment/EmailRefundPayment.php
new file mode 100644
index 000000000000..6059fecb293e
--- /dev/null
+++ b/app/Jobs/Payment/EmailRefundPayment.php
@@ -0,0 +1,108 @@
+payment = $payment;
+ $this->contact = $contact;
+ $this->company = $company;
+ $this->settings = $payment->client->getMergedSettings();
+ }
+
+ /**
+ * Execute the job.
+ *
+ *
+ * @return void
+ */
+ public function handle()
+ {
+ if ($this->company->is_disabled)
+ return true;
+
+ if ($this->contact->email) {
+
+ MultiDB::setDb($this->company->db);
+
+ $this->payment->load('invoices');
+ $this->contact->load('client');
+
+ App::forgetInstance('translator');
+ $t = app('translator');
+ App::setLocale($this->contact->preferredLocale());
+ $t->replace(Ninja::transformTranslations($this->settings));
+
+ $template_data['body'] = ctrans('texts.refunded_payment') . ' $payment.refunded
$invoices';
+ $template_data['subject'] = ctrans('texts.refunded_payment');
+
+ $email_builder = (new PaymentEmailEngine($this->payment, $this->contact, $template_data))->build();
+
+ $invitation = null;
+
+ if($this->payment->invoices && $this->payment->invoices->count() >=1)
+ $invitation = $this->payment->invoices->first()->invitations()->first();
+
+ $nmo = new NinjaMailerObject;
+ $nmo->mailable = new TemplateEmail($email_builder, $this->contact, $invitation);
+ $nmo->to_user = $this->contact;
+ $nmo->settings = $this->settings;
+ $nmo->company = $this->company;
+ $nmo->entity = $this->payment;
+
+ NinjaMailerJob::dispatch($nmo);
+
+ event(new PaymentWasEmailed($this->payment, $this->payment->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
+ }
+ }
+}
diff --git a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php
index 72a306b34483..481e65f5344d 100644
--- a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php
+++ b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php
@@ -41,8 +41,6 @@ class InvoiceEmailFailedActivity implements ShouldQueue
*/
public function handle($event)
{
- nlog("inside activity_repo");
-
MultiDB::setDb($event->company->db);
if(strpos($event->message, 'shared/public') !== false)
diff --git a/app/Listeners/Invoice/InvoiceFailedEmailNotification.php b/app/Listeners/Invoice/InvoiceFailedEmailNotification.php
index fbaba6e97be3..ce2405431318 100644
--- a/app/Listeners/Invoice/InvoiceFailedEmailNotification.php
+++ b/app/Listeners/Invoice/InvoiceFailedEmailNotification.php
@@ -38,8 +38,7 @@ class InvoiceFailedEmailNotification
*/
public function handle($event)
{
- nlog("inside a failed notification");
-
+
MultiDB::setDb($event->company->db);
$first_notification_sent = true;
diff --git a/app/Listeners/Invoice/InvoicePaidActivity.php b/app/Listeners/Invoice/InvoicePaidActivity.php
index 5bc5d42a6f62..3e21a3565091 100644
--- a/app/Listeners/Invoice/InvoicePaidActivity.php
+++ b/app/Listeners/Invoice/InvoicePaidActivity.php
@@ -58,7 +58,6 @@ class InvoicePaidActivity implements ShouldQueue
if($event->invoice->subscription()->exists())
{
- nlog("subscription exists");
$event->invoice->subscription->service()->planPaid($event->invoice);
}
diff --git a/app/Listeners/SendVerificationNotification.php b/app/Listeners/SendVerificationNotification.php
index 5f2d98b5a338..b7d819abed1e 100644
--- a/app/Listeners/SendVerificationNotification.php
+++ b/app/Listeners/SendVerificationNotification.php
@@ -48,8 +48,6 @@ class SendVerificationNotification implements ShouldQueue
*/
public function handle($event)
{
- nlog("In Send Verification Notification");
-
MultiDB::setDB($event->company->db);
$event->user->service()->invite($event->company);
diff --git a/app/Mail/Company/CompanyDeleted.php b/app/Mail/Company/CompanyDeleted.php
index 30af1c606a35..99e197d97b03 100644
--- a/app/Mail/Company/CompanyDeleted.php
+++ b/app/Mail/Company/CompanyDeleted.php
@@ -12,6 +12,7 @@
namespace App\Mail\Company;
+use App\Utils\Ninja;
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
@@ -48,6 +49,10 @@ class CompanyDeleted extends Mailable
*/
public function build()
{
+ App::forgetInstance('translator');
+ App::setLocale($this->account->default_company->getLocale());
+ $t = app('translator');
+ $t->replace(Ninja::transformTranslations($this->settings));
return $this->from(config('mail.from.address'), config('mail.from.name'))
->subject(ctrans('texts.company_deleted'))
diff --git a/app/Mail/DownloadDocuments.php b/app/Mail/DownloadDocuments.php
new file mode 100644
index 000000000000..bc40f45971cd
--- /dev/null
+++ b/app/Mail/DownloadDocuments.php
@@ -0,0 +1,56 @@
+file_path = $file_path;
+
+ $this->company = $company;
+ }
+
+ /**
+ * Build the message.
+ */
+ public function build()
+ {
+
+ App::setLocale($this->company->getLocale());
+
+ return $this->from(config('mail.from.address'), config('mail.from.name'))
+ ->subject(ctrans('texts.download_files'))
+ ->text('email.admin.download_documents_text', [
+ 'url' => $this->file_path,
+ ])
+ ->view('email.admin.download_documents', [
+ 'url' => $this->file_path,
+ 'logo' => $this->company->present()->logo,
+ 'whitelabel' => $this->company->account->isPaid() ? true : false,
+ 'settings' => $this->company->settings,
+ 'greeting' => $this->company->present()->name(),
+ ]);
+ }
+}
diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php
index 28f3220660c8..f349ed072908 100644
--- a/app/Mail/Engine/PaymentEmailEngine.php
+++ b/app/Mail/Engine/PaymentEmailEngine.php
@@ -143,6 +143,7 @@ class PaymentEmailEngine extends BaseEmailEngine
$data['$payment.number'] = &$data['$number'];
$data['$entity'] = ['value' => '', 'label' => ctrans('texts.payment')];
$data['$payment.amount'] = ['value' => Number::formatMoney($this->payment->amount, $this->client) ?: ' ', 'label' => ctrans('texts.amount')];
+ $data['$payment.refunded'] = ['value' => Number::formatMoney($this->payment->refunded, $this->client) ?: ' ', 'label' => ctrans('texts.refund')];
$data['$amount'] = &$data['$payment.amount'];
$data['$payment.date'] = ['value' => $this->translateDate($this->payment->date, $this->client->date_format(), $this->client->locale()), 'label' => ctrans('texts.payment_date')];
$data['$transaction_reference'] = ['value' => $this->payment->transaction_reference, 'label' => ctrans('texts.transaction_reference')];
@@ -230,12 +231,14 @@ class PaymentEmailEngine extends BaseEmailEngine
$data['$view_link'] = ['value' => ''.ctrans('texts.view_payment').'', 'label' => ctrans('texts.view_payment')];
$data['$view_button'] = &$data['$view_link'];
+ $data['$viewLink'] = &$data['$view_link'];
$data['$paymentLink'] = &$data['$view_link'];
$data['$portalButton'] = ['value' => "".ctrans('texts.login')."", 'label' =>''];
$data['$portal_url'] = &$data['$portalButton'];
$data['$view_url'] = ['value' => $this->payment->getLink(), 'label' => ctrans('texts.view_payment')];
$data['$signature'] = ['value' => $this->settings->email_signature ?: ' ', 'label' => ''];
+ $data['$emailSignature'] = &$data['$signature'];
$data['$invoices'] = ['value' => $this->formatInvoices(), 'label' => ctrans('texts.invoices')];
$data['$invoice_references'] = ['value' => $this->formatInvoiceReferences(), 'label' => ctrans('texts.invoices')];
diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php
index d1e8c8ce6023..a1563c89394a 100644
--- a/app/Models/BaseModel.php
+++ b/app/Models/BaseModel.php
@@ -21,6 +21,7 @@ use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\ModelNotFoundException as ModelNotFoundException;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
/**
@@ -189,7 +190,7 @@ class BaseModel extends Model
public function numberFormatter()
{
- $number = strlen($this->number) > 1 ? $this->number : class_basename($this);
+ $number = strlen($this->number) >= 1 ? $this->number : class_basename($this) . "_" . Str::random(5); ;
$formatted_number = mb_ereg_replace("([^\w\s\d\-_~,;\[\]\(\).])", '', $number);
// Remove any runs of periods (thanks falstro!)
diff --git a/app/Models/Client.php b/app/Models/Client.php
index 71317443deb3..0c7bbb3d84f9 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -153,7 +153,7 @@ class Client extends BaseModel implements HasLocalePreference
public function gateway_tokens()
{
- return $this->hasMany(ClientGatewayToken::class)->orderBy('is_default', 'ASC');
+ return $this->hasMany(ClientGatewayToken::class)->orderBy('is_default', 'DESC');
}
public function expenses()
@@ -582,149 +582,6 @@ class Client extends BaseModel implements HasLocalePreference
return 'USD';
}
- /**
- * Generates an array of payment urls per client
- * for a given amount.
- *
- * The route produced will provide the
- * company_gateway and payment_type ids
- *
- * The invoice/s will need to be injected
- * upstream of this method as they are not
- * included in this logic.
- *
- * @param float $amount The amount to be charged
- * @return array Array of payment labels and urls
- * @deprecated 5.0.38 - see service()->getPaymentMethods($amount);
- */
- // public function getPaymentMethods($amount) :array
- // {
- // //this method will get all the possible gateways a client can pay with
- // //but we also need to consider payment methods that are already stored
- // //so we MUST filter the company gateways and remove duplicates.
-
- // //Also need to harvest the list of client gateway tokens and present these
- // //for instant payment
-
- // $company_gateways = $this->getSetting('company_gateway_ids');
-
- // //we need to check for "0" here as we disable a payment gateway for a client with the number "0"
- // if ($company_gateways || $company_gateways == '0') {
- // $transformed_ids = $this->transformKeys(explode(',', $company_gateways));
- // $gateways = $this->company
- // ->company_gateways
- // ->whereIn('id', $transformed_ids)
- // ->where('gateway_key', '!=', '54faab2ab6e3223dbe848b1686490baa')
- // ->sortby(function ($model) use ($transformed_ids) { //company gateways are sorted in order of priority
- // return array_search($model->id, $transformed_ids);// this closure sorts for us
- // });
- // } else {
- // $gateways = $this->company
- // ->company_gateways
- // ->where('gateway_key', '!=', '54faab2ab6e3223dbe848b1686490baa')
- // ->where('is_deleted', false);
- // }
-
- // $payment_methods = [];
-
- // foreach ($gateways as $gateway) {
- // foreach ($gateway->driver($this)->gatewayTypes() as $type) {
- // if (isset($gateway->fees_and_limits) && property_exists($gateway->fees_and_limits, $type)) {
- // if ($this->validGatewayForAmount($gateway->fees_and_limits->{$type}, $amount)) {
- // $payment_methods[] = [$gateway->id => $type];
- // }
- // } else {
- // $payment_methods[] = [$gateway->id => $type];
- // }
- // }
- // }
-
- // $payment_methods_collections = collect($payment_methods);
-
- // //** Plucks the remaining keys into its own collection
- // $payment_methods_intersect = $payment_methods_collections->intersectByKeys($payment_methods_collections->flatten(1)->unique());
-
- // // handle custom gateways as they are not unique'd()---------------------------------------------------------
- // // we need to split the query here as we allow multiple custom gateways, so we must show all of them, they query logic
- // // above only pulls in unique gateway types.. ie.. we only allow 1 credit card gateway, but many custom gateways.
-
- // if ($company_gateways || $company_gateways == '0') {
- // $transformed_ids = $this->transformKeys(explode(',', $company_gateways));
- // $gateways = $this->company
- // ->company_gateways
- // ->whereIn('id', $transformed_ids)
- // ->where('gateway_key', '=', '54faab2ab6e3223dbe848b1686490baa')
- // ->sortby(function ($model) use ($transformed_ids) { //company gateways are sorted in order of priority
- // return array_search($model->id, $transformed_ids);// this closure sorts for us
- // });
- // } else {
- // $gateways = $this->company
- // ->company_gateways
- // ->where('gateway_key', '=', '54faab2ab6e3223dbe848b1686490baa')
- // ->where('is_deleted', false);
- // }
-
- // //note we have to use GatewayType::CREDIT_CARD as alias for CUSTOM
- // foreach ($gateways as $gateway) {
- // foreach ($gateway->driver($this)->gatewayTypes() as $type) {
- // if (isset($gateway->fees_and_limits) && property_exists($gateway->fees_and_limits, $type)) {
- // if ($this->validGatewayForAmount($gateway->fees_and_limits->{GatewayType::CREDIT_CARD}, $amount)) {
- // $payment_methods_intersect->push([$gateway->id => $type]);
- // }
- // } else {
- // $payment_methods_intersect->push([$gateway->id => NULL]);
- // }
- // }
- // }
-
- // //handle custom gateways as they are not unique'd()---------------------------------------------------------
-
- // $payment_urls = [];
-
- // foreach ($payment_methods_intersect as $key => $child_array) {
- // foreach ($child_array as $gateway_id => $gateway_type_id) {
- // $gateway = CompanyGateway::find($gateway_id);
-
- // $fee_label = $gateway->calcGatewayFeeLabel($amount, $this);
-
- // if(!$gateway_type_id){
-
- // $payment_urls[] = [
- // 'label' => $gateway->getConfigField('name') . $fee_label,
- // 'company_gateway_id' => $gateway_id,
- // 'gateway_type_id' => GatewayType::CREDIT_CARD,
- // ];
- // }
- // else
- // {
- // $payment_urls[] = [
- // 'label' => $gateway->getTypeAlias($gateway_type_id) . $fee_label,
- // 'company_gateway_id' => $gateway_id,
- // 'gateway_type_id' => $gateway_type_id,
- // ];
- // }
- // }
- // }
-
- // if (($this->getSetting('use_credits_payment') == 'option' || $this->getSetting('use_credits_payment') == 'always') && $this->service()->getCreditBalance() > 0) {
-
- // // Show credits as only payment option if both statements are true.
- // if (
- // $this->service()->getCreditBalance() > $amount
- // && $this->getSetting('use_credits_payment') == 'always') {
- // $payment_urls = [];
- // }
-
- // $payment_urls[] = [
- // 'label' => ctrans('texts.apply_credit'),
- // 'company_gateway_id' => CompanyGateway::GATEWAY_CREDIT,
- // 'gateway_type_id' => GatewayType::CREDIT,
- // ];
- // }
-
- // return $payment_urls;
- // }
-
public function validGatewayForAmount($fees_and_limits_for_payment_type, $amount) :bool
{
if (isset($fees_and_limits_for_payment_type)) {
diff --git a/app/Models/Company.php b/app/Models/Company.php
index 0bfa5e1431cd..964a226f2187 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -33,6 +33,7 @@ class Company extends BaseModel
use CompanySettingsSaver;
use ThrottlesEmail;
use AppSetup;
+ use \Awobaz\Compoships\Compoships;
const ENTITY_RECURRING_INVOICE = 'recurring_invoice';
const ENTITY_CREDIT = 'credit';
@@ -471,7 +472,7 @@ class Company extends BaseModel
public function company_users()
{
- return $this->hasMany(CompanyUser::class);
+ return $this->hasMany(CompanyUser::class)->withTrashed();
}
public function owner()
@@ -508,6 +509,11 @@ class Company extends BaseModel
return $this->slack_webhook_url;
}
+ public function file_path()
+ {
+ return $this->company_key.'/';
+ }
+
public function rBits()
{
$user = $this->owner();
diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php
index 7c6451253f1e..d8222df06403 100644
--- a/app/Models/CompanyGateway.php
+++ b/app/Models/CompanyGateway.php
@@ -338,21 +338,44 @@ class CompanyGateway extends BaseModel
$fee = 0;
- if ($fees_and_limits->fee_amount) {
- $fee += $fees_and_limits->fee_amount;
- }
- if ($fees_and_limits->fee_percent) {
- if($fees_and_limits->fee_percent == 100){ //unusual edge case if the user wishes to charge a fee of 100% 09/01/2022
- $fee += $amount;
- }
- elseif ($fees_and_limits->adjust_fee_percent) {
- $fee += round(($amount / (1 - $fees_and_limits->fee_percent / 100) - $amount), 2);
- } else {
- $fee += round(($amount * $fees_and_limits->fee_percent / 100), 2);
- }
- }
+ if($fees_and_limits->adjust_fee_percent)
+ {
+ $adjusted_fee = 0;
+ if ($fees_and_limits->fee_amount) {
+ $adjusted_fee += $fees_and_limits->fee_amount + $amount;
+ }
+
+ if ($fees_and_limits->fee_percent) {
+
+ $divisor = 1 - ($fees_and_limits->fee_percent/100);
+
+ $gross_amount = round($adjusted_fee/$divisor,2);
+ $fee = $gross_amount - $amount;
+
+ }
+
+ }
+ else
+ {
+ if ($fees_and_limits->fee_amount) {
+ $fee += $fees_and_limits->fee_amount;
+ }
+
+ if ($fees_and_limits->fee_percent) {
+ if($fees_and_limits->fee_percent == 100){ //unusual edge case if the user wishes to charge a fee of 100% 09/01/2022
+ $fee += $amount;
+ }
+ else
+ $fee += round(($amount * $fees_and_limits->fee_percent / 100), 2);
+ //elseif ($fees_and_limits->adjust_fee_percent) {
+ // $fee += round(($amount / (1 - $fees_and_limits->fee_percent / 100) - $amount), 2);
+ //} else {
+
+ //}
+ }
+ }
/* Cap fee if we have to here. */
if ($fees_and_limits->fee_cap > 0 && ($fee > $fees_and_limits->fee_cap)) {
$fee = $fees_and_limits->fee_cap;
diff --git a/app/Models/CompanyToken.php b/app/Models/CompanyToken.php
index 1ccb2d20d0c6..72c57361f251 100644
--- a/app/Models/CompanyToken.php
+++ b/app/Models/CompanyToken.php
@@ -17,6 +17,7 @@ class CompanyToken extends BaseModel
{
use SoftDeletes;
use Filterable;
+ use \Awobaz\Compoships\Compoships;
protected $fillable = [
'name',
diff --git a/app/Models/CompanyUser.php b/app/Models/CompanyUser.php
index 9ebfbd5693e6..cf9fbfd14d1c 100644
--- a/app/Models/CompanyUser.php
+++ b/app/Models/CompanyUser.php
@@ -17,6 +17,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
class CompanyUser extends Pivot
{
use SoftDeletes;
+ use \Awobaz\Compoships\Compoships;
// protected $guarded = ['id'];
diff --git a/app/Models/Document.php b/app/Models/Document.php
index cddd583321ea..a6ff0fba4c32 100644
--- a/app/Models/Document.php
+++ b/app/Models/Document.php
@@ -135,4 +135,9 @@ class Document extends BaseModel
{
return Storage::disk($this->disk)->path($this->url);
}
+
+ public function getFile()
+ {
+ return Storage::get($this->url);
+ }
}
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index a46dc761016a..30d4128cd318 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -228,6 +228,11 @@ class Invoice extends BaseModel
return $this->hasMany(Task::class);
}
+ public function task()
+ {
+ return $this->hasOne(Task::class);
+ }
+
public function expenses()
{
return $this->hasMany(Expense::class);
diff --git a/app/Models/Payment.php b/app/Models/Payment.php
index 113d9a1cde4c..584fef37652e 100644
--- a/app/Models/Payment.php
+++ b/app/Models/Payment.php
@@ -232,8 +232,6 @@ class Payment extends BaseModel
public function refund(array $data) :self
{
return $this->service()->refundPayment($data);
-
- //return $this->processRefund($data);
}
/**
diff --git a/app/Models/User.php b/app/Models/User.php
index 9fd2be78bc3e..bf2195fb372e 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -44,6 +44,7 @@ class User extends Authenticatable implements MustVerifyEmail
use UserSettings;
use Filterable;
use HasFactory;
+ use \Awobaz\Compoships\Compoships;
protected $guard = 'user';
@@ -190,9 +191,7 @@ class User extends Authenticatable implements MustVerifyEmail
$truth = app()->make(TruthSource::class);
if ($this->company){
-
return $this->company;
-
}
elseif($truth->getCompany()){
return $truth->getCompany();
@@ -203,9 +202,7 @@ class User extends Authenticatable implements MustVerifyEmail
return $company_token->company;
}
- // return false;
throw new \Exception('No Company Found');
- //return Company::find(config('ninja.company_id'));
}
public function companyIsSet()
@@ -252,18 +249,19 @@ class User extends Authenticatable implements MustVerifyEmail
public function company_user()
{
-
- // return $this->hasOneThrough(CompanyUser::class, CompanyToken::class, 'user_id', 'user_id', 'id', 'user_id')
- // ->withTrashed();
+ if($this->companyId())
+ return $this->belongsTo(CompanyUser::class)->where('company_id', $this->companyId())->withTrashed();
$truth = app()->make(TruthSource::class);
- if($truth->getCompanyUser()){
+ if($truth->getCompanyUser())
return $truth->getCompanyUser();
- }
return $this->token()->cu;
+ // return $this->hasOneThrough(CompanyUser::class, CompanyToken::class, 'user_id', 'user_id', 'id', 'user_id')
+ // ->withTrashed();
+
}
/**
diff --git a/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php b/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php
index 5579a22ed892..98906f81d2d2 100644
--- a/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php
+++ b/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php
@@ -256,7 +256,7 @@ class AuthorizeCreditCard
$code = "Error";
$description = "There was an error processing the payment";
- if ($response->getErrors() != null) {
+ if ($response && $response->getErrors() != null) {
$code = $response->getErrors()[0]->getErrorCode();
$description = $response->getErrors()[0]->getErrorText();
}
diff --git a/app/PaymentDrivers/Authorize/ChargePaymentProfile.php b/app/PaymentDrivers/Authorize/ChargePaymentProfile.php
index e6ba7fe45382..184c118e8694 100644
--- a/app/PaymentDrivers/Authorize/ChargePaymentProfile.php
+++ b/app/PaymentDrivers/Authorize/ChargePaymentProfile.php
@@ -51,8 +51,8 @@ class ChargePaymentProfile
$description = "Invoices: {$invoice_numbers} for {$amount} for client {$this->authorize->client->present()->name()}";
$order = new OrderType();
- $order->setInvoiceNumber($invoice_numbers);
- $order->setDescription($description);
+ $order->setInvoiceNumber(substr($invoice_numbers,0,19));
+ $order->setDescription(substr($description,0,255));
$transactionRequestType = new TransactionRequestType();
$transactionRequestType->setTransactionType('authCaptureTransaction');
diff --git a/app/PaymentDrivers/Stripe/BrowserPay.php b/app/PaymentDrivers/Stripe/BrowserPay.php
index a7cdfb8dc055..48e4e9f1a877 100644
--- a/app/PaymentDrivers/Stripe/BrowserPay.php
+++ b/app/PaymentDrivers/Stripe/BrowserPay.php
@@ -205,7 +205,7 @@ class BrowserPay implements MethodInterface
$response = ApplePayDomain::create([
'domain_name' => $domain,
- ]);
+ ], $this->stripe->stripe_connect_auth);
$config->apple_pay_domain_id = $response->id;
diff --git a/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php b/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php
index d3b9e974e221..205d4fbae02f 100644
--- a/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php
+++ b/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php
@@ -107,7 +107,7 @@ class UpdatePaymentMethods
$additional_data = ['gateway_customer_reference' => $customer->id];
if($customer->default_source === $method->id)
- $additional_data = ['gateway_customer_reference' => $customer->id, 'is_default', 1];
+ $additional_data = ['gateway_customer_reference' => $customer->id, 'is_default' => 1];
$this->stripe->storeGatewayToken($data, $additional_data);
diff --git a/app/PaymentDrivers/StripePaymentDriver.php b/app/PaymentDrivers/StripePaymentDriver.php
index 5826cb36761a..f693459e7a7f 100644
--- a/app/PaymentDrivers/StripePaymentDriver.php
+++ b/app/PaymentDrivers/StripePaymentDriver.php
@@ -169,7 +169,7 @@ class StripePaymentDriver extends BaseDriver
&& $this->client->currency()
&& ($this->client->currency()->code == 'EUR')
&& isset($this->client->country)
- && in_array($this->client->country->iso_3166_3, ['AUS', 'DNK', 'DEU', 'ITA', 'LUX', 'NOR', 'SVN', 'GBR', 'EST', 'GRC', 'JPN', 'PRT', 'ESP', 'USA', 'BEL', 'FIN'])) { // TODO: More has to be added https://stripe.com/docs/payments/sepa-debit
+ && in_array($this->client->country->iso_3166_3, ['AUT', 'BEL', 'CHE', 'CYP', 'CZE', 'BGR', 'DNK', 'DEU', 'ESP', 'FIN', 'FRA', 'HUN', 'IRL', 'ITA', 'LVA', 'LUX', 'LTA', 'MLT', 'NLD', 'NOR', 'POL', 'ROU', 'SVK', 'SVN', 'SWE', 'GBR', 'EST', 'GRC', 'PRT' ])) { // TODO: More has to be added https://stripe.com/docs/payments/sepa-debit
$types[] = GatewayType::SEPA;
}
diff --git a/app/PaymentDrivers/WePay/ACH.php b/app/PaymentDrivers/WePay/ACH.php
index b73cd9742b6f..8b5edb770806 100644
--- a/app/PaymentDrivers/WePay/ACH.php
+++ b/app/PaymentDrivers/WePay/ACH.php
@@ -214,13 +214,29 @@ class ACH
public function paymentResponse($request)
{
- // nlog($request->all());
$token = ClientGatewayToken::find($this->decodePrimaryKey($request->input('source')));
$token_meta = $token->meta;
- if(!property_exists($token_meta, 'state') || $token_meta->state != "authorized")
- return redirect()->route('client.payment_methods.verification', ['payment_method' => $token->hashed_id, 'method' => GatewayType::BANK_TRANSFER]);
+ if(!property_exists($token_meta, 'state') || $token_meta->state != "authorized"){
+
+ $response = $this->wepay_payment_driver->wepay->request('/payment_bank', [
+ 'client_id' => config('ninja.wepay.client_id'),
+ 'client_secret' => config('ninja.wepay.client_secret'),
+ 'payment_bank_id' => $token->token,
+ ]);
+
+ if($response->state == 'authorized')
+ {
+ $meta = $token->meta;
+ $meta->state = $response->state;
+ $token->meta = $meta;
+ $token->save();
+ }
+ else
+ return redirect()->route('client.payment_methods.verification', ['payment_method' => $token->hashed_id, 'method' => GatewayType::BANK_TRANSFER]);
+
+ }
$app_fee = (config('ninja.wepay.fee_ach_multiplier') * $this->wepay_payment_driver->payment_hash->data->amount_with_fee) + config('ninja.wepay.fee_fixed');
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 2206abe686fb..ee6c6775d724 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -19,6 +19,7 @@ use App\Utils\TruthSource;
use Illuminate\Cache\RateLimiting\Limit;
use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Queue\Events\JobProcessing;
+use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Blade;
use Illuminate\Support\Facades\Queue;
use Illuminate\Support\Facades\RateLimiter;
@@ -61,17 +62,10 @@ class AppServiceProvider extends ServiceProvider
]);
}
- // Queue::before(function (JobProcessing $event) {
- // // \Log::info('Event Job '.$event->connectionName);
- // \Log::error('Event Job '.$event->job->getJobId);
- // // \Log::info('Event Job '.$event->job->payload());
- // });
- //! Update Posted AT
- // Queue::after(function (JobProcessed $event) {
- // // \Log::info('Event Job '.$event->connectionName);
- // \Log::error('Event Job '.$event->job->getJobId);
- // // \Log::info('Event Job '.$event->job->payload());
- // });
+ /* Ensure we don't have stale state in jobs */
+ Queue::before(function (JobProcessing $event) {
+ App::forgetInstance('truthsource');
+ });
app()->instance(TruthSource::class, new TruthSource());
diff --git a/app/Services/ClientPortal/InstantPayment.php b/app/Services/ClientPortal/InstantPayment.php
index bd7b89378645..c628c803f853 100644
--- a/app/Services/ClientPortal/InstantPayment.php
+++ b/app/Services/ClientPortal/InstantPayment.php
@@ -157,7 +157,6 @@ class InstantPayment
$payable_invoice_collection = collect();
foreach ($payable_invoices as $payable_invoice) {
- // nlog($payable_invoice);
$payable_invoice['amount'] = Number::parseFloat($payable_invoice['amount']);
diff --git a/app/Services/Invoice/AutoBillInvoice.php b/app/Services/Invoice/AutoBillInvoice.php
index 37467098e17a..761069a3b763 100644
--- a/app/Services/Invoice/AutoBillInvoice.php
+++ b/app/Services/Invoice/AutoBillInvoice.php
@@ -60,7 +60,7 @@ class AutoBillInvoice extends AbstractService
/* Mark the invoice as paid if there is no balance */
if ((int)$this->invoice->balance == 0)
- return $this->invoice->service()->markPaid()->workFlow()->save();
+ return $this->invoice->service()->markPaid()->save();
//if the credits cover the payments, we stop here, build the payment with credits and exit early
if ($this->client->getSetting('use_credits_payment') != 'off')
diff --git a/app/Services/Invoice/HandleRestore.php b/app/Services/Invoice/HandleRestore.php
index 14216f2751f1..5b10db4fc352 100644
--- a/app/Services/Invoice/HandleRestore.php
+++ b/app/Services/Invoice/HandleRestore.php
@@ -31,6 +31,8 @@ class HandleRestore extends AbstractService
public function run()
{
+ $this->invoice->restore();
+
if (!$this->invoice->is_deleted) {
return $this->invoice;
}
@@ -39,63 +41,64 @@ class HandleRestore extends AbstractService
foreach ($this->invoice->payments as $payment) {
//restore the payment record
- $payment->restore();
+ // $payment->restore();
+ $this->invoice->restore();
- //determine the paymentable amount before paymentable restoration
- $pre_restore_amount = $payment->paymentables()
- ->where('paymentable_type', '=', 'invoices')
- ->sum(\DB::raw('amount'));
+// //determine the paymentable amount before paymentable restoration
+// $pre_restore_amount = $payment->paymentables()
+// ->where('paymentable_type', '=', 'invoices')
+// ->sum(\DB::raw('amount'));
-nlog("first pre restore amount = {$pre_restore_amount}");
+// nlog("first pre restore amount = {$pre_restore_amount}");
- $pre_restore_amount -= $payment->paymentables()
- ->where('paymentable_type', '=', 'invoices')
- ->sum(\DB::raw('refunded'));
+// $pre_restore_amount -= $payment->paymentables()
+// ->where('paymentable_type', '=', 'invoices')
+// ->sum(\DB::raw('refunded'));
-nlog("second pre restore amount = {$pre_restore_amount}");
+// nlog("second pre restore amount = {$pre_restore_amount}");
//restore the paymentables
- $payment->paymentables()
- ->where('paymentable_type', '=', 'invoices')
- ->where('paymentable_id', $this->invoice->id)
- ->restore();
+ // $payment->paymentables()
+ // ->where('paymentable_type', '=', 'invoices')
+ // ->where('paymentable_id', $this->invoice->id)
+ // ->restore();
//determine the post restore paymentable amount (we need to increment the payment amount by the difference between pre and post)
- $payment_amount = $payment->paymentables()
- ->where('paymentable_type', '=', 'invoices')
- ->sum(\DB::raw('amount'));
+// $payment_amount = $payment->paymentables()
+// ->where('paymentable_type', '=', 'invoices')
+// ->sum(\DB::raw('amount'));
-nlog("first payment_amount = {$payment_amount}");
+// nlog("first payment_amount = {$payment_amount}");
- $payment_amount -= $payment->paymentables()
- ->where('paymentable_type', '=', 'invoices')
- ->sum(\DB::raw('refunded'));
+// $payment_amount -= $payment->paymentables()
+// ->where('paymentable_type', '=', 'invoices')
+// ->sum(\DB::raw('refunded'));
-nlog("second payment_amount = {$payment_amount}");
+// nlog("second payment_amount = {$payment_amount}");
- nlog($payment->amount . " == " . $payment_amount);
+// nlog($payment->amount . " == " . $payment_amount);
- if ($payment->amount == $payment_amount) {
- $payment->is_deleted = false;
- $payment->save();
+ // if ($payment->amount == $payment_amount) {
+ // $payment->is_deleted = false;
+ // $payment->save();
- $this->payment_total += $payment_amount;
- } else {
- $payment->is_deleted = false;
- $payment->amount += ($payment_amount - $pre_restore_amount);
- $payment->applied += ($payment_amount - $pre_restore_amount);
- $payment->save();
+ // $this->payment_total += $payment_amount;
+ // } else {
+ // $payment->is_deleted = false;
+ // $payment->amount += ($payment_amount - $pre_restore_amount);
+ // $payment->applied += ($payment_amount - $pre_restore_amount);
+ // $payment->save();
- $this->payment_total += ($payment_amount - $pre_restore_amount);
- }
+ // $this->payment_total += ($payment_amount - $pre_restore_amount);
+ // }
}
//adjust ledger balance
$this->invoice->ledger()->updateInvoiceBalance($this->invoice->balance, "Restored invoice {$this->invoice->number}")->save();
//adjust paid to dates
- $this->invoice->client->service()->updatePaidToDate($this->payment_total)->save();
+ // $this->invoice->client->service()->updatePaidToDate($this->payment_total)->save();
$this->invoice->client->service()->updateBalance($this->invoice->balance)->save();
@@ -104,6 +107,9 @@ nlog("second payment_amount = {$payment_amount}");
$this->windBackInvoiceNumber();
+ $this->invoice->is_deleted = false;
+ $this->invoice->save();
+
return $this->invoice;
}
diff --git a/app/Services/Invoice/MarkInvoiceDeleted.php b/app/Services/Invoice/MarkInvoiceDeleted.php
index ee5dafb2ff32..80be6a2a36b5 100644
--- a/app/Services/Invoice/MarkInvoiceDeleted.php
+++ b/app/Services/Invoice/MarkInvoiceDeleted.php
@@ -72,14 +72,21 @@ class MarkInvoiceDeleted extends AbstractService
private function adjustPaidToDate()
{
- $this->invoice->client->service()->updatePaidToDate($this->adjustment_amount * -1)->save(); //reduces the paid to date by the payment totals
+ $client = $this->invoice->client->fresh();
+ $client->paid_to_date += $this->adjustment_amount * -1;
+ $client->save();
+ // $this->invoice->client->service()->updatePaidToDate($this->adjustment_amount * -1)->save(); //reduces the paid to date by the payment totals
return $this;
}
private function adjustBalance()
{
- $this->invoice->client->service()->updateBalance($this->balance_adjustment * -1)->save(); //reduces the client balance by the invoice amount.
+ $client = $this->invoice->client->fresh();
+ $client->balance += $this->balance_adjustment * -1;
+ $client->save();
+
+ // $this->invoice->client->service()->updateBalance($this->balance_adjustment * -1)->save(); //reduces the client balance by the invoice amount.
return $this;
}
diff --git a/app/Services/Invoice/MarkPaid.php b/app/Services/Invoice/MarkPaid.php
index b39679ad3c8d..5ea33b4b5cc9 100644
--- a/app/Services/Invoice/MarkPaid.php
+++ b/app/Services/Invoice/MarkPaid.php
@@ -96,6 +96,11 @@ class MarkPaid extends AbstractService
$payment->ledger()
->updatePaymentBalance($payment->amount * -1);
+ // $client = $this->invoice->client->fresh();
+ // $client->paid_to_date += $payment->amount;
+ // $client->balance += $payment->amount * -1;
+ // $client->save();
+
$this->invoice
->client
->service()
@@ -103,10 +108,10 @@ class MarkPaid extends AbstractService
->updatePaidToDate($payment->amount)
->save();
- $this->invoice
- ->service()
- ->workFlow()
- ->save();
+ $this->invoice = $this->invoice
+ ->service()
+ ->workFlow()
+ ->save();
/* Update Invoice balance */
event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
diff --git a/app/Services/Payment/DeletePayment.php b/app/Services/Payment/DeletePayment.php
index 654448a8d6d4..a4e12df0a285 100644
--- a/app/Services/Payment/DeletePayment.php
+++ b/app/Services/Payment/DeletePayment.php
@@ -90,6 +90,8 @@ class DeletePayment
if(!$paymentable_invoice->is_deleted)
{
+ $paymentable_invoice->restore();
+
$paymentable_invoice->service()
->updateBalance($net_deletable)
->updatePaidToDate($net_deletable * -1)
@@ -112,6 +114,8 @@ class DeletePayment
}
else {
+ $paymentable_invoice->restore();
+
//If the invoice is deleted we only update the meta data on the invoice
//and reduce the clients paid to date
$paymentable_invoice->service()
@@ -134,8 +138,10 @@ class DeletePayment
});
}
- $this->payment
- ->client
+
+ $client = $this->payment->client->fresh();
+
+ $client
->service()
->updatePaidToDate(($this->payment->amount - $this->payment->refunded)*-1)
->save();
@@ -143,7 +149,7 @@ class DeletePayment
$transaction = [
'invoice' => [],
'payment' => [],
- 'client' => $this->payment->client->transaction_event(),
+ 'client' => $client->transaction_event(),
'credit' => [],
'metadata' => [],
];
@@ -161,8 +167,8 @@ class DeletePayment
$multiplier = 1;
- if($paymentable_credit->pivot->amount < 0)
- $multiplier = -1;
+ if($paymentable_credit->pivot->amount < 0)
+ $multiplier = -1;
$paymentable_credit->service()
->updateBalance($paymentable_credit->pivot->amount*$multiplier*-1)
@@ -170,18 +176,13 @@ class DeletePayment
->setStatus(Credit::STATUS_SENT)
->save();
- $this->payment
- ->client
- ->service()
- ->updatePaidToDate(($paymentable_credit->pivot->amount)*-1)
- ->save();
+ $client = $this->payment->client->fresh();
+
+ $client
+ ->service()
+ ->updatePaidToDate(($paymentable_credit->pivot->amount)*-1)
+ ->save();
- //01-03-2022
- // $paymentable_credit->service()
- // ->updateBalance($paymentable_credit->pivot->amount*$multiplier)
- // ->updatePaidToDate($paymentable_credit->pivot->amount*-1)
- // ->setStatus(Credit::STATUS_SENT)
- // ->save();
});
}
diff --git a/app/Services/Payment/RefundPayment.php b/app/Services/Payment/RefundPayment.php
index d846989cf8f3..cdf86f2d0f9b 100644
--- a/app/Services/Payment/RefundPayment.php
+++ b/app/Services/Payment/RefundPayment.php
@@ -15,6 +15,7 @@ use App\Exceptions\PaymentRefundFailed;
use App\Factory\CreditFactory;
use App\Factory\InvoiceItemFactory;
use App\Jobs\Ninja\TransactionLog;
+use App\Jobs\Payment\EmailRefundPayment;
use App\Models\Activity;
use App\Models\Credit;
use App\Models\Invoice;
@@ -64,6 +65,14 @@ class RefundPayment
->processGatewayRefund() //process the gateway refund if needed
->save();
+
+ if(array_key_exists('email_receipt', $this->refund_data) && $this->refund_data['email_receipt'] == 'true'){
+
+ $contact = $this->payment->client->contacts()->whereNotNull('email')->first();
+ EmailRefundPayment::dispatch($this->payment, $this->payment->company, $contact);
+
+ }
+
$transaction = [
'invoice' => [],
'payment' => $this->payment->transaction_event(),
diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php
index 4e29441ed28f..a30facb49981 100644
--- a/app/Services/PdfMaker/Design.php
+++ b/app/Services/PdfMaker/Design.php
@@ -645,8 +645,8 @@ class Design extends BaseDesign
if ($this->type === self::STATEMENT) {
return [
['element' => 'div', 'properties' => ['style' => 'display: flex; flex-direction: column;'], 'elements' => [
- ['element' => 'div', 'properties' => ['style' => 'margin-top: 1.5rem; display: flex; align-items: flex-start;'], 'elements' => [
- ['element' => 'img', 'properties' => ['src' => '$invoiceninja.whitelabel', 'style' => 'height: 2.5rem;', 'hidden' => $this->entity->user->account->isPaid() ? 'true' : 'false', 'id' => 'invoiceninja-whitelabel-logo']],
+ ['element' => 'div', 'properties' => ['style' => 'margin-top: 1.5rem; display: block; align-items: flex-start; page-break-inside: avoid; visible !important;'], 'elements' => [
+ ['element' => 'img', 'properties' => ['src' => '$invoiceninja.whitelabel', 'style' => 'overflow: visible !important; display: block; page-break-inside: avoid; height: 2.5rem;', 'hidden' => $this->entity->user->account->isPaid() ? 'true' : 'false', 'id' => 'invoiceninja-whitelabel-logo']],
]],
]],
];
@@ -667,8 +667,8 @@ class Design extends BaseDesign
['element' => 'span', 'content' => strtr(str_replace("labels", "", $_variables['values']['$entity.terms']), $_variables['labels']), 'properties' => ['data-ref' => 'total_table-terms', 'style' => 'text-align: left;']],
]],
['element' => 'img', 'properties' => ['style' => 'max-width: 50%; height: auto;', 'src' => '$contact.signature', 'id' => 'contact-signature']],
- ['element' => 'div', 'properties' => ['style' => 'margin-top: 1.5rem; display: flex; align-items: flex-start;'], 'elements' => [
- ['element' => 'img', 'properties' => ['src' => '$invoiceninja.whitelabel', 'style' => 'height: 2.5rem;', 'hidden' => $this->entity->user->account->isPaid() ? 'true' : 'false', 'id' => 'invoiceninja-whitelabel-logo']],
+ ['element' => 'div', 'properties' => ['style' => 'margin-top: 1.5rem; display: block; align-items: flex-start; page-break-inside: avoid; visible !important;'], 'elements' => [
+ ['element' => 'img', 'properties' => ['src' => '$invoiceninja.whitelabel', 'style' => 'overflow: visible !important; display: block; page-break-inside: avoid; height: 2.5rem;', 'hidden' => $this->entity->user->account->isPaid() ? 'true' : 'false', 'id' => 'invoiceninja-whitelabel-logo']],
]],
]],
['element' => 'div', 'properties' => ['class' => 'totals-table-right-side', 'dir' => '$dir'], 'elements' => []],
diff --git a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php
index f2f61cc68240..5ef3916b2e99 100644
--- a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php
+++ b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php
@@ -379,7 +379,7 @@ document.addEventListener('DOMContentLoaded', function() {
'allow_unsafe_links' => false,
]);
- return $converter->convertToHtml($markdown);
+ return $converter->convert($markdown);
}
// public function processMarkdownOnLineItems(array &$items): void
diff --git a/app/Services/PdfMaker/PdfMakerUtilities.php b/app/Services/PdfMaker/PdfMakerUtilities.php
index 06817df0e949..bc0ffa4626fa 100644
--- a/app/Services/PdfMaker/PdfMakerUtilities.php
+++ b/app/Services/PdfMaker/PdfMakerUtilities.php
@@ -95,7 +95,7 @@ trait PdfMakerUtilities
if (array_key_exists('process_markdown', $this->data) && array_key_exists('content', $child) && $this->data['process_markdown']) {
$child['content'] = str_replace("
", "\r", $child['content']);
- $child['content'] = $this->commonmark->convertToHtml($child['content'] ?? '');
+ $child['content'] = $this->commonmark->convert($child['content'] ?? '');
}
}
diff --git a/app/Transformers/CompanyUserTransformer.php b/app/Transformers/CompanyUserTransformer.php
index 88d90cfede67..1f63e2716b3d 100644
--- a/app/Transformers/CompanyUserTransformer.php
+++ b/app/Transformers/CompanyUserTransformer.php
@@ -16,7 +16,6 @@ use App\Models\Company;
use App\Models\CompanyToken;
use App\Models\CompanyUser;
use App\Models\User;
-use App\Utils\TruthSource;
class CompanyUserTransformer extends EntityTransformer
{
@@ -80,12 +79,7 @@ class CompanyUserTransformer extends EntityTransformer
public function includeToken(CompanyUser $company_user)
{
- $truth = app()->make(TruthSource::class);
-
- if($truth->getCompanyToken())
- $token = $truth->getCompanyToken();
- else
- $token = $company_user->tokens->where('company_id', $company_user->company_id)->where('user_id', $company_user->user_id)->first();
+ $token = $company_user->tokens->where('company_id', $company_user->company_id)->where('user_id', $company_user->user_id)->first();
$transformer = new CompanyTokenTransformer($this->serializer);
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index b42579eafaf3..1aaff8552e8c 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -541,7 +541,6 @@ class HtmlEngine
$data['$payments'] = ['value' => $payment_list, 'label' => ctrans('texts.payments')];
}
-
$arrKeysLength = array_map('strlen', array_keys($data));
array_multisort($arrKeysLength, SORT_DESC, $data);
diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php
index 2b510d8c5c08..1e77d29da097 100644
--- a/app/Utils/SystemHealth.php
+++ b/app/Utils/SystemHealth.php
@@ -180,12 +180,12 @@ class SystemHealth
$result = ['success' => false];
if ($request && !config('ninja.preconfigured_install')) {
- config(['database.connections.db-ninja-01.host' => $request->input('db_host')]);
- config(['database.connections.db-ninja-01.port' => $request->input('db_port')]);
- config(['database.connections.db-ninja-01.database' => $request->input('db_database')]);
- config(['database.connections.db-ninja-01.username' => $request->input('db_username')]);
- config(['database.connections.db-ninja-01.password' => $request->input('db_password')]);
- config(['database.default' => 'db-ninja-01']);
+ config(['database.connections.mysql.host' => $request->input('db_host')]);
+ config(['database.connections.mysql.port' => $request->input('db_port')]);
+ config(['database.connections.mysql.database' => $request->input('db_database')]);
+ config(['database.connections.mysql.username' => $request->input('db_username')]);
+ config(['database.connections.mysql.password' => $request->input('db_password')]);
+ config(['database.default' => 'mysql']);
DB::purge('db-ninja-01');
}
diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php
index 71245bc6b563..97a47fb68826 100644
--- a/app/Utils/TemplateEngine.php
+++ b/app/Utils/TemplateEngine.php
@@ -90,7 +90,6 @@ class TemplateEngine
if (strlen($this->entity) > 1 && strlen($this->entity_id) > 1) {
$class = 'App\Models\\'.ucfirst($this->entity);
$this->entity_obj = $class::withTrashed()->where('id', $this->decodePrimaryKey($this->entity_id))->company()->first();
- nlog("the entity id = ".$this->entity_obj->id);
} else {
$this->mockEntity();
}
@@ -168,7 +167,7 @@ class TemplateEngine
'allow_unsafe_links' => false,
]);
- $this->body = $converter->convertToHtml($this->body);
+ $this->body = $converter->convert($this->body);
}
private function entityValues($contact)
diff --git a/app/Utils/Traits/MakesInvoiceValues.php b/app/Utils/Traits/MakesInvoiceValues.php
index 1cdb2f97b4a9..6f0b4ea02971 100644
--- a/app/Utils/Traits/MakesInvoiceValues.php
+++ b/app/Utils/Traits/MakesInvoiceValues.php
@@ -305,18 +305,18 @@ trait MakesInvoiceValues
// 08-02-2022 - fix for regression below
// $data[$key][$table_type.'.quantity'] = Number::formatValue($item->quantity, $this->client->currency());
- $data[$key][$table_type.'.quantity'] = Number::formatValueNoTrailingZeroes($item->quantity, $this->client->currency());
+ $data[$key][$table_type.'.quantity'] = ($item->quantity == 0) ? '' : Number::formatValueNoTrailingZeroes($item->quantity, $this->client->currency());
- $data[$key][$table_type.'.unit_cost'] = Number::formatMoneyNoRounding($item->cost, $this->client);
+ $data[$key][$table_type.'.unit_cost'] = ($item->cost == 0) ? '' : Number::formatMoneyNoRounding($item->cost, $this->client);
- $data[$key][$table_type.'.cost'] = Number::formatMoney($item->cost, $this->client);
+ $data[$key][$table_type.'.cost'] = ($item->cost == 0) ? '' : Number::formatMoney($item->cost, $this->client);
- $data[$key][$table_type.'.line_total'] = Number::formatMoney($item->line_total, $this->client);
+ $data[$key][$table_type.'.line_total'] = ($item->line_total == 0) ? '' :Number::formatMoney($item->line_total, $this->client);
if(property_exists($item, 'gross_line_total'))
- $data[$key][$table_type.'.gross_line_total'] = Number::formatMoney($item->gross_line_total, $this->client);
+ $data[$key][$table_type.'.gross_line_total'] = ($item->gross_line_total == 0) ? '' :Number::formatMoney($item->gross_line_total, $this->client);
else
- $data[$key][$table_type.'.gross_line_total'] = 0;
+ $data[$key][$table_type.'.gross_line_total'] = '';
if (isset($item->discount) && $item->discount > 0) {
if ($item->is_amount_discount) {
diff --git a/app/Utils/Traits/PaymentEmailBuilder.php b/app/Utils/Traits/PaymentEmailBuilder.php
index 15b8f5fa73d5..0545b6dfc322 100644
--- a/app/Utils/Traits/PaymentEmailBuilder.php
+++ b/app/Utils/Traits/PaymentEmailBuilder.php
@@ -81,7 +81,7 @@ trait PaymentEmailBuilder
'allow_unsafe_links' => false,
]);
- $data = $converter->convertToHtml($data);
+ $data = $converter->convert($data);
}
return $data;
diff --git a/app/Utils/Traits/QuoteEmailBuilder.php b/app/Utils/Traits/QuoteEmailBuilder.php
index 46d5f5c2e8f7..f6b98e193835 100644
--- a/app/Utils/Traits/QuoteEmailBuilder.php
+++ b/app/Utils/Traits/QuoteEmailBuilder.php
@@ -89,7 +89,7 @@ trait QuoteEmailBuilder
'allow_unsafe_links' => true,
]);
- $data = $converter->convertToHtml($data);
+ $data = $converter->convert($data);
}
return $data;
diff --git a/composer.json b/composer.json
index 01162773da55..3895ca8e59d1 100644
--- a/composer.json
+++ b/composer.json
@@ -33,6 +33,7 @@
"afosto/yaac": "^1.4",
"asm/php-ansible": "^3",
"authorizenet/authorizenet": "^2.0",
+ "awobaz/compoships": "^2.1",
"bacon/bacon-qr-code": "^2.0",
"beganovich/snappdf": "^1.7",
"braintree/braintree_php": "^6.0",
@@ -68,7 +69,7 @@
"livewire/livewire": "^2.6",
"mollie/mollie-api-php": "^2.36",
"nelexa/zip": "^4.0",
- "nwidart/laravel-modules": "^8.0",
+ "nwidart/laravel-modules": "8.3",
"omnipay/paypal": "^3.0",
"payfast/payfast-php-sdk": "^1.1",
"pragmarx/google2fa": "^8.0",
diff --git a/composer.lock b/composer.lock
index 75d9b6f6a86c..c30dbbac3ca4 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": "f92ff75d01d04fc5c6105ad78b57476b",
+ "content-hash": "757a9ac77c2ab087200bef004b00c6e1",
"packages": [
{
"name": "afosto/yaac",
@@ -110,16 +110,16 @@
},
{
"name": "apimatic/unirest-php",
- "version": "2.1.0",
+ "version": "2.2.1",
"source": {
"type": "git",
"url": "https://github.com/apimatic/unirest-php.git",
- "reference": "e07351d5f70b445664e2dc4042bbc237ec7d4c93"
+ "reference": "847149c56d850081c07d5677e9647fa0c15e595f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/apimatic/unirest-php/zipball/e07351d5f70b445664e2dc4042bbc237ec7d4c93",
- "reference": "e07351d5f70b445664e2dc4042bbc237ec7d4c93",
+ "url": "https://api.github.com/repos/apimatic/unirest-php/zipball/847149c56d850081c07d5677e9647fa0c15e595f",
+ "reference": "847149c56d850081c07d5677e9647fa0c15e595f",
"shasum": ""
},
"require": {
@@ -168,9 +168,9 @@
"support": {
"email": "opensource@apimatic.io",
"issues": "https://github.com/apimatic/unirest-php/issues",
- "source": "https://github.com/apimatic/unirest-php/tree/2.1.0"
+ "source": "https://github.com/apimatic/unirest-php/tree/2.2.1"
},
- "time": "2021-11-12T05:20:21+00:00"
+ "time": "2022-03-12T08:37:06+00:00"
},
{
"name": "asm/php-ansible",
@@ -322,6 +322,66 @@
},
"time": "2021-03-31T18:22:14+00:00"
},
+ {
+ "name": "awobaz/compoships",
+ "version": "2.1.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/topclaudy/compoships.git",
+ "reference": "c5b107f16a2a8650fb2dbc21babd4a65a0f48585"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/topclaudy/compoships/zipball/c5b107f16a2a8650fb2dbc21babd4a65a0f48585",
+ "reference": "c5b107f16a2a8650fb2dbc21babd4a65a0f48585",
+ "shasum": ""
+ },
+ "require": {
+ "illuminate/database": ">=5.6 <10.0"
+ },
+ "require-dev": {
+ "ext-sqlite3": "*"
+ },
+ "suggest": {
+ "awobaz/blade-active": "Blade directives for the Laravel 'Active' package",
+ "awobaz/eloquent-auto-append": "Automatically append accessors to model serialization",
+ "awobaz/eloquent-mutators": "Reusable mutators (getters/setters) for Laravel 5's Eloquent",
+ "awobaz/syntactic": "Syntactic sugar for named and indexed parameters call."
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Awobaz\\Compoships\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Claudin J. Daniel",
+ "email": "cdaniel@awobaz.com"
+ }
+ ],
+ "description": "Laravel relationships with support for composite/multiple keys",
+ "keywords": [
+ "laravel",
+ "laravel composite keys",
+ "laravel relationships"
+ ],
+ "support": {
+ "issues": "https://github.com/topclaudy/compoships/issues",
+ "source": "https://github.com/topclaudy/compoships/tree/2.1.3"
+ },
+ "funding": [
+ {
+ "url": "https://paypal.me/awobaz",
+ "type": "custom"
+ }
+ ],
+ "time": "2021-11-29T22:11:22+00:00"
+ },
{
"name": "aws/aws-crt-php",
"version": "v1.0.2",
@@ -374,16 +434,16 @@
},
{
"name": "aws/aws-sdk-php",
- "version": "3.212.2",
+ "version": "3.213.0",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
- "reference": "dd2ff1ca2d7c37bfb7c3fed24cb8ad8bad604ec5"
+ "reference": "61875282d6ec1c441ca0af94fc00a5f516db12ef"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/dd2ff1ca2d7c37bfb7c3fed24cb8ad8bad604ec5",
- "reference": "dd2ff1ca2d7c37bfb7c3fed24cb8ad8bad604ec5",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/61875282d6ec1c441ca0af94fc00a5f516db12ef",
+ "reference": "61875282d6ec1c441ca0af94fc00a5f516db12ef",
"shasum": ""
},
"require": {
@@ -459,22 +519,22 @@
"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.212.2"
+ "source": "https://github.com/aws/aws-sdk-php/tree/3.213.0"
},
- "time": "2022-03-04T19:27:01+00:00"
+ "time": "2022-03-14T18:26:52+00:00"
},
{
"name": "bacon/bacon-qr-code",
- "version": "2.0.6",
+ "version": "2.0.7",
"source": {
"type": "git",
"url": "https://github.com/Bacon/BaconQrCode.git",
- "reference": "0069435e2a01a57193b25790f105a5d3168653c1"
+ "reference": "d70c840f68657ce49094b8d91f9ee0cc07fbf66c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/0069435e2a01a57193b25790f105a5d3168653c1",
- "reference": "0069435e2a01a57193b25790f105a5d3168653c1",
+ "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/d70c840f68657ce49094b8d91f9ee0cc07fbf66c",
+ "reference": "d70c840f68657ce49094b8d91f9ee0cc07fbf66c",
"shasum": ""
},
"require": {
@@ -513,9 +573,9 @@
"homepage": "https://github.com/Bacon/BaconQrCode",
"support": {
"issues": "https://github.com/Bacon/BaconQrCode/issues",
- "source": "https://github.com/Bacon/BaconQrCode/tree/2.0.6"
+ "source": "https://github.com/Bacon/BaconQrCode/tree/2.0.7"
},
- "time": "2022-02-04T20:16:05+00:00"
+ "time": "2022-03-14T02:02:36+00:00"
},
{
"name": "beganovich/snappdf",
@@ -1340,16 +1400,16 @@
},
{
"name": "composer/semver",
- "version": "3.2.9",
+ "version": "3.3.0",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
- "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649"
+ "reference": "f79c90ad4e9b41ac4dfc5d77bf398cf61fbd718b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/semver/zipball/a951f614bd64dcd26137bc9b7b2637ddcfc57649",
- "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649",
+ "url": "https://api.github.com/repos/composer/semver/zipball/f79c90ad4e9b41ac4dfc5d77bf398cf61fbd718b",
+ "reference": "f79c90ad4e9b41ac4dfc5d77bf398cf61fbd718b",
"shasum": ""
},
"require": {
@@ -1401,7 +1461,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/semver/issues",
- "source": "https://github.com/composer/semver/tree/3.2.9"
+ "source": "https://github.com/composer/semver/tree/3.3.0"
},
"funding": [
{
@@ -1417,7 +1477,7 @@
"type": "tidelift"
}
],
- "time": "2022-02-04T13:58:43+00:00"
+ "time": "2022-03-15T08:35:57+00:00"
},
{
"name": "composer/spdx-licenses",
@@ -1788,16 +1848,16 @@
},
{
"name": "doctrine/dbal",
- "version": "3.3.2",
+ "version": "3.3.3",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "35eae239ef515d55ebb24e9d4715cad09a4f58ed"
+ "reference": "82331b861727c15b1f457ef05a8729e508e7ead5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/35eae239ef515d55ebb24e9d4715cad09a4f58ed",
- "reference": "35eae239ef515d55ebb24e9d4715cad09a4f58ed",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/82331b861727c15b1f457ef05a8729e508e7ead5",
+ "reference": "82331b861727c15b1f457ef05a8729e508e7ead5",
"shasum": ""
},
"require": {
@@ -1812,14 +1872,14 @@
"require-dev": {
"doctrine/coding-standard": "9.0.0",
"jetbrains/phpstorm-stubs": "2021.1",
- "phpstan/phpstan": "1.4.0",
+ "phpstan/phpstan": "1.4.6",
"phpstan/phpstan-strict-rules": "^1.1",
- "phpunit/phpunit": "9.5.11",
+ "phpunit/phpunit": "9.5.16",
"psalm/plugin-phpunit": "0.16.1",
"squizlabs/php_codesniffer": "3.6.2",
"symfony/cache": "^5.2|^6.0",
"symfony/console": "^2.7|^3.0|^4.0|^5.0|^6.0",
- "vimeo/psalm": "4.16.1"
+ "vimeo/psalm": "4.22.0"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -1879,7 +1939,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
- "source": "https://github.com/doctrine/dbal/tree/3.3.2"
+ "source": "https://github.com/doctrine/dbal/tree/3.3.3"
},
"funding": [
{
@@ -1895,7 +1955,7 @@
"type": "tidelift"
}
],
- "time": "2022-02-05T16:33:45+00:00"
+ "time": "2022-03-09T15:39:50+00:00"
},
{
"name": "doctrine/deprecations",
@@ -2336,12 +2396,12 @@
"source": {
"type": "git",
"url": "https://github.com/eWAYPayment/eway-rapid-php.git",
- "reference": "a3be37ad46f14038fb2c87d94ec9d8ad8560842a"
+ "reference": "5581c8279774aabe58ea3aca9bfd7f62759ce7cd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/eWAYPayment/eway-rapid-php/zipball/a3be37ad46f14038fb2c87d94ec9d8ad8560842a",
- "reference": "a3be37ad46f14038fb2c87d94ec9d8ad8560842a",
+ "url": "https://api.github.com/repos/eWAYPayment/eway-rapid-php/zipball/5581c8279774aabe58ea3aca9bfd7f62759ce7cd",
+ "reference": "5581c8279774aabe58ea3aca9bfd7f62759ce7cd",
"shasum": ""
},
"require": {
@@ -2384,7 +2444,7 @@
"issues": "https://github.com/eWAYPayment/eway-rapid-php/issues",
"source": "https://github.com/eWAYPayment/eway-rapid-php/tree/v1.4.0"
},
- "time": "2021-11-25T11:39:45+00:00"
+ "time": "2021-12-08T00:21:16+00:00"
},
{
"name": "fakerphp/faker",
@@ -2775,16 +2835,16 @@
},
{
"name": "google/apiclient-services",
- "version": "v0.237.0",
+ "version": "v0.239.0",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-api-php-client-services.git",
- "reference": "c10652adc29b4242237075acde318e83f88ab918"
+ "reference": "ce8e34d618bdef9e824fd1728d505a468818712c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/c10652adc29b4242237075acde318e83f88ab918",
- "reference": "c10652adc29b4242237075acde318e83f88ab918",
+ "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/ce8e34d618bdef9e824fd1728d505a468818712c",
+ "reference": "ce8e34d618bdef9e824fd1728d505a468818712c",
"shasum": ""
},
"require": {
@@ -2813,9 +2873,9 @@
],
"support": {
"issues": "https://github.com/googleapis/google-api-php-client-services/issues",
- "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.237.0"
+ "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.239.0"
},
- "time": "2022-02-23T22:58:02+00:00"
+ "time": "2022-03-13T01:20:35+00:00"
},
{
"name": "google/auth",
@@ -3881,16 +3941,16 @@
},
{
"name": "laravel/framework",
- "version": "v8.83.3",
+ "version": "v8.83.4",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "b4ed222a188cca74ca9062296e525d26ae54a0ce"
+ "reference": "97a549f1a83cfb32dab1eecab4c4d40a984a72b5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/b4ed222a188cca74ca9062296e525d26ae54a0ce",
- "reference": "b4ed222a188cca74ca9062296e525d26ae54a0ce",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/97a549f1a83cfb32dab1eecab4c4d40a984a72b5",
+ "reference": "97a549f1a83cfb32dab1eecab4c4d40a984a72b5",
"shasum": ""
},
"require": {
@@ -4050,7 +4110,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2022-03-03T15:14:29+00:00"
+ "time": "2022-03-08T16:12:54+00:00"
},
{
"name": "laravel/serializable-closure",
@@ -5351,16 +5411,16 @@
},
{
"name": "monolog/monolog",
- "version": "2.3.5",
+ "version": "2.4.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "fd4380d6fc37626e2f799f29d91195040137eba9"
+ "reference": "d7fd7450628561ba697b7097d86db72662f54aef"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd4380d6fc37626e2f799f29d91195040137eba9",
- "reference": "fd4380d6fc37626e2f799f29d91195040137eba9",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d7fd7450628561ba697b7097d86db72662f54aef",
+ "reference": "d7fd7450628561ba697b7097d86db72662f54aef",
"shasum": ""
},
"require": {
@@ -5382,7 +5442,7 @@
"phpstan/phpstan": "^0.12.91",
"phpunit/phpunit": "^8.5",
"predis/predis": "^1.1",
- "rollbar/rollbar": "^1.3",
+ "rollbar/rollbar": "^1.3 || ^2 || ^3",
"ruflin/elastica": ">=0.90@dev",
"swiftmailer/swiftmailer": "^5.3|^6.0"
},
@@ -5434,7 +5494,7 @@
],
"support": {
"issues": "https://github.com/Seldaek/monolog/issues",
- "source": "https://github.com/Seldaek/monolog/tree/2.3.5"
+ "source": "https://github.com/Seldaek/monolog/tree/2.4.0"
},
"funding": [
{
@@ -5446,7 +5506,7 @@
"type": "tidelift"
}
],
- "time": "2021-10-01T21:08:31+00:00"
+ "time": "2022-03-14T12:44:37+00:00"
},
{
"name": "mtdowling/jmespath.php",
@@ -7889,16 +7949,16 @@
},
{
"name": "razorpay/razorpay",
- "version": "2.8.1",
+ "version": "v2.8.2",
"source": {
"type": "git",
"url": "https://github.com/razorpay/razorpay-php.git",
- "reference": "4ad7b6a5bd9896305858ec0a861f66020e39f628"
+ "reference": "f36ad5ec74522d2930ffad3b160dddc454e42f4d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/razorpay/razorpay-php/zipball/4ad7b6a5bd9896305858ec0a861f66020e39f628",
- "reference": "4ad7b6a5bd9896305858ec0a861f66020e39f628",
+ "url": "https://api.github.com/repos/razorpay/razorpay-php/zipball/f36ad5ec74522d2930ffad3b160dddc454e42f4d",
+ "reference": "f36ad5ec74522d2930ffad3b160dddc454e42f4d",
"shasum": ""
},
"require": {
@@ -7947,7 +8007,7 @@
"issues": "https://github.com/Razorpay/razorpay-php/issues",
"source": "https://github.com/Razorpay/razorpay-php"
},
- "time": "2021-11-08T11:13:39+00:00"
+ "time": "2022-03-08T13:36:42+00:00"
},
{
"name": "react/promise",
@@ -8379,16 +8439,16 @@
},
{
"name": "sentry/sentry",
- "version": "3.3.7",
+ "version": "3.4.0",
"source": {
"type": "git",
"url": "https://github.com/getsentry/sentry-php.git",
- "reference": "32e5415803ff0349ccb5e5b5e77b016320762786"
+ "reference": "a92443883df6a55cbe7a062f76949f23dda66772"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/32e5415803ff0349ccb5e5b5e77b016320762786",
- "reference": "32e5415803ff0349ccb5e5b5e77b016320762786",
+ "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/a92443883df6a55cbe7a062f76949f23dda66772",
+ "reference": "a92443883df6a55cbe7a062f76949f23dda66772",
"shasum": ""
},
"require": {
@@ -8400,7 +8460,7 @@
"php": "^7.2|^8.0",
"php-http/async-client-implementation": "^1.0",
"php-http/client-common": "^1.5|^2.0",
- "php-http/discovery": "^1.6.1",
+ "php-http/discovery": "^1.11",
"php-http/httplug": "^1.1|^2.0",
"php-http/message": "^1.5",
"psr/http-factory": "^1.0",
@@ -8434,7 +8494,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.3.x-dev"
+ "dev-master": "3.4.x-dev"
}
},
"autoload": {
@@ -8468,7 +8528,7 @@
],
"support": {
"issues": "https://github.com/getsentry/sentry-php/issues",
- "source": "https://github.com/getsentry/sentry-php/tree/3.3.7"
+ "source": "https://github.com/getsentry/sentry-php/tree/3.4.0"
},
"funding": [
{
@@ -8480,7 +8540,7 @@
"type": "custom"
}
],
- "time": "2022-01-19T08:46:27+00:00"
+ "time": "2022-03-13T12:38:01+00:00"
},
{
"name": "sentry/sentry-laravel",
@@ -9235,16 +9295,16 @@
},
{
"name": "symfony/filesystem",
- "version": "v5.4.5",
+ "version": "v5.4.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "797680071ea8f71b94eb958680c50d0e002638f5"
+ "reference": "d53a45039974952af7f7ebc461ccdd4295e29440"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/797680071ea8f71b94eb958680c50d0e002638f5",
- "reference": "797680071ea8f71b94eb958680c50d0e002638f5",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/d53a45039974952af7f7ebc461ccdd4295e29440",
+ "reference": "d53a45039974952af7f7ebc461ccdd4295e29440",
"shasum": ""
},
"require": {
@@ -9279,7 +9339,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/v5.4.5"
+ "source": "https://github.com/symfony/filesystem/tree/v5.4.6"
},
"funding": [
{
@@ -9295,7 +9355,7 @@
"type": "tidelift"
}
],
- "time": "2022-02-27T10:31:47+00:00"
+ "time": "2022-03-02T12:42:23+00:00"
},
{
"name": "symfony/finder",
@@ -9527,16 +9587,16 @@
},
{
"name": "symfony/http-foundation",
- "version": "v5.4.5",
+ "version": "v5.4.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "dd68a3b24262a902bc338fc7c9a2a61b7ab2029f"
+ "reference": "34e89bc147633c0f9dd6caaaf56da3b806a21465"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/dd68a3b24262a902bc338fc7c9a2a61b7ab2029f",
- "reference": "dd68a3b24262a902bc338fc7c9a2a61b7ab2029f",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/34e89bc147633c0f9dd6caaaf56da3b806a21465",
+ "reference": "34e89bc147633c0f9dd6caaaf56da3b806a21465",
"shasum": ""
},
"require": {
@@ -9580,7 +9640,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-foundation/tree/v5.4.5"
+ "source": "https://github.com/symfony/http-foundation/tree/v5.4.6"
},
"funding": [
{
@@ -9596,20 +9656,20 @@
"type": "tidelift"
}
],
- "time": "2022-02-21T15:00:19+00:00"
+ "time": "2022-03-05T21:03:43+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v5.4.5",
+ "version": "v5.4.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "c770c90bc71f1db911e2d996c991fdafe273ac84"
+ "reference": "d41f29ae9af1b5f40c7ebcddf09082953229411d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/c770c90bc71f1db911e2d996c991fdafe273ac84",
- "reference": "c770c90bc71f1db911e2d996c991fdafe273ac84",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d41f29ae9af1b5f40c7ebcddf09082953229411d",
+ "reference": "d41f29ae9af1b5f40c7ebcddf09082953229411d",
"shasum": ""
},
"require": {
@@ -9692,7 +9752,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-kernel/tree/v5.4.5"
+ "source": "https://github.com/symfony/http-kernel/tree/v5.4.6"
},
"funding": [
{
@@ -9708,7 +9768,7 @@
"type": "tidelift"
}
],
- "time": "2022-02-28T07:57:55+00:00"
+ "time": "2022-03-05T21:14:51+00:00"
},
{
"name": "symfony/mime",
@@ -11172,16 +11232,16 @@
},
{
"name": "symfony/translation",
- "version": "v5.4.5",
+ "version": "v5.4.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "7e4d52d39e5d86f3f04bef46fa29a1091786bc73"
+ "reference": "a7ca9fdfffb0174209440c2ffa1dee228e15d95b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/7e4d52d39e5d86f3f04bef46fa29a1091786bc73",
- "reference": "7e4d52d39e5d86f3f04bef46fa29a1091786bc73",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/a7ca9fdfffb0174209440c2ffa1dee228e15d95b",
+ "reference": "a7ca9fdfffb0174209440c2ffa1dee228e15d95b",
"shasum": ""
},
"require": {
@@ -11249,7 +11309,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/translation/tree/v5.4.5"
+ "source": "https://github.com/symfony/translation/tree/v5.4.6"
},
"funding": [
{
@@ -11265,7 +11325,7 @@
"type": "tidelift"
}
],
- "time": "2022-02-09T15:49:12+00:00"
+ "time": "2022-03-02T12:56:28+00:00"
},
{
"name": "symfony/translation-contracts",
@@ -11347,16 +11407,16 @@
},
{
"name": "symfony/var-dumper",
- "version": "v5.4.5",
+ "version": "v5.4.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "6efddb1cf6af5270b21c48c6103e81f920c220f0"
+ "reference": "294e9da6e2e0dd404e983daa5aa74253d92c05d0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6efddb1cf6af5270b21c48c6103e81f920c220f0",
- "reference": "6efddb1cf6af5270b21c48c6103e81f920c220f0",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/294e9da6e2e0dd404e983daa5aa74253d92c05d0",
+ "reference": "294e9da6e2e0dd404e983daa5aa74253d92c05d0",
"shasum": ""
},
"require": {
@@ -11416,7 +11476,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v5.4.5"
+ "source": "https://github.com/symfony/var-dumper/tree/v5.4.6"
},
"funding": [
{
@@ -11432,7 +11492,7 @@
"type": "tidelift"
}
],
- "time": "2022-02-21T15:00:19+00:00"
+ "time": "2022-03-02T12:42:23+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@@ -13817,16 +13877,16 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "9.2.14",
+ "version": "9.2.15",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "9f4d60b6afe5546421462b76cd4e633ebc364ab4"
+ "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f4d60b6afe5546421462b76cd4e633ebc364ab4",
- "reference": "9f4d60b6afe5546421462b76cd4e633ebc364ab4",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
+ "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
"shasum": ""
},
"require": {
@@ -13882,7 +13942,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.14"
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15"
},
"funding": [
{
@@ -13890,7 +13950,7 @@
"type": "github"
}
],
- "time": "2022-02-28T12:38:02+00:00"
+ "time": "2022-03-07T09:28:20+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -14135,16 +14195,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.5.16",
+ "version": "9.5.19",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "5ff8c545a50226c569310a35f4fa89d79f1ddfdc"
+ "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5ff8c545a50226c569310a35f4fa89d79f1ddfdc",
- "reference": "5ff8c545a50226c569310a35f4fa89d79f1ddfdc",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/35ea4b7f3acabb26f4bb640f8c30866c401da807",
+ "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807",
"shasum": ""
},
"require": {
@@ -14174,7 +14234,7 @@
"sebastian/global-state": "^5.0.1",
"sebastian/object-enumerator": "^4.0.3",
"sebastian/resource-operations": "^3.0.3",
- "sebastian/type": "^2.3.4",
+ "sebastian/type": "^3.0",
"sebastian/version": "^3.0.2"
},
"require-dev": {
@@ -14222,7 +14282,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.16"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.19"
},
"funding": [
{
@@ -14234,7 +14294,7 @@
"type": "github"
}
],
- "time": "2022-02-23T17:10:58+00:00"
+ "time": "2022-03-15T09:57:31+00:00"
},
{
"name": "sebastian/cli-parser",
@@ -15093,28 +15153,28 @@
},
{
"name": "sebastian/type",
- "version": "2.3.4",
+ "version": "3.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/type.git",
- "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914"
+ "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914",
- "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914",
+ "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
+ "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
"shasum": ""
},
"require": {
"php": ">=7.3"
},
"require-dev": {
- "phpunit/phpunit": "^9.3"
+ "phpunit/phpunit": "^9.5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.3-dev"
+ "dev-master": "3.0-dev"
}
},
"autoload": {
@@ -15137,7 +15197,7 @@
"homepage": "https://github.com/sebastianbergmann/type",
"support": {
"issues": "https://github.com/sebastianbergmann/type/issues",
- "source": "https://github.com/sebastianbergmann/type/tree/2.3.4"
+ "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
},
"funding": [
{
@@ -15145,7 +15205,7 @@
"type": "github"
}
],
- "time": "2021-06-15T12:49:02+00:00"
+ "time": "2022-03-15T09:54:48+00:00"
},
{
"name": "sebastian/version",
@@ -15202,16 +15262,16 @@
},
{
"name": "swagger-api/swagger-ui",
- "version": "v4.6.1",
+ "version": "v4.6.2",
"source": {
"type": "git",
"url": "https://github.com/swagger-api/swagger-ui.git",
- "reference": "1dd3ef62adfd79c9a71cd046ff2b7c7bbabf2751"
+ "reference": "d191c1ca18443a77273e9912ac2603ce1f7dc216"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/1dd3ef62adfd79c9a71cd046ff2b7c7bbabf2751",
- "reference": "1dd3ef62adfd79c9a71cd046ff2b7c7bbabf2751",
+ "url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/d191c1ca18443a77273e9912ac2603ce1f7dc216",
+ "reference": "d191c1ca18443a77273e9912ac2603ce1f7dc216",
"shasum": ""
},
"type": "library",
@@ -15257,9 +15317,9 @@
],
"support": {
"issues": "https://github.com/swagger-api/swagger-ui/issues",
- "source": "https://github.com/swagger-api/swagger-ui/tree/v4.6.1"
+ "source": "https://github.com/swagger-api/swagger-ui/tree/v4.6.2"
},
- "time": "2022-03-02T21:44:06+00:00"
+ "time": "2022-03-10T11:36:38+00:00"
},
{
"name": "symfony/debug",
@@ -15586,16 +15646,16 @@
},
{
"name": "zircote/swagger-php",
- "version": "4.2.10",
+ "version": "4.2.11",
"source": {
"type": "git",
"url": "https://github.com/zircote/swagger-php.git",
- "reference": "7263e95f5fff5524a697e2a75ceb6f9902453d01"
+ "reference": "1c7a04e381b07e14aae080a61e02f2fe9cdea424"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zircote/swagger-php/zipball/7263e95f5fff5524a697e2a75ceb6f9902453d01",
- "reference": "7263e95f5fff5524a697e2a75ceb6f9902453d01",
+ "url": "https://api.github.com/repos/zircote/swagger-php/zipball/1c7a04e381b07e14aae080a61e02f2fe9cdea424",
+ "reference": "1c7a04e381b07e14aae080a61e02f2fe9cdea424",
"shasum": ""
},
"require": {
@@ -15655,9 +15715,9 @@
],
"support": {
"issues": "https://github.com/zircote/swagger-php/issues",
- "source": "https://github.com/zircote/swagger-php/tree/4.2.10"
+ "source": "https://github.com/zircote/swagger-php/tree/4.2.11"
},
- "time": "2022-03-04T01:21:38+00:00"
+ "time": "2022-03-06T19:16:21+00:00"
}
],
"aliases": [],
@@ -15677,5 +15737,5 @@
"platform-dev": {
"php": "^7.3|^7.4|^8.0"
},
- "plugin-api-version": "2.1.0"
+ "plugin-api-version": "2.0.0"
}
diff --git a/config/ninja.php b/config/ninja.php
index 8ed165ce9c80..c611199a9549 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -14,8 +14,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
- 'app_version' => '5.3.68',
- 'app_tag' => '5.3.68',
+ 'app_version' => '5.3.69',
+ 'app_tag' => '5.3.69',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''),
diff --git a/public/css/app.css b/public/css/app.css
index b02749ec001d..e0409259cabd 100755
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -1,3 +1,3 @@
/*! tailwindcss v2.2.17 | MIT License | https://tailwindcss.com*/
-/*! modern-normalize v1.1.0 | MIT License | https://github.com/sindresorhus/modern-normalize */html{-webkit-text-size-adjust:100%;line-height:1.15;-moz-tab-size:4;-o-tab-size:4;tab-size:4}body{font-family:system-ui,-apple-system,Segoe UI,Roboto,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;margin:0}hr{color:inherit;height:0}abbr[title]{-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Consolas,Liberation Mono,Menlo,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}table{border-color:inherit;text-indent:0}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,select{text-transform:none}[type=button],[type=submit],button{-webkit-appearance:button}legend{padding:0}progress{vertical-align:baseline}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}button{background-color:transparent;background-image:none}fieldset,ol,ul{margin:0;padding:0}ol,ul{list-style:none}html{font-family:Open Sans,ui-sans-serif,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}body{font-family:inherit;line-height:inherit}*,:after,:before{border:0 solid;box-sizing:border-box}hr{border-top-width:1px}img{border-style:solid}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{color:#9fa6b2;opacity:1}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#9fa6b2;opacity:1}input::placeholder,textarea::placeholder{color:#9fa6b2;opacity:1}[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{color:inherit;line-height:inherit;padding:0}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{height:auto;max-width:100%}[hidden]{display:none}*,:after,:before{--tw-border-opacity:1;border-color:rgba(229,231,235,var(--tw-border-opacity))}.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}}@media (min-width:1536px){.container{max-width:1536px}}.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 7 3-3 3 3m0 6-3 3-3-3' stroke='%239fa6b2' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E")}.form-select::-ms-expand{border:none;color:#9fa6b2}@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{-webkit-print-color-adjust:exact;-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;background-position:right .5rem center;background-repeat:no-repeat;background-size:1.5em 1.5em;border-color:#d2d6dc;border-radius:.375rem;color-adjust:exact;font-size:1rem;font-size:[object Object];line-height:1.5;padding:.5rem 2.5rem .5rem .75rem}.form-select:focus{border-color:#a4cafe;box-shadow:0 0 0 3px rgba(164,202,254,.45);outline:none}.form-checkbox:checked{background-color:currentColor;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 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l4-4a1 1 0 0 0-1.414-1.414L7 8.586 5.707 7.293z'/%3E%3C/svg%3E");background-position:50%;background-repeat:no-repeat;background-size:100% 100%;border-color:transparent}@media not print{.form-checkbox::-ms-check{background:inherit;border-color:inherit;border-radius:inherit;color:transparent}}.form-checkbox{-webkit-print-color-adjust:exact;-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;background-origin:border-box;border-color:#d2d6dc;color:#3f83f8;color-adjust:exact;display:inline-block;flex-shrink:0;height:1rem;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:middle;width:1rem}.form-checkbox:focus{border-color:#a4cafe;box-shadow:0 0 0 3px rgba(164,202,254,.45);outline:none}.form-checkbox:checked:focus,.form-radio:checked{border-color:transparent}.form-radio:checked{background-color:currentColor;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-position:50%;background-repeat:no-repeat;background-size:100% 100%}@media not print{.form-radio::-ms-check{background:inherit;border-color:inherit;border-radius:inherit;color:transparent}}.form-radio{-webkit-print-color-adjust:exact;-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;background-origin:border-box;border-color:#d2d6dc;border-radius:100%;color:#3f83f8;color-adjust:exact;display:inline-block;flex-shrink:0;height:1rem;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:middle;width:1rem}.form-radio:focus{border-color:#a4cafe;box-shadow:0 0 0 3px rgba(164,202,254,.45);outline:none}.form-radio:checked:focus{border-color:transparent}.button{border-radius:.25rem;font-size:.875rem;line-height:1.25rem;line-height:1rem;padding:.75rem 1rem;transition-duration:.15s;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1)}button:disabled{cursor:not-allowed;opacity:.5}.button-primary{--tw-text-opacity:1;color:rgba(255,255,255,var(--tw-text-opacity))}.button-primary:hover{font-weight:600}.button-block{display:block;width:100%}.button-danger{--tw-bg-opacity:1;--tw-text-opacity:1;background-color:rgba(240,82,82,var(--tw-bg-opacity));color:rgba(255,255,255,var(--tw-text-opacity))}.button-danger:hover{--tw-bg-opacity:1;background-color:rgba(224,36,36,var(--tw-bg-opacity))}.button-secondary{--tw-bg-opacity:1;background-color:rgba(244,245,247,var(--tw-bg-opacity))}.button-secondary:hover{--tw-bg-opacity:1;background-color:rgba(229,231,235,var(--tw-bg-opacity))}.button-link{--tw-text-opacity:1;color:rgba(55,65,81,var(--tw-text-opacity))}.button-link:hover{--tw-text-opacity:1;color:rgba(22,30,46,var(--tw-text-opacity));text-decoration:underline}.button-link:focus{outline:2px solid transparent;outline-offset:2px;text-decoration:underline}.validation{--tw-bg-opacity:1;background-color:rgba(244,245,247,var(--tw-bg-opacity));border-left-width:2px;margin-bottom:.25rem;margin-top:.5rem;padding:.25rem .75rem}.validation-fail{border-color:rgba(240,82,82,var(--tw-border-opacity))}.validation-fail,.validation-pass{--tw-border-opacity:1;--tw-text-opacity:1;color:rgba(55,65,81,var(--tw-text-opacity));font-size:.875rem;line-height:1.25rem}.validation-pass{border-color:rgba(14,159,110,var(--tw-border-opacity))}.input{--tw-border-opacity:1;align-items:center;border-color:rgba(210,214,220,var(--tw-border-opacity));border-radius:.25rem;border-width:1px;font-size:.875rem;line-height:1.25rem;margin-top:.5rem;padding:.5rem 1rem}.input:focus{--tw-bg-opacity:1;background-color:rgba(249,250,251,var(--tw-bg-opacity));outline:2px solid transparent;outline-offset:2px}.input-label{--tw-text-opacity:1;color:rgba(75,85,99,var(--tw-text-opacity));font-size:.875rem;line-height:1.25rem}.input-slim{padding-bottom:.5rem;padding-top:.5rem}.form-checkbox{border-radius:.25rem;cursor:pointer}.form-checkbox,.form-select{--tw-border-opacity:1;border-color:rgba(210,214,220,var(--tw-border-opacity));border-width:1px}.alert{--tw-border-opacity:1;--tw-bg-opacity:1;background-color:rgba(244,245,247,var(--tw-bg-opacity));border-color:rgba(159,166,178,var(--tw-border-opacity));border-left-width:2px;font-size:.875rem;line-height:1.25rem;margin-bottom:.25rem;margin-top:1rem;padding:.75rem 1rem}.alert-success{--tw-border-opacity:1;border-color:rgba(14,159,110,var(--tw-border-opacity))}.alert-failure{--tw-border-opacity:1;border-color:rgba(240,82,82,var(--tw-border-opacity))}.badge{align-items:center;border-radius:9999px;display:inline-flex;font-size:.75rem;font-weight:500;line-height:1rem;padding:.125rem .625rem}.badge-light{background-color:rgba(244,245,247,var(--tw-bg-opacity));color:rgba(37,47,63,var(--tw-text-opacity))}.badge-light,.badge-primary{--tw-bg-opacity:1;--tw-text-opacity:1}.badge-primary{background-color:rgba(195,221,253,var(--tw-bg-opacity));color:rgba(63,131,248,var(--tw-text-opacity))}.badge-danger{background-color:rgba(253,232,232,var(--tw-bg-opacity));color:rgba(240,82,82,var(--tw-text-opacity))}.badge-danger,.badge-success{--tw-bg-opacity:1;--tw-text-opacity:1}.badge-success{background-color:rgba(222,247,236,var(--tw-bg-opacity));color:rgba(14,159,110,var(--tw-text-opacity))}.badge-secondary{background-color:rgba(37,47,63,var(--tw-bg-opacity));color:rgba(229,231,235,var(--tw-text-opacity))}.badge-secondary,.badge-warning{--tw-bg-opacity:1;--tw-text-opacity:1}.badge-warning{background-color:rgba(254,236,220,var(--tw-bg-opacity));color:rgba(255,90,31,var(--tw-text-opacity))}.badge-info{--tw-bg-opacity:1;--tw-text-opacity:1;background-color:rgba(225,239,254,var(--tw-bg-opacity));color:rgba(63,131,248,var(--tw-text-opacity))}@media (min-width:640px){.dataTables_length{margin-bottom:1.25rem!important;margin-top:1.25rem!important}}@media (min-width:1024px){.dataTables_length{margin-bottom:1rem!important;margin-top:1rem!important}}.dataTables_length select{--tw-border-opacity:1;align-items:center;border-color:rgba(210,214,220,var(--tw-border-opacity));border-radius:.25rem;border-width:1px;font-size:.875rem;line-height:1.25rem;margin-top:.5rem;padding:.5rem 1rem}.dataTables_length select:focus{--tw-bg-opacity:1!important;background-color:rgba(249,250,251,var(--tw-bg-opacity))!important;outline:2px solid transparent!important;outline-offset:2px!important}.dataTables_length select{--tw-bg-opacity:1!important;background-color:rgba(255,255,255,var(--tw-bg-opacity))!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-color:#d2d6dc!important;border-radius:.375rem!important;font-size:1rem!important;font-size:[object Object]!important;line-height:1.5!important;padding:.5rem .75rem!important}.dataTables_filter input::-moz-placeholder{color:#9fa6b2!important;opacity:1!important}.dataTables_filter input:-ms-input-placeholder{color:#9fa6b2!important;opacity:1!important}.dataTables_filter input::placeholder{color:#9fa6b2!important;opacity:1!important}.dataTables_filter input:focus{border-color:#a4cafe!important;box-shadow:0 0 0 3px rgba(164,202,254,.45)!important;outline:none!important}.dataTables_filter input{--tw-border-opacity:1!important;align-items:center!important;border-color:rgba(210,214,220,var(--tw-border-opacity))!important;border-radius:.25rem!important;border-width:1px!important;font-size:.875rem!important;line-height:1.25rem!important;margin-top:.5rem!important;padding:.5rem 1rem!important}.dataTables_filter input:focus{--tw-bg-opacity:1!important;background-color:rgba(249,250,251,var(--tw-bg-opacity))!important;outline:2px solid transparent!important;outline-offset:2px!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{--tw-border-opacity:1!important;--tw-bg-opacity:1!important;--tw-text-opacity:1!important;background-color:rgba(255,255,255,var(--tw-bg-opacity))!important;border-color:rgba(210,214,220,var(--tw-border-opacity))!important;border-radius:.25rem;border-radius:.25rem!important;border-width:1px!important;color:rgba(55,65,81,var(--tw-text-opacity))!important;cursor:pointer!important;font-size:.875rem;font-size:.875rem!important;font-weight:500!important;line-height:1.25rem;line-height:1rem;line-height:1.25rem!important;line-height:1rem!important;margin-right:.25rem!important;padding:.75rem 1rem;padding-bottom:.5rem!important;padding-top:.5rem!important;transition-duration:.15s;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1)}.dataTables_paginate .current{--tw-bg-opacity:1!important;--tw-text-opacity:1!important;background-color:rgba(28,100,242,var(--tw-bg-opacity))!important;color:rgba(255,255,255,var(--tw-text-opacity))!important}.dataTables_info{font-size:.875rem!important;line-height:1.25rem!important}.dataTables_empty{padding-bottom:1rem!important;padding-top:1rem!important}.pagination{align-items:center!important;display:flex!important}.pagination .page-link{--tw-text-opacity:1!important;align-items:center!important;border-color:transparent!important;border-top-width:2px!important;color:rgba(107,114,128,var(--tw-text-opacity))!important;cursor:pointer!important;display:inline-flex!important;font-size:.875rem!important;font-weight:500!important;line-height:1.25rem!important;margin-top:-1px!important;padding-left:1rem!important;padding-right:1rem!important;padding-top:1rem!important;transition-duration:.15s!important;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter!important;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter!important;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter!important;transition-timing-function:cubic-bezier(.4,0,.2,1)!important}.pagination .page-link:hover{--tw-border-opacity:1!important;--tw-text-opacity:1!important;border-color:rgba(210,214,220,var(--tw-border-opacity))!important;color:rgba(55,65,81,var(--tw-text-opacity))!important}.pagination .page-link:focus{--tw-border-opacity:1;--tw-text-opacity:1;border-color:rgba(159,166,178,var(--tw-border-opacity));color:rgba(55,65,81,var(--tw-text-opacity));outline:2px solid transparent;outline-offset:2px}.pagination .active>span{--tw-border-opacity:1!important;--tw-text-opacity:1!important;border-color:rgba(28,100,242,var(--tw-border-opacity))!important;color:rgba(28,100,242,var(--tw-text-opacity))!important}.sr-only{clip:rect(0,0,0,0);border-width:0;height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;white-space:nowrap;width:1px}.pointer-events-none{pointer-events:none}.pointer-events-auto{pointer-events:auto}.fixed{position:fixed}.absolute{position:absolute}.relative{position:relative}.inset-0{bottom:0;top:0}.inset-0,.inset-x-0{left:0;right:0}.inset-y-0{bottom:0;top:0}.top-0{top:0}.top-1{top:.25rem}.right-0{right:0}.bottom-0{bottom:0}.left-0{left:0}.left-1{left:.25rem}.z-0{z-index:0}.z-10{z-index:10}.z-30{z-index:30}.z-40{z-index:40}.col-span-1{grid-column:span 1/span 1}.col-span-2{grid-column:span 2/span 2}.col-span-3{grid-column:span 3/span 3}.col-span-4{grid-column:span 4/span 4}.col-span-6{grid-column:span 6/span 6}.col-span-8{grid-column:span 8/span 8}.col-span-12{grid-column:span 12/span 12}.float-right{float:right}.m-0{margin:0}.m-auto{margin:auto}.mx-2{margin-left:.5rem;margin-right:.5rem}.mx-4{margin-left:1rem;margin-right:1rem}.mx-6{margin-left:1.5rem;margin-right:1.5rem}.mx-20{margin-left:5rem;margin-right:5rem}.mx-auto{margin-left:auto;margin-right:auto}.my-3{margin-bottom:.75rem;margin-top:.75rem}.my-4{margin-bottom:1rem;margin-top:1rem}.my-10{margin-bottom:2.5rem;margin-top:2.5rem}.-my-2{margin-bottom:-.5rem;margin-top:-.5rem}.mt-0{margin-top:0}.mt-1{margin-top:.25rem}.mt-2{margin-top:.5rem}.mt-3{margin-top:.75rem}.mt-4{margin-top:1rem}.mt-5{margin-top:1.25rem}.mt-6{margin-top:1.5rem}.mt-8{margin-top:2rem}.mt-10{margin-top:2.5rem}.-mt-4{margin-top:-1rem}.-mt-6{margin-top:-1.5rem}.mr-1{margin-right:.25rem}.mr-2{margin-right:.5rem}.mr-3{margin-right:.75rem}.mr-4{margin-right:1rem}.-mr-1{margin-right:-.25rem}.-mr-14{margin-right:-3.5rem}.mb-0{margin-bottom:0}.mb-2{margin-bottom:.5rem}.mb-3{margin-bottom:.75rem}.mb-4{margin-bottom:1rem}.mb-6{margin-bottom:1.5rem}.mb-10{margin-bottom:2.5rem}.mb-12{margin-bottom:3rem}.ml-0{margin-left:0}.ml-1{margin-left:.25rem}.ml-2{margin-left:.5rem}.ml-3{margin-left:.75rem}.ml-4{margin-left:1rem}.-ml-1{margin-left:-.25rem}.-ml-4{margin-left:-1rem}.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}.h-0{height:0}.h-5{height:1.25rem}.h-6{height:1.5rem}.h-8{height:2rem}.h-10{height:2.5rem}.h-12{height:3rem}.h-14{height:3.5rem}.h-16{height:4rem}.h-32{height:8rem}.h-64{height:16rem}.h-auto{height:auto}.h-full{height:100%}.h-screen{height:100vh}.min-h-screen{min-height:100vh}.w-0{width:0}.w-4{width:1rem}.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-4\/5{width:80%}.w-5\/6{width:83.333333%}.w-full{width:100%}.w-screen{width:100vw}.min-w-full{min-width:100%}.max-w-xs{max-width:20rem}.max-w-xl{max-width:36rem}.max-w-2xl{max-width:42rem}.max-w-4xl{max-width:56rem}.max-w-7xl{max-width:80rem}.flex-1{flex:1 1 0%}.flex-shrink-0{flex-shrink:0}.table-auto{table-layout:auto}.border-collapse{border-collapse:collapse}.origin-top-right{transform-origin:top right}.transform{--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;transform:translateX(var(--tw-translate-x)) translateY(var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.translate-x-0{--tw-translate-x:0}.-translate-x-full{--tw-translate-x:-100%}.translate-y-0{--tw-translate-y:0}.translate-y-4{--tw-translate-y:1rem}.scale-95{--tw-scale-x:.95;--tw-scale-y:.95}.scale-100{--tw-scale-x:1;--tw-scale-y:1}@-webkit-keyframes spin{to{transform:rotate(1turn)}}@keyframes spin{to{transform:rotate(1turn)}}@-webkit-keyframes ping{75%,to{opacity:0;transform:scale(2)}}@keyframes ping{75%,to{opacity:0;transform:scale(2)}}@-webkit-keyframes pulse{50%{opacity:.5}}@keyframes pulse{50%{opacity:.5}}@-webkit-keyframes bounce{0%,to{-webkit-animation-timing-function:cubic-bezier(.8,0,1,1);animation-timing-function:cubic-bezier(.8,0,1,1);transform:translateY(-25%)}50%{-webkit-animation-timing-function:cubic-bezier(0,0,.2,1);animation-timing-function:cubic-bezier(0,0,.2,1);transform:none}}@keyframes bounce{0%,to{-webkit-animation-timing-function:cubic-bezier(.8,0,1,1);animation-timing-function:cubic-bezier(.8,0,1,1);transform:translateY(-25%)}50%{-webkit-animation-timing-function:cubic-bezier(0,0,.2,1);animation-timing-function:cubic-bezier(0,0,.2,1);transform:none}}.animate-spin{-webkit-animation:spin 1s linear infinite;animation:spin 1s linear infinite}.cursor-pointer{cursor:pointer}.appearance-none{-webkit-appearance:none;-moz-appearance:none;appearance:none}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.grid-cols-6{grid-template-columns:repeat(6,minmax(0,1fr))}.grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.flex-row{flex-direction:row}.flex-col{flex-direction:column}.flex-wrap{flex-wrap:wrap}.content-center{align-content:center}.items-start{align-items:flex-start}.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}.gap-4{gap:1rem}.gap-5{gap:1.25rem}.gap-6{gap:1.5rem}.gap-8{gap:2rem}.gap-x-2{-moz-column-gap:.5rem;column-gap:.5rem}.space-x-1>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(.25rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(.25rem*var(--tw-space-x-reverse))}.space-x-2>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(.5rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(.5rem*var(--tw-space-x-reverse))}.overflow-auto{overflow:auto}.overflow-hidden{overflow:hidden}.overflow-x-auto{overflow-x:auto}.overflow-y-auto{overflow-y:auto}.overflow-y-scroll{overflow-y:scroll}.truncate{overflow:hidden;text-overflow:ellipsis}.truncate,.whitespace-nowrap{white-space:nowrap}.break-words{overflow-wrap:break-word}.break-all{word-break:break-all}.rounded-sm{border-radius:.125rem}.rounded{border-radius:.25rem}.rounded-md{border-radius:.375rem}.rounded-lg{border-radius:.5rem}.rounded-full{border-radius:9999px}.rounded-t-lg{border-top-left-radius:.5rem;border-top-right-radius:.5rem}.rounded-b-lg{border-bottom-left-radius:.5rem;border-bottom-right-radius:.5rem}.border-0{border-width:0}.border-4{border-width:4px}.border{border-width:1px}.border-t{border-top-width:1px}.border-r{border-right-width:1px}.border-b-4{border-bottom-width:4px}.border-b{border-bottom-width:1px}.border-l-2{border-left-width:2px}.border-solid{border-style:solid}.border-dashed{border-style:dashed}.border-none{border-style:none}.border-transparent{border-color:transparent}.border-gray-100{--tw-border-opacity:1;border-color:rgba(244,245,247,var(--tw-border-opacity))}.border-gray-200{--tw-border-opacity:1;border-color:rgba(229,231,235,var(--tw-border-opacity))}.border-gray-300{--tw-border-opacity:1;border-color:rgba(210,214,220,var(--tw-border-opacity))}.border-gray-600{--tw-border-opacity:1;border-color:rgba(75,85,99,var(--tw-border-opacity))}.border-red-300{--tw-border-opacity:1;border-color:rgba(248,180,180,var(--tw-border-opacity))}.border-red-400{--tw-border-opacity:1;border-color:rgba(249,128,128,var(--tw-border-opacity))}.border-green-500{--tw-border-opacity:1;border-color:rgba(14,159,110,var(--tw-border-opacity))}.border-blue-500{--tw-border-opacity:1;border-color:rgba(63,131,248,var(--tw-border-opacity))}.border-blue-700{--tw-border-opacity:1;border-color:rgba(26,86,219,var(--tw-border-opacity))}.group:hover .group-hover\:border-transparent,.hover\:border-transparent:hover{border-color:transparent}.hover\:border-gray-600:hover{--tw-border-opacity:1;border-color:rgba(75,85,99,var(--tw-border-opacity))}.hover\:border-gray-800:hover{--tw-border-opacity:1;border-color:rgba(37,47,63,var(--tw-border-opacity))}.hover\:border-blue-500:hover{--tw-border-opacity:1;border-color:rgba(63,131,248,var(--tw-border-opacity))}.hover\:border-blue-600:hover{--tw-border-opacity:1;border-color:rgba(28,100,242,var(--tw-border-opacity))}.focus\:border-blue-300:focus{--tw-border-opacity:1;border-color:rgba(164,202,254,var(--tw-border-opacity))}.focus\:border-blue-600:focus{--tw-border-opacity:1;border-color:rgba(28,100,242,var(--tw-border-opacity))}.focus\:border-indigo-500:focus{--tw-border-opacity:1;border-color:rgba(104,117,245,var(--tw-border-opacity))}.bg-transparent{background-color:transparent}.bg-white{--tw-bg-opacity:1;background-color:rgba(255,255,255,var(--tw-bg-opacity))}.bg-gray-50{--tw-bg-opacity:1;background-color:rgba(249,250,251,var(--tw-bg-opacity))}.bg-gray-100{--tw-bg-opacity:1;background-color:rgba(244,245,247,var(--tw-bg-opacity))}.bg-gray-200{--tw-bg-opacity:1;background-color:rgba(229,231,235,var(--tw-bg-opacity))}.bg-gray-500{--tw-bg-opacity:1;background-color:rgba(107,114,128,var(--tw-bg-opacity))}.bg-gray-600{--tw-bg-opacity:1;background-color:rgba(75,85,99,var(--tw-bg-opacity))}.bg-red-100{--tw-bg-opacity:1;background-color:rgba(253,232,232,var(--tw-bg-opacity))}.bg-blue-50{--tw-bg-opacity:1;background-color:rgba(235,245,255,var(--tw-bg-opacity))}.bg-blue-500{--tw-bg-opacity:1;background-color:rgba(63,131,248,var(--tw-bg-opacity))}.bg-blue-600{--tw-bg-opacity:1;background-color:rgba(28,100,242,var(--tw-bg-opacity))}.bg-blue-700{--tw-bg-opacity:1;background-color:rgba(26,86,219,var(--tw-bg-opacity))}.bg-indigo-600{--tw-bg-opacity:1;background-color:rgba(88,80,236,var(--tw-bg-opacity))}.hover\:bg-gray-100:hover{--tw-bg-opacity:1;background-color:rgba(244,245,247,var(--tw-bg-opacity))}.hover\:bg-blue-400:hover{--tw-bg-opacity:1;background-color:rgba(118,169,250,var(--tw-bg-opacity))}.hover\:bg-blue-500:hover{--tw-bg-opacity:1;background-color:rgba(63,131,248,var(--tw-bg-opacity))}.hover\:bg-indigo-700:hover{--tw-bg-opacity:1;background-color:rgba(81,69,205,var(--tw-bg-opacity))}.focus\:bg-white:focus{--tw-bg-opacity:1;background-color:rgba(255,255,255,var(--tw-bg-opacity))}.focus\:bg-gray-100:focus{--tw-bg-opacity:1;background-color:rgba(244,245,247,var(--tw-bg-opacity))}.focus\:bg-gray-600:focus{--tw-bg-opacity:1;background-color:rgba(75,85,99,var(--tw-bg-opacity))}.active\:bg-gray-50:active{--tw-bg-opacity:1;background-color:rgba(249,250,251,var(--tw-bg-opacity))}.bg-clip-padding{background-clip:padding-box}.fill-current{fill:currentColor}.object-cover{-o-object-fit:cover;object-fit:cover}.p-1{padding:.25rem}.p-3{padding:.75rem}.p-4{padding:1rem}.p-8{padding:2rem}.p-10{padding:2.5rem}.px-0{padding-left:0;padding-right:0}.px-2{padding-left:.5rem;padding-right:.5rem}.px-3{padding-left:.75rem;padding-right:.75rem}.px-4{padding-left:1rem;padding-right:1rem}.px-5{padding-left:1.25rem;padding-right:1.25rem}.px-6{padding-left:1.5rem;padding-right:1.5rem}.px-12{padding-left:3rem;padding-right:3rem}.px-2\.5{padding-left:.625rem;padding-right:.625rem}.py-0{padding-bottom:0;padding-top:0}.py-1{padding-bottom:.25rem;padding-top:.25rem}.py-2{padding-bottom:.5rem;padding-top:.5rem}.py-3{padding-bottom:.75rem;padding-top:.75rem}.py-4{padding-bottom:1rem;padding-top:1rem}.py-5{padding-bottom:1.25rem;padding-top:1.25rem}.py-6{padding-bottom:1.5rem;padding-top:1.5rem}.py-8{padding-bottom:2rem;padding-top:2rem}.py-10{padding-bottom:2.5rem;padding-top:2.5rem}.py-12{padding-bottom:3rem;padding-top:3rem}.py-0\.5{padding-bottom:.125rem;padding-top:.125rem}.pt-0{padding-top:0}.pt-2{padding-top:.5rem}.pt-4{padding-top:1rem}.pt-5{padding-top:1.25rem}.pt-6{padding-top:1.5rem}.pr-2{padding-right:.5rem}.pr-4{padding-right:1rem}.pr-10{padding-right:2.5rem}.pb-4{padding-bottom:1rem}.pb-10{padding-bottom:2.5rem}.pb-20{padding-bottom:5rem}.pl-0{padding-left:0}.pl-3{padding-left:.75rem}.text-left{text-align:left}.text-center{text-align:center}.text-right{text-align:right}.align-middle{vertical-align:middle}.align-bottom{vertical-align:bottom}.text-xs{font-size:.75rem;line-height:1rem}.text-sm{font-size:.875rem;line-height:1.25rem}.text-base{font-size:1rem;line-height:1.5rem}.text-lg{font-size:1.125rem}.text-lg,.text-xl{line-height:1.75rem}.text-xl{font-size:1.25rem}.text-2xl{font-size:1.5rem;line-height:2rem}.text-3xl{font-size:1.875rem;line-height:2.25rem}.text-5xl{font-size:3rem;line-height:1}.font-normal{font-weight:400}.font-medium{font-weight:500}.font-semibold{font-weight:600}.font-bold{font-weight:700}.font-extrabold{font-weight:800}.uppercase{text-transform:uppercase}.capitalize{text-transform:capitalize}.leading-4{line-height:1rem}.leading-5{line-height:1.25rem}.leading-6{line-height:1.5rem}.leading-9{line-height:2.25rem}.leading-tight{line-height:1.25}.tracking-tight{letter-spacing:-.025em}.tracking-wide{letter-spacing:.025em}.tracking-wider{letter-spacing:.05em}.text-white{--tw-text-opacity:1;color:rgba(255,255,255,var(--tw-text-opacity))}.text-black{--tw-text-opacity:1;color:rgba(0,0,0,var(--tw-text-opacity))}.text-gray-300{--tw-text-opacity:1;color:rgba(210,214,220,var(--tw-text-opacity))}.text-gray-400{--tw-text-opacity:1;color:rgba(159,166,178,var(--tw-text-opacity))}.text-gray-500{--tw-text-opacity:1;color:rgba(107,114,128,var(--tw-text-opacity))}.text-gray-600{--tw-text-opacity:1;color:rgba(75,85,99,var(--tw-text-opacity))}.text-gray-700{--tw-text-opacity:1;color:rgba(55,65,81,var(--tw-text-opacity))}.text-gray-800{--tw-text-opacity:1;color:rgba(37,47,63,var(--tw-text-opacity))}.text-gray-900{--tw-text-opacity:1;color:rgba(22,30,46,var(--tw-text-opacity))}.text-red-400{--tw-text-opacity:1;color:rgba(249,128,128,var(--tw-text-opacity))}.text-red-500{--tw-text-opacity:1;color:rgba(240,82,82,var(--tw-text-opacity))}.text-red-600{--tw-text-opacity:1;color:rgba(224,36,36,var(--tw-text-opacity))}.text-green-600{--tw-text-opacity:1;color:rgba(5,122,85,var(--tw-text-opacity))}.text-blue-500{--tw-text-opacity:1;color:rgba(63,131,248,var(--tw-text-opacity))}.text-blue-600{--tw-text-opacity:1;color:rgba(28,100,242,var(--tw-text-opacity))}.text-blue-700{--tw-text-opacity:1;color:rgba(26,86,219,var(--tw-text-opacity))}.text-indigo-600{--tw-text-opacity:1;color:rgba(88,80,236,var(--tw-text-opacity))}.group:hover .group-hover\:text-white,.hover\:text-white:hover{--tw-text-opacity:1;color:rgba(255,255,255,var(--tw-text-opacity))}.hover\:text-gray-300:hover{--tw-text-opacity:1;color:rgba(210,214,220,var(--tw-text-opacity))}.hover\:text-gray-500:hover{--tw-text-opacity:1;color:rgba(107,114,128,var(--tw-text-opacity))}.hover\:text-gray-600:hover{--tw-text-opacity:1;color:rgba(75,85,99,var(--tw-text-opacity))}.hover\:text-gray-700:hover{--tw-text-opacity:1;color:rgba(55,65,81,var(--tw-text-opacity))}.hover\:text-gray-800:hover{--tw-text-opacity:1;color:rgba(37,47,63,var(--tw-text-opacity))}.hover\:text-gray-900:hover{--tw-text-opacity:1;color:rgba(22,30,46,var(--tw-text-opacity))}.hover\:text-blue-600:hover{--tw-text-opacity:1;color:rgba(28,100,242,var(--tw-text-opacity))}.hover\:text-indigo-900:hover{--tw-text-opacity:1;color:rgba(54,47,120,var(--tw-text-opacity))}.focus\:text-gray-500:focus{--tw-text-opacity:1;color:rgba(107,114,128,var(--tw-text-opacity))}.focus\:text-gray-600:focus{--tw-text-opacity:1;color:rgba(75,85,99,var(--tw-text-opacity))}.focus\:text-gray-700:focus{--tw-text-opacity:1;color:rgba(55,65,81,var(--tw-text-opacity))}.focus\:text-gray-900:focus{--tw-text-opacity:1;color:rgba(22,30,46,var(--tw-text-opacity))}.active\:text-gray-800:active{--tw-text-opacity:1;color:rgba(37,47,63,var(--tw-text-opacity))}.underline{text-decoration:underline}.line-through{text-decoration:line-through}.focus\:underline:focus,.hover\:underline:hover{text-decoration:underline}.antialiased{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.opacity-0{opacity:0}.opacity-25{opacity:.25}.opacity-75{opacity:.75}.opacity-100{opacity:1}*,:after,:before{--tw-shadow:0 0 #0000}.shadow-sm{--tw-shadow:0 1px 2px 0 rgba(0,0,0,0.05)}.shadow,.shadow-sm{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow{--tw-shadow:0 1px 3px 0 rgba(0,0,0,0.1),0 1px 2px 0 rgba(0,0,0,0.06)}.shadow-lg{--tw-shadow:0 10px 15px -3px rgba(0,0,0,0.1),0 4px 6px -2px rgba(0,0,0,0.05)}.shadow-lg,.shadow-xl{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-xl{--tw-shadow:0 20px 25px -5px rgba(0,0,0,0.1),0 10px 10px -5px rgba(0,0,0,0.04)}.hover\:shadow-lg:hover{--tw-shadow:0 10px 15px -3px rgba(0,0,0,0.1),0 4px 6px -2px rgba(0,0,0,0.05)}.hover\:shadow-2xl:hover,.hover\:shadow-lg:hover{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.hover\:shadow-2xl:hover{--tw-shadow:0 25px 50px -12px rgba(0,0,0,0.25)}.focus\:outline-none:focus{outline:2px solid transparent;outline-offset:2px}*,:after,:before{--tw-ring-inset:var(--tw-empty,/*!*/ /*!*/);--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(63,131,248,0.5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000}.ring-1{--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color)}.focus\:ring:focus,.ring-1{box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow,0 0 #0000)}.focus\:ring:focus{--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(3px + var(--tw-ring-offset-width)) var(--tw-ring-color)}.ring-black{--tw-ring-opacity:1;--tw-ring-color:rgba(0,0,0,var(--tw-ring-opacity))}.focus\:ring-indigo-500:focus{--tw-ring-opacity:1;--tw-ring-color:rgba(104,117,245,var(--tw-ring-opacity))}.ring-opacity-5{--tw-ring-opacity:0.05}.filter{--tw-blur:var(--tw-empty,/*!*/ /*!*/);--tw-brightness:var(--tw-empty,/*!*/ /*!*/);--tw-contrast:var(--tw-empty,/*!*/ /*!*/);--tw-grayscale:var(--tw-empty,/*!*/ /*!*/);--tw-hue-rotate:var(--tw-empty,/*!*/ /*!*/);--tw-invert:var(--tw-empty,/*!*/ /*!*/);--tw-saturate:var(--tw-empty,/*!*/ /*!*/);--tw-sepia:var(--tw-empty,/*!*/ /*!*/);--tw-drop-shadow:var(--tw-empty,/*!*/ /*!*/);filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.invert{--tw-invert:invert(100%)}.transition-all{transition-duration:.15s;transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition{transition-duration:.15s;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-opacity{transition-duration:.15s;transition-property:opacity;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}.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)}@media (min-width:640px){.sm\:inset-0{bottom:0;left:0;right:0;top:0}.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\:mx-0{margin-left:0;margin-right:0}.sm\:-mx-6{margin-left:-1.5rem;margin-right:-1.5rem}.sm\:my-8{margin-bottom:2rem;margin-top:2rem}.sm\:mt-0{margin-top:0}.sm\:mt-4{margin-top:1rem}.sm\:mt-6{margin-top:1.5rem}.sm\:ml-3{margin-left:.75rem}.sm\:ml-4{margin-left:1rem}.sm\:ml-6{margin-left:1.5rem}.sm\:block{display:block}.sm\:inline-block{display:inline-block}.sm\:flex{display:flex}.sm\:grid{display:grid}.sm\:hidden{display:none}.sm\:h-10{height:2.5rem}.sm\:h-screen{height:100vh}.sm\:w-10{width:2.5rem}.sm\:w-auto{width:auto}.sm\:w-full{width:100%}.sm\:max-w-sm{max-width:24rem}.sm\:max-w-lg{max-width:32rem}.sm\:flex-shrink-0{flex-shrink:0}.sm\:translate-y-0{--tw-translate-y:0}.sm\:scale-95{--tw-scale-x:.95;--tw-scale-y:.95}.sm\:scale-100{--tw-scale-x:1;--tw-scale-y:1}.sm\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.sm\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.sm\:flex-row-reverse{flex-direction:row-reverse}.sm\:flex-nowrap{flex-wrap:nowrap}.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\:gap-4{gap:1rem}.sm\:rounded-lg{border-radius:.5rem}.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\:text-left{text-align:left}.sm\:align-middle{vertical-align:middle}.sm\:text-sm{font-size:.875rem;line-height:1.25rem}.sm\:text-4xl{font-size:2.25rem;line-height:2.5rem}}@media (min-width:768px){.md\:col-span-1{grid-column:span 1/span 1}.md\:col-span-2{grid-column:span 2/span 2}.md\:col-span-4{grid-column:span 4/span 4}.md\:col-span-5{grid-column:span 5/span 5}.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}.md\:mx-0{margin-left:0;margin-right:0}.md\:mt-0{margin-top:0}.md\:mt-5{margin-top:1.25rem}.md\:mt-10{margin-top:2.5rem}.md\:mr-2{margin-right:.5rem}.md\:-mr-1{margin-right:-.25rem}.md\:ml-2{margin-left:.5rem}.md\:ml-6{margin-left:1.5rem}.md\:block{display:block}.md\:flex{display:flex}.md\:grid{display:grid}.md\:hidden{display:none}.md\:w-1\/2{width:50%}.md\:w-1\/3{width:33.333333%}.md\:max-w-3xl{max-width:48rem}.md\:flex-shrink-0{flex-shrink:0}.md\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.md\:grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.md\:flex-row{flex-direction:row}.md\:items-center{align-items:center}.md\:justify-between{justify-content:space-between}.md\:gap-6{gap:1.5rem}.md\:p-24{padding:6rem}.md\:px-8{padding-left:2rem;padding-right:2rem}.md\:text-sm{font-size:.875rem;line-height:1.25rem}.md\:text-2xl{font-size:1.5rem;line-height:2rem}}@media (min-width:1024px){.lg\:col-span-3{grid-column:span 3/span 3}.lg\:col-span-6{grid-column:span 6/span 6}.lg\:col-span-7{grid-column:span 7/span 7}.lg\:col-span-8{grid-column:span 8/span 8}.lg\:col-start-3{grid-column-start:3}.lg\:col-start-4{grid-column-start:4}.lg\:-mx-8{margin-left:-2rem;margin-right:-2rem}.lg\:mt-0{margin-top:0}.lg\:mt-24{margin-top:6rem}.lg\:block{display:block}.lg\:flex{display:flex}.lg\:grid{display:grid}.lg\:h-screen{height:100vh}.lg\:w-1\/2{width:50%}.lg\:w-1\/4{width:25%}.lg\:w-1\/5{width:20%}.lg\:flex-shrink-0{flex-shrink:0}.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\:items-center{align-items:center}.lg\:justify-between{justify-content:space-between}.lg\:gap-4{gap:1rem}.lg\:rounded-lg{border-radius:.5rem}.lg\:px-4{padding-left:1rem;padding-right:1rem}.lg\:px-8{padding-left:2rem;padding-right:2rem}.lg\:px-16{padding-left:4rem;padding-right:4rem}.lg\:py-16{padding-bottom:4rem;padding-top:4rem}}@media (min-width:1280px){.xl\:col-span-4{grid-column:span 4/span 4}.xl\:col-span-6{grid-column:span 6/span 6}.xl\:col-span-8{grid-column:span 8/span 8}.xl\:col-span-9{grid-column:span 9/span 9}.xl\:col-start-4{grid-column-start:4}.xl\:mt-32{margin-top:8rem}.xl\:flex{display:flex}.xl\:justify-center{justify-content:center}.xl\:px-16{padding-left:4rem;padding-right:4rem}}
+/*! modern-normalize v1.1.0 | MIT License | https://github.com/sindresorhus/modern-normalize */html{-webkit-text-size-adjust:100%;line-height:1.15;-moz-tab-size:4;-o-tab-size:4;tab-size:4}body{font-family:system-ui,-apple-system,Segoe UI,Roboto,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;margin:0}hr{color:inherit;height:0}abbr[title]{-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Consolas,Liberation Mono,Menlo,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}table{border-color:inherit;text-indent:0}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,select{text-transform:none}[type=button],[type=submit],button{-webkit-appearance:button}legend{padding:0}progress{vertical-align:baseline}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}button{background-color:transparent;background-image:none}fieldset,ol,ul{margin:0;padding:0}ol,ul{list-style:none}html{font-family:Open Sans,ui-sans-serif,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}body{font-family:inherit;line-height:inherit}*,:after,:before{border:0 solid;box-sizing:border-box}hr{border-top-width:1px}img{border-style:solid}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{color:#9fa6b2;opacity:1}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#9fa6b2;opacity:1}input::placeholder,textarea::placeholder{color:#9fa6b2;opacity:1}[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{color:inherit;line-height:inherit;padding:0}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{height:auto;max-width:100%}[hidden]{display:none}*,:after,:before{--tw-border-opacity:1;border-color:rgba(229,231,235,var(--tw-border-opacity))}.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}}@media (min-width:1536px){.container{max-width:1536px}}.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 7 3-3 3 3m0 6-3 3-3-3' stroke='%239fa6b2' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E")}.form-select::-ms-expand{border:none;color:#9fa6b2}@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{-webkit-print-color-adjust:exact;-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;background-position:right .5rem center;background-repeat:no-repeat;background-size:1.5em 1.5em;border-color:#d2d6dc;border-radius:.375rem;color-adjust:exact;font-size:1rem;font-size:[object Object];line-height:1.5;padding:.5rem 2.5rem .5rem .75rem}.form-select:focus{border-color:#a4cafe;box-shadow:0 0 0 3px rgba(164,202,254,.45);outline:none}.form-checkbox:checked{background-color:currentColor;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 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l4-4a1 1 0 0 0-1.414-1.414L7 8.586 5.707 7.293z'/%3E%3C/svg%3E");background-position:50%;background-repeat:no-repeat;background-size:100% 100%;border-color:transparent}@media not print{.form-checkbox::-ms-check{background:inherit;border-color:inherit;border-radius:inherit;color:transparent}}.form-checkbox{-webkit-print-color-adjust:exact;-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;background-origin:border-box;border-color:#d2d6dc;color:#3f83f8;color-adjust:exact;display:inline-block;flex-shrink:0;height:1rem;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:middle;width:1rem}.form-checkbox:focus{border-color:#a4cafe;box-shadow:0 0 0 3px rgba(164,202,254,.45);outline:none}.form-checkbox:checked:focus,.form-radio:checked{border-color:transparent}.form-radio:checked{background-color:currentColor;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-position:50%;background-repeat:no-repeat;background-size:100% 100%}@media not print{.form-radio::-ms-check{background:inherit;border-color:inherit;border-radius:inherit;color:transparent}}.form-radio{-webkit-print-color-adjust:exact;-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:#fff;background-origin:border-box;border-color:#d2d6dc;border-radius:100%;color:#3f83f8;color-adjust:exact;display:inline-block;flex-shrink:0;height:1rem;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:middle;width:1rem}.form-radio:focus{border-color:#a4cafe;box-shadow:0 0 0 3px rgba(164,202,254,.45);outline:none}.form-radio:checked:focus{border-color:transparent}.button{border-radius:.25rem;font-size:.875rem;line-height:1.25rem;line-height:1rem;padding:.75rem 1rem;transition-duration:.15s;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1)}button:disabled{cursor:not-allowed;opacity:.5}.button-primary{--tw-text-opacity:1;color:rgba(255,255,255,var(--tw-text-opacity))}.button-primary:hover{font-weight:600}.button-block{display:block;width:100%}.button-danger{--tw-bg-opacity:1;--tw-text-opacity:1;background-color:rgba(240,82,82,var(--tw-bg-opacity));color:rgba(255,255,255,var(--tw-text-opacity))}.button-danger:hover{--tw-bg-opacity:1;background-color:rgba(224,36,36,var(--tw-bg-opacity))}.button-secondary{--tw-bg-opacity:1;background-color:rgba(244,245,247,var(--tw-bg-opacity))}.button-secondary:hover{--tw-bg-opacity:1;background-color:rgba(229,231,235,var(--tw-bg-opacity))}.button-link{--tw-text-opacity:1;color:rgba(55,65,81,var(--tw-text-opacity))}.button-link:hover{--tw-text-opacity:1;color:rgba(22,30,46,var(--tw-text-opacity));text-decoration:underline}.button-link:focus{outline:2px solid transparent;outline-offset:2px;text-decoration:underline}.validation{--tw-bg-opacity:1;background-color:rgba(244,245,247,var(--tw-bg-opacity));border-left-width:2px;margin-bottom:.25rem;margin-top:.5rem;padding:.25rem .75rem}.validation-fail{border-color:rgba(240,82,82,var(--tw-border-opacity))}.validation-fail,.validation-pass{--tw-border-opacity:1;--tw-text-opacity:1;color:rgba(55,65,81,var(--tw-text-opacity));font-size:.875rem;line-height:1.25rem}.validation-pass{border-color:rgba(14,159,110,var(--tw-border-opacity))}.input{--tw-border-opacity:1;align-items:center;border-color:rgba(210,214,220,var(--tw-border-opacity));border-radius:.25rem;border-width:1px;font-size:.875rem;line-height:1.25rem;margin-top:.5rem;padding:.5rem 1rem}.input:focus{--tw-bg-opacity:1;background-color:rgba(249,250,251,var(--tw-bg-opacity));outline:2px solid transparent;outline-offset:2px}.input-label{--tw-text-opacity:1;color:rgba(75,85,99,var(--tw-text-opacity));font-size:.875rem;line-height:1.25rem}.input-slim{padding-bottom:.5rem;padding-top:.5rem}.form-checkbox{border-radius:.25rem;cursor:pointer}.form-checkbox,.form-select{--tw-border-opacity:1;border-color:rgba(210,214,220,var(--tw-border-opacity));border-width:1px}.alert{--tw-border-opacity:1;--tw-bg-opacity:1;background-color:rgba(244,245,247,var(--tw-bg-opacity));border-color:rgba(159,166,178,var(--tw-border-opacity));border-left-width:2px;font-size:.875rem;line-height:1.25rem;margin-bottom:.25rem;margin-top:1rem;padding:.75rem 1rem}.alert-success{--tw-border-opacity:1;border-color:rgba(14,159,110,var(--tw-border-opacity))}.alert-failure{--tw-border-opacity:1;border-color:rgba(240,82,82,var(--tw-border-opacity))}.badge{align-items:center;border-radius:9999px;display:inline-flex;font-size:.75rem;font-weight:500;line-height:1rem;padding:.125rem .625rem}.badge-light{background-color:rgba(244,245,247,var(--tw-bg-opacity));color:rgba(37,47,63,var(--tw-text-opacity))}.badge-light,.badge-primary{--tw-bg-opacity:1;--tw-text-opacity:1}.badge-primary{background-color:rgba(195,221,253,var(--tw-bg-opacity));color:rgba(63,131,248,var(--tw-text-opacity))}.badge-danger{background-color:rgba(253,232,232,var(--tw-bg-opacity));color:rgba(240,82,82,var(--tw-text-opacity))}.badge-danger,.badge-success{--tw-bg-opacity:1;--tw-text-opacity:1}.badge-success{background-color:rgba(222,247,236,var(--tw-bg-opacity));color:rgba(14,159,110,var(--tw-text-opacity))}.badge-secondary{background-color:rgba(37,47,63,var(--tw-bg-opacity));color:rgba(229,231,235,var(--tw-text-opacity))}.badge-secondary,.badge-warning{--tw-bg-opacity:1;--tw-text-opacity:1}.badge-warning{background-color:rgba(254,236,220,var(--tw-bg-opacity));color:rgba(255,90,31,var(--tw-text-opacity))}.badge-info{--tw-bg-opacity:1;--tw-text-opacity:1;background-color:rgba(225,239,254,var(--tw-bg-opacity));color:rgba(63,131,248,var(--tw-text-opacity))}@media (min-width:640px){.dataTables_length{margin-bottom:1.25rem!important;margin-top:1.25rem!important}}@media (min-width:1024px){.dataTables_length{margin-bottom:1rem!important;margin-top:1rem!important}}.dataTables_length select{--tw-border-opacity:1;align-items:center;border-color:rgba(210,214,220,var(--tw-border-opacity));border-radius:.25rem;border-width:1px;font-size:.875rem;line-height:1.25rem;margin-top:.5rem;padding:.5rem 1rem}.dataTables_length select:focus{--tw-bg-opacity:1!important;background-color:rgba(249,250,251,var(--tw-bg-opacity))!important;outline:2px solid transparent!important;outline-offset:2px!important}.dataTables_length select{--tw-bg-opacity:1!important;background-color:rgba(255,255,255,var(--tw-bg-opacity))!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-color:#d2d6dc!important;border-radius:.375rem!important;font-size:1rem!important;font-size:[object Object]!important;line-height:1.5!important;padding:.5rem .75rem!important}.dataTables_filter input::-moz-placeholder{color:#9fa6b2!important;opacity:1!important}.dataTables_filter input:-ms-input-placeholder{color:#9fa6b2!important;opacity:1!important}.dataTables_filter input::placeholder{color:#9fa6b2!important;opacity:1!important}.dataTables_filter input:focus{border-color:#a4cafe!important;box-shadow:0 0 0 3px rgba(164,202,254,.45)!important;outline:none!important}.dataTables_filter input{--tw-border-opacity:1!important;align-items:center!important;border-color:rgba(210,214,220,var(--tw-border-opacity))!important;border-radius:.25rem!important;border-width:1px!important;font-size:.875rem!important;line-height:1.25rem!important;margin-top:.5rem!important;padding:.5rem 1rem!important}.dataTables_filter input:focus{--tw-bg-opacity:1!important;background-color:rgba(249,250,251,var(--tw-bg-opacity))!important;outline:2px solid transparent!important;outline-offset:2px!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{--tw-border-opacity:1!important;--tw-bg-opacity:1!important;--tw-text-opacity:1!important;background-color:rgba(255,255,255,var(--tw-bg-opacity))!important;border-color:rgba(210,214,220,var(--tw-border-opacity))!important;border-radius:.25rem;border-radius:.25rem!important;border-width:1px!important;color:rgba(55,65,81,var(--tw-text-opacity))!important;cursor:pointer!important;font-size:.875rem;font-size:.875rem!important;font-weight:500!important;line-height:1.25rem;line-height:1rem;line-height:1.25rem!important;line-height:1rem!important;margin-right:.25rem!important;padding:.75rem 1rem;padding-bottom:.5rem!important;padding-top:.5rem!important;transition-duration:.15s;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1)}.dataTables_paginate .current{--tw-bg-opacity:1!important;--tw-text-opacity:1!important;background-color:rgba(28,100,242,var(--tw-bg-opacity))!important;color:rgba(255,255,255,var(--tw-text-opacity))!important}.dataTables_info{font-size:.875rem!important;line-height:1.25rem!important}.dataTables_empty{padding-bottom:1rem!important;padding-top:1rem!important}.pagination{align-items:center!important;display:flex!important}.pagination .page-link{--tw-text-opacity:1!important;align-items:center!important;border-color:transparent!important;border-top-width:2px!important;color:rgba(107,114,128,var(--tw-text-opacity))!important;cursor:pointer!important;display:inline-flex!important;font-size:.875rem!important;font-weight:500!important;line-height:1.25rem!important;margin-top:-1px!important;padding-left:1rem!important;padding-right:1rem!important;padding-top:1rem!important;transition-duration:.15s!important;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter!important;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter!important;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter!important;transition-timing-function:cubic-bezier(.4,0,.2,1)!important}.pagination .page-link:hover{--tw-border-opacity:1!important;--tw-text-opacity:1!important;border-color:rgba(210,214,220,var(--tw-border-opacity))!important;color:rgba(55,65,81,var(--tw-text-opacity))!important}.pagination .page-link:focus{--tw-border-opacity:1;--tw-text-opacity:1;border-color:rgba(159,166,178,var(--tw-border-opacity));color:rgba(55,65,81,var(--tw-text-opacity));outline:2px solid transparent;outline-offset:2px}.pagination .active>span{--tw-border-opacity:1!important;--tw-text-opacity:1!important;border-color:rgba(28,100,242,var(--tw-border-opacity))!important;color:rgba(28,100,242,var(--tw-text-opacity))!important}.sr-only{clip:rect(0,0,0,0);border-width:0;height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;white-space:nowrap;width:1px}.pointer-events-none{pointer-events:none}.pointer-events-auto{pointer-events:auto}.fixed{position:fixed}.absolute{position:absolute}.relative{position:relative}.inset-0{bottom:0;top:0}.inset-0,.inset-x-0{left:0;right:0}.inset-y-0{bottom:0;top:0}.top-0{top:0}.top-1{top:.25rem}.right-0{right:0}.bottom-0{bottom:0}.left-0{left:0}.left-1{left:.25rem}.z-0{z-index:0}.z-10{z-index:10}.z-30{z-index:30}.z-40{z-index:40}.col-span-1{grid-column:span 1/span 1}.col-span-2{grid-column:span 2/span 2}.col-span-3{grid-column:span 3/span 3}.col-span-4{grid-column:span 4/span 4}.col-span-6{grid-column:span 6/span 6}.col-span-8{grid-column:span 8/span 8}.col-span-12{grid-column:span 12/span 12}.float-right{float:right}.m-0{margin:0}.m-auto{margin:auto}.mx-2{margin-left:.5rem;margin-right:.5rem}.mx-4{margin-left:1rem;margin-right:1rem}.mx-6{margin-left:1.5rem;margin-right:1.5rem}.mx-20{margin-left:5rem;margin-right:5rem}.mx-auto{margin-left:auto;margin-right:auto}.my-3{margin-bottom:.75rem;margin-top:.75rem}.my-4{margin-bottom:1rem;margin-top:1rem}.my-10{margin-bottom:2.5rem;margin-top:2.5rem}.-my-2{margin-bottom:-.5rem;margin-top:-.5rem}.mt-0{margin-top:0}.mt-1{margin-top:.25rem}.mt-2{margin-top:.5rem}.mt-3{margin-top:.75rem}.mt-4{margin-top:1rem}.mt-5{margin-top:1.25rem}.mt-6{margin-top:1.5rem}.mt-8{margin-top:2rem}.mt-10{margin-top:2.5rem}.-mt-4{margin-top:-1rem}.-mt-6{margin-top:-1.5rem}.mr-1{margin-right:.25rem}.mr-2{margin-right:.5rem}.mr-3{margin-right:.75rem}.mr-4{margin-right:1rem}.-mr-1{margin-right:-.25rem}.-mr-14{margin-right:-3.5rem}.mb-0{margin-bottom:0}.mb-2{margin-bottom:.5rem}.mb-3{margin-bottom:.75rem}.mb-4{margin-bottom:1rem}.mb-6{margin-bottom:1.5rem}.mb-10{margin-bottom:2.5rem}.mb-12{margin-bottom:3rem}.ml-0{margin-left:0}.ml-1{margin-left:.25rem}.ml-2{margin-left:.5rem}.ml-3{margin-left:.75rem}.ml-4{margin-left:1rem}.-ml-1{margin-left:-.25rem}.-ml-4{margin-left:-1rem}.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}.h-0{height:0}.h-5{height:1.25rem}.h-6{height:1.5rem}.h-8{height:2rem}.h-10{height:2.5rem}.h-12{height:3rem}.h-14{height:3.5rem}.h-16{height:4rem}.h-32{height:8rem}.h-64{height:16rem}.h-auto{height:auto}.h-full{height:100%}.h-screen{height:100vh}.min-h-screen{min-height:100vh}.w-0{width:0}.w-4{width:1rem}.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-4\/5{width:80%}.w-5\/6{width:83.333333%}.w-full{width:100%}.w-screen{width:100vw}.min-w-full{min-width:100%}.max-w-xs{max-width:20rem}.max-w-xl{max-width:36rem}.max-w-2xl{max-width:42rem}.max-w-4xl{max-width:56rem}.max-w-7xl{max-width:80rem}.flex-1{flex:1 1 0%}.flex-shrink-0{flex-shrink:0}.table-auto{table-layout:auto}.border-collapse{border-collapse:collapse}.origin-top-right{transform-origin:top right}.transform{--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;transform:translateX(var(--tw-translate-x)) translateY(var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.translate-x-0{--tw-translate-x:0}.-translate-x-full{--tw-translate-x:-100%}.translate-y-0{--tw-translate-y:0}.translate-y-4{--tw-translate-y:1rem}.scale-95{--tw-scale-x:.95;--tw-scale-y:.95}.scale-100{--tw-scale-x:1;--tw-scale-y:1}@-webkit-keyframes spin{to{transform:rotate(1turn)}}@keyframes spin{to{transform:rotate(1turn)}}@-webkit-keyframes ping{75%,to{opacity:0;transform:scale(2)}}@keyframes ping{75%,to{opacity:0;transform:scale(2)}}@-webkit-keyframes pulse{50%{opacity:.5}}@keyframes pulse{50%{opacity:.5}}@-webkit-keyframes bounce{0%,to{-webkit-animation-timing-function:cubic-bezier(.8,0,1,1);animation-timing-function:cubic-bezier(.8,0,1,1);transform:translateY(-25%)}50%{-webkit-animation-timing-function:cubic-bezier(0,0,.2,1);animation-timing-function:cubic-bezier(0,0,.2,1);transform:none}}@keyframes bounce{0%,to{-webkit-animation-timing-function:cubic-bezier(.8,0,1,1);animation-timing-function:cubic-bezier(.8,0,1,1);transform:translateY(-25%)}50%{-webkit-animation-timing-function:cubic-bezier(0,0,.2,1);animation-timing-function:cubic-bezier(0,0,.2,1);transform:none}}.animate-spin{-webkit-animation:spin 1s linear infinite;animation:spin 1s linear infinite}.cursor-pointer{cursor:pointer}.appearance-none{-webkit-appearance:none;-moz-appearance:none;appearance:none}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.grid-cols-6{grid-template-columns:repeat(6,minmax(0,1fr))}.grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.flex-row{flex-direction:row}.flex-col{flex-direction:column}.flex-wrap{flex-wrap:wrap}.items-start{align-items:flex-start}.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}.gap-4{gap:1rem}.gap-5{gap:1.25rem}.gap-6{gap:1.5rem}.gap-8{gap:2rem}.gap-x-2{-moz-column-gap:.5rem;column-gap:.5rem}.space-x-1>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(.25rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(.25rem*var(--tw-space-x-reverse))}.space-x-2>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(.5rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(.5rem*var(--tw-space-x-reverse))}.overflow-auto{overflow:auto}.overflow-hidden{overflow:hidden}.overflow-x-auto{overflow-x:auto}.overflow-y-auto{overflow-y:auto}.overflow-y-scroll{overflow-y:scroll}.truncate{overflow:hidden;text-overflow:ellipsis}.truncate,.whitespace-nowrap{white-space:nowrap}.break-words{overflow-wrap:break-word}.break-all{word-break:break-all}.rounded-sm{border-radius:.125rem}.rounded{border-radius:.25rem}.rounded-md{border-radius:.375rem}.rounded-lg{border-radius:.5rem}.rounded-full{border-radius:9999px}.rounded-t-lg{border-top-left-radius:.5rem;border-top-right-radius:.5rem}.rounded-b-lg{border-bottom-left-radius:.5rem;border-bottom-right-radius:.5rem}.border-0{border-width:0}.border-4{border-width:4px}.border{border-width:1px}.border-t{border-top-width:1px}.border-r{border-right-width:1px}.border-b{border-bottom-width:1px}.border-l-2{border-left-width:2px}.border-solid{border-style:solid}.border-dashed{border-style:dashed}.border-none{border-style:none}.border-transparent{border-color:transparent}.border-gray-100{--tw-border-opacity:1;border-color:rgba(244,245,247,var(--tw-border-opacity))}.border-gray-200{--tw-border-opacity:1;border-color:rgba(229,231,235,var(--tw-border-opacity))}.border-gray-300{--tw-border-opacity:1;border-color:rgba(210,214,220,var(--tw-border-opacity))}.border-gray-600{--tw-border-opacity:1;border-color:rgba(75,85,99,var(--tw-border-opacity))}.border-red-300{--tw-border-opacity:1;border-color:rgba(248,180,180,var(--tw-border-opacity))}.border-red-400{--tw-border-opacity:1;border-color:rgba(249,128,128,var(--tw-border-opacity))}.border-green-500{--tw-border-opacity:1;border-color:rgba(14,159,110,var(--tw-border-opacity))}.border-blue-500{--tw-border-opacity:1;border-color:rgba(63,131,248,var(--tw-border-opacity))}.group:hover .group-hover\:border-transparent,.hover\:border-transparent:hover{border-color:transparent}.hover\:border-gray-600:hover{--tw-border-opacity:1;border-color:rgba(75,85,99,var(--tw-border-opacity))}.hover\:border-gray-800:hover{--tw-border-opacity:1;border-color:rgba(37,47,63,var(--tw-border-opacity))}.hover\:border-blue-600:hover{--tw-border-opacity:1;border-color:rgba(28,100,242,var(--tw-border-opacity))}.focus\:border-blue-300:focus{--tw-border-opacity:1;border-color:rgba(164,202,254,var(--tw-border-opacity))}.focus\:border-blue-600:focus{--tw-border-opacity:1;border-color:rgba(28,100,242,var(--tw-border-opacity))}.focus\:border-indigo-500:focus{--tw-border-opacity:1;border-color:rgba(104,117,245,var(--tw-border-opacity))}.bg-transparent{background-color:transparent}.bg-white{--tw-bg-opacity:1;background-color:rgba(255,255,255,var(--tw-bg-opacity))}.bg-gray-50{--tw-bg-opacity:1;background-color:rgba(249,250,251,var(--tw-bg-opacity))}.bg-gray-100{--tw-bg-opacity:1;background-color:rgba(244,245,247,var(--tw-bg-opacity))}.bg-gray-200{--tw-bg-opacity:1;background-color:rgba(229,231,235,var(--tw-bg-opacity))}.bg-gray-500{--tw-bg-opacity:1;background-color:rgba(107,114,128,var(--tw-bg-opacity))}.bg-gray-600{--tw-bg-opacity:1;background-color:rgba(75,85,99,var(--tw-bg-opacity))}.bg-red-100{--tw-bg-opacity:1;background-color:rgba(253,232,232,var(--tw-bg-opacity))}.bg-blue-50{--tw-bg-opacity:1;background-color:rgba(235,245,255,var(--tw-bg-opacity))}.bg-blue-500{--tw-bg-opacity:1;background-color:rgba(63,131,248,var(--tw-bg-opacity))}.bg-blue-600{--tw-bg-opacity:1;background-color:rgba(28,100,242,var(--tw-bg-opacity))}.bg-blue-700{--tw-bg-opacity:1;background-color:rgba(26,86,219,var(--tw-bg-opacity))}.bg-indigo-600{--tw-bg-opacity:1;background-color:rgba(88,80,236,var(--tw-bg-opacity))}.hover\:bg-gray-100:hover{--tw-bg-opacity:1;background-color:rgba(244,245,247,var(--tw-bg-opacity))}.hover\:bg-blue-500:hover{--tw-bg-opacity:1;background-color:rgba(63,131,248,var(--tw-bg-opacity))}.hover\:bg-indigo-700:hover{--tw-bg-opacity:1;background-color:rgba(81,69,205,var(--tw-bg-opacity))}.focus\:bg-white:focus{--tw-bg-opacity:1;background-color:rgba(255,255,255,var(--tw-bg-opacity))}.focus\:bg-gray-100:focus{--tw-bg-opacity:1;background-color:rgba(244,245,247,var(--tw-bg-opacity))}.focus\:bg-gray-600:focus{--tw-bg-opacity:1;background-color:rgba(75,85,99,var(--tw-bg-opacity))}.active\:bg-gray-50:active{--tw-bg-opacity:1;background-color:rgba(249,250,251,var(--tw-bg-opacity))}.bg-clip-padding{background-clip:padding-box}.fill-current{fill:currentColor}.object-cover{-o-object-fit:cover;object-fit:cover}.p-1{padding:.25rem}.p-3{padding:.75rem}.p-4{padding:1rem}.p-8{padding:2rem}.p-10{padding:2.5rem}.px-0{padding-left:0;padding-right:0}.px-2{padding-left:.5rem;padding-right:.5rem}.px-3{padding-left:.75rem;padding-right:.75rem}.px-4{padding-left:1rem;padding-right:1rem}.px-5{padding-left:1.25rem;padding-right:1.25rem}.px-6{padding-left:1.5rem;padding-right:1.5rem}.px-12{padding-left:3rem;padding-right:3rem}.px-2\.5{padding-left:.625rem;padding-right:.625rem}.py-0{padding-bottom:0;padding-top:0}.py-1{padding-bottom:.25rem;padding-top:.25rem}.py-2{padding-bottom:.5rem;padding-top:.5rem}.py-3{padding-bottom:.75rem;padding-top:.75rem}.py-4{padding-bottom:1rem;padding-top:1rem}.py-5{padding-bottom:1.25rem;padding-top:1.25rem}.py-6{padding-bottom:1.5rem;padding-top:1.5rem}.py-8{padding-bottom:2rem;padding-top:2rem}.py-12{padding-bottom:3rem;padding-top:3rem}.py-0\.5{padding-bottom:.125rem;padding-top:.125rem}.pt-0{padding-top:0}.pt-2{padding-top:.5rem}.pt-4{padding-top:1rem}.pt-5{padding-top:1.25rem}.pt-6{padding-top:1.5rem}.pr-2{padding-right:.5rem}.pr-4{padding-right:1rem}.pr-10{padding-right:2.5rem}.pb-4{padding-bottom:1rem}.pb-10{padding-bottom:2.5rem}.pb-20{padding-bottom:5rem}.pl-0{padding-left:0}.pl-3{padding-left:.75rem}.text-left{text-align:left}.text-center{text-align:center}.text-right{text-align:right}.align-middle{vertical-align:middle}.align-bottom{vertical-align:bottom}.text-xs{font-size:.75rem;line-height:1rem}.text-sm{font-size:.875rem;line-height:1.25rem}.text-base{font-size:1rem;line-height:1.5rem}.text-lg{font-size:1.125rem}.text-lg,.text-xl{line-height:1.75rem}.text-xl{font-size:1.25rem}.text-2xl{font-size:1.5rem;line-height:2rem}.text-3xl{font-size:1.875rem;line-height:2.25rem}.text-5xl{font-size:3rem;line-height:1}.font-normal{font-weight:400}.font-medium{font-weight:500}.font-semibold{font-weight:600}.font-bold{font-weight:700}.font-extrabold{font-weight:800}.uppercase{text-transform:uppercase}.capitalize{text-transform:capitalize}.leading-4{line-height:1rem}.leading-5{line-height:1.25rem}.leading-6{line-height:1.5rem}.leading-9{line-height:2.25rem}.leading-tight{line-height:1.25}.tracking-tight{letter-spacing:-.025em}.tracking-wide{letter-spacing:.025em}.tracking-wider{letter-spacing:.05em}.text-white{--tw-text-opacity:1;color:rgba(255,255,255,var(--tw-text-opacity))}.text-black{--tw-text-opacity:1;color:rgba(0,0,0,var(--tw-text-opacity))}.text-gray-300{--tw-text-opacity:1;color:rgba(210,214,220,var(--tw-text-opacity))}.text-gray-400{--tw-text-opacity:1;color:rgba(159,166,178,var(--tw-text-opacity))}.text-gray-500{--tw-text-opacity:1;color:rgba(107,114,128,var(--tw-text-opacity))}.text-gray-600{--tw-text-opacity:1;color:rgba(75,85,99,var(--tw-text-opacity))}.text-gray-700{--tw-text-opacity:1;color:rgba(55,65,81,var(--tw-text-opacity))}.text-gray-800{--tw-text-opacity:1;color:rgba(37,47,63,var(--tw-text-opacity))}.text-gray-900{--tw-text-opacity:1;color:rgba(22,30,46,var(--tw-text-opacity))}.text-red-400{--tw-text-opacity:1;color:rgba(249,128,128,var(--tw-text-opacity))}.text-red-500{--tw-text-opacity:1;color:rgba(240,82,82,var(--tw-text-opacity))}.text-red-600{--tw-text-opacity:1;color:rgba(224,36,36,var(--tw-text-opacity))}.text-green-600{--tw-text-opacity:1;color:rgba(5,122,85,var(--tw-text-opacity))}.text-blue-500{--tw-text-opacity:1;color:rgba(63,131,248,var(--tw-text-opacity))}.text-blue-600{--tw-text-opacity:1;color:rgba(28,100,242,var(--tw-text-opacity))}.text-blue-700{--tw-text-opacity:1;color:rgba(26,86,219,var(--tw-text-opacity))}.text-indigo-600{--tw-text-opacity:1;color:rgba(88,80,236,var(--tw-text-opacity))}.group:hover .group-hover\:text-white,.hover\:text-white:hover{--tw-text-opacity:1;color:rgba(255,255,255,var(--tw-text-opacity))}.hover\:text-gray-300:hover{--tw-text-opacity:1;color:rgba(210,214,220,var(--tw-text-opacity))}.hover\:text-gray-500:hover{--tw-text-opacity:1;color:rgba(107,114,128,var(--tw-text-opacity))}.hover\:text-gray-600:hover{--tw-text-opacity:1;color:rgba(75,85,99,var(--tw-text-opacity))}.hover\:text-gray-700:hover{--tw-text-opacity:1;color:rgba(55,65,81,var(--tw-text-opacity))}.hover\:text-gray-800:hover{--tw-text-opacity:1;color:rgba(37,47,63,var(--tw-text-opacity))}.hover\:text-gray-900:hover{--tw-text-opacity:1;color:rgba(22,30,46,var(--tw-text-opacity))}.hover\:text-blue-600:hover{--tw-text-opacity:1;color:rgba(28,100,242,var(--tw-text-opacity))}.hover\:text-indigo-900:hover{--tw-text-opacity:1;color:rgba(54,47,120,var(--tw-text-opacity))}.focus\:text-gray-500:focus{--tw-text-opacity:1;color:rgba(107,114,128,var(--tw-text-opacity))}.focus\:text-gray-600:focus{--tw-text-opacity:1;color:rgba(75,85,99,var(--tw-text-opacity))}.focus\:text-gray-700:focus{--tw-text-opacity:1;color:rgba(55,65,81,var(--tw-text-opacity))}.focus\:text-gray-900:focus{--tw-text-opacity:1;color:rgba(22,30,46,var(--tw-text-opacity))}.active\:text-gray-800:active{--tw-text-opacity:1;color:rgba(37,47,63,var(--tw-text-opacity))}.underline{text-decoration:underline}.line-through{text-decoration:line-through}.focus\:underline:focus,.hover\:underline:hover{text-decoration:underline}.antialiased{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.opacity-0{opacity:0}.opacity-25{opacity:.25}.opacity-75{opacity:.75}.opacity-100{opacity:1}*,:after,:before{--tw-shadow:0 0 #0000}.shadow-sm{--tw-shadow:0 1px 2px 0 rgba(0,0,0,0.05)}.shadow,.shadow-sm{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow{--tw-shadow:0 1px 3px 0 rgba(0,0,0,0.1),0 1px 2px 0 rgba(0,0,0,0.06)}.shadow-lg{--tw-shadow:0 10px 15px -3px rgba(0,0,0,0.1),0 4px 6px -2px rgba(0,0,0,0.05)}.shadow-lg,.shadow-xl{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-xl{--tw-shadow:0 20px 25px -5px rgba(0,0,0,0.1),0 10px 10px -5px rgba(0,0,0,0.04)}.hover\:shadow-lg:hover{--tw-shadow:0 10px 15px -3px rgba(0,0,0,0.1),0 4px 6px -2px rgba(0,0,0,0.05)}.hover\:shadow-2xl:hover,.hover\:shadow-lg:hover{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.hover\:shadow-2xl:hover{--tw-shadow:0 25px 50px -12px rgba(0,0,0,0.25)}.focus\:outline-none:focus{outline:2px solid transparent;outline-offset:2px}*,:after,:before{--tw-ring-inset:var(--tw-empty,/*!*/ /*!*/);--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(63,131,248,0.5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000}.ring-1{--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color)}.focus\:ring:focus,.ring-1{box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow,0 0 #0000)}.focus\:ring:focus{--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(3px + var(--tw-ring-offset-width)) var(--tw-ring-color)}.ring-black{--tw-ring-opacity:1;--tw-ring-color:rgba(0,0,0,var(--tw-ring-opacity))}.focus\:ring-indigo-500:focus{--tw-ring-opacity:1;--tw-ring-color:rgba(104,117,245,var(--tw-ring-opacity))}.ring-opacity-5{--tw-ring-opacity:0.05}.filter{--tw-blur:var(--tw-empty,/*!*/ /*!*/);--tw-brightness:var(--tw-empty,/*!*/ /*!*/);--tw-contrast:var(--tw-empty,/*!*/ /*!*/);--tw-grayscale:var(--tw-empty,/*!*/ /*!*/);--tw-hue-rotate:var(--tw-empty,/*!*/ /*!*/);--tw-invert:var(--tw-empty,/*!*/ /*!*/);--tw-saturate:var(--tw-empty,/*!*/ /*!*/);--tw-sepia:var(--tw-empty,/*!*/ /*!*/);--tw-drop-shadow:var(--tw-empty,/*!*/ /*!*/);filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.invert{--tw-invert:invert(100%)}.transition-all{transition-duration:.15s;transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition{transition-duration:.15s;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-opacity{transition-duration:.15s;transition-property:opacity;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}.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)}@media (min-width:640px){.sm\:inset-0{bottom:0;left:0;right:0;top:0}.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\:mx-0{margin-left:0;margin-right:0}.sm\:-mx-6{margin-left:-1.5rem;margin-right:-1.5rem}.sm\:my-8{margin-bottom:2rem;margin-top:2rem}.sm\:mt-0{margin-top:0}.sm\:mt-4{margin-top:1rem}.sm\:mt-6{margin-top:1.5rem}.sm\:ml-3{margin-left:.75rem}.sm\:ml-4{margin-left:1rem}.sm\:ml-6{margin-left:1.5rem}.sm\:block{display:block}.sm\:inline-block{display:inline-block}.sm\:flex{display:flex}.sm\:grid{display:grid}.sm\:hidden{display:none}.sm\:h-10{height:2.5rem}.sm\:h-screen{height:100vh}.sm\:w-10{width:2.5rem}.sm\:w-auto{width:auto}.sm\:w-full{width:100%}.sm\:max-w-sm{max-width:24rem}.sm\:max-w-lg{max-width:32rem}.sm\:flex-shrink-0{flex-shrink:0}.sm\:translate-y-0{--tw-translate-y:0}.sm\:scale-95{--tw-scale-x:.95;--tw-scale-y:.95}.sm\:scale-100{--tw-scale-x:1;--tw-scale-y:1}.sm\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.sm\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.sm\:flex-row-reverse{flex-direction:row-reverse}.sm\:flex-nowrap{flex-wrap:nowrap}.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\:gap-4{gap:1rem}.sm\:rounded-lg{border-radius:.5rem}.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\:text-left{text-align:left}.sm\:align-middle{vertical-align:middle}.sm\:text-sm{font-size:.875rem;line-height:1.25rem}.sm\:text-4xl{font-size:2.25rem;line-height:2.5rem}}@media (min-width:768px){.md\:col-span-1{grid-column:span 1/span 1}.md\:col-span-2{grid-column:span 2/span 2}.md\:col-span-4{grid-column:span 4/span 4}.md\:col-span-5{grid-column:span 5/span 5}.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}.md\:mx-0{margin-left:0;margin-right:0}.md\:mt-0{margin-top:0}.md\:mt-5{margin-top:1.25rem}.md\:mt-10{margin-top:2.5rem}.md\:mr-2{margin-right:.5rem}.md\:-mr-1{margin-right:-.25rem}.md\:ml-2{margin-left:.5rem}.md\:ml-6{margin-left:1.5rem}.md\:block{display:block}.md\:flex{display:flex}.md\:grid{display:grid}.md\:hidden{display:none}.md\:w-1\/2{width:50%}.md\:w-1\/3{width:33.333333%}.md\:max-w-3xl{max-width:48rem}.md\:flex-shrink-0{flex-shrink:0}.md\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.md\:grid-cols-12{grid-template-columns:repeat(12,minmax(0,1fr))}.md\:flex-row{flex-direction:row}.md\:items-center{align-items:center}.md\:justify-between{justify-content:space-between}.md\:gap-6{gap:1.5rem}.md\:p-24{padding:6rem}.md\:px-8{padding-left:2rem;padding-right:2rem}.md\:text-sm{font-size:.875rem;line-height:1.25rem}.md\:text-2xl{font-size:1.5rem;line-height:2rem}}@media (min-width:1024px){.lg\:col-span-3{grid-column:span 3/span 3}.lg\:col-span-6{grid-column:span 6/span 6}.lg\:col-span-7{grid-column:span 7/span 7}.lg\:col-span-8{grid-column:span 8/span 8}.lg\:col-start-3{grid-column-start:3}.lg\:col-start-4{grid-column-start:4}.lg\:-mx-8{margin-left:-2rem;margin-right:-2rem}.lg\:mt-0{margin-top:0}.lg\:mt-24{margin-top:6rem}.lg\:block{display:block}.lg\:flex{display:flex}.lg\:grid{display:grid}.lg\:h-screen{height:100vh}.lg\:w-1\/2{width:50%}.lg\:w-1\/4{width:25%}.lg\:w-1\/5{width:20%}.lg\:flex-shrink-0{flex-shrink:0}.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\:items-center{align-items:center}.lg\:justify-between{justify-content:space-between}.lg\:gap-4{gap:1rem}.lg\:rounded-lg{border-radius:.5rem}.lg\:px-4{padding-left:1rem;padding-right:1rem}.lg\:px-8{padding-left:2rem;padding-right:2rem}.lg\:px-16{padding-left:4rem;padding-right:4rem}.lg\:py-16{padding-bottom:4rem;padding-top:4rem}}@media (min-width:1280px){.xl\:col-span-4{grid-column:span 4/span 4}.xl\:col-span-6{grid-column:span 6/span 6}.xl\:col-span-8{grid-column:span 8/span 8}.xl\:col-span-9{grid-column:span 9/span 9}.xl\:col-start-4{grid-column-start:4}.xl\:mt-32{margin-top:8rem}.xl\:flex{display:flex}.xl\:justify-center{justify-content:center}.xl\:px-16{padding-left:4rem;padding-right:4rem}}
diff --git a/public/js/clients/payments/stripe-browserpay.js b/public/js/clients/payments/stripe-browserpay.js
index 9598eb1892ea..5ada82bc57aa 100644
--- a/public/js/clients/payments/stripe-browserpay.js
+++ b/public/js/clients/payments/stripe-browserpay.js
@@ -1,2 +1,2 @@
/*! For license information please see stripe-browserpay.js.LICENSE.txt */
-(()=>{function e(e,t){for(var n=0;n{function e(e,t){for(var n=0;n 'Error importing :company',
'company_import_failure_body' => 'There was an error importing the company data, the error message was:',
'recurring_invoice_due_date' => 'Due Date',
- 'amount_cents' => 'Amount in pennies,pence or cents',
+ 'amount_cents' => 'Amount in pennies,pence or cents. ie for $0.10 please enter 10',
'default_payment_method_label' => 'Default Payment Method',
'default_payment_method' => 'Make this your preferred way of paying.',
'already_default_payment_method' => 'This is your preferred way of paying.',
@@ -4568,7 +4568,8 @@ $LANG = array(
'small' => 'Small',
'quotes_backup_subject' => 'Your quotes are ready for download',
'credits_backup_subject' => 'Your credits are ready for download',
-
+ 'document_download_subject' => 'Your documents are ready for download',
+ 'reminder_message' => 'Reminder for invoice :number for :balance',
);
return $LANG;
diff --git a/resources/views/email/admin/download_documents.blade.php b/resources/views/email/admin/download_documents.blade.php
new file mode 100644
index 000000000000..a428452a1953
--- /dev/null
+++ b/resources/views/email/admin/download_documents.blade.php
@@ -0,0 +1,10 @@
+@component('email.template.admin', ['logo' => $logo, 'settings' => $settings])
+
+@endcomponent
diff --git a/resources/views/email/admin/download_documents_text.blade.php b/resources/views/email/admin/download_documents_text.blade.php
new file mode 100644
index 000000000000..c39d09549ae8
--- /dev/null
+++ b/resources/views/email/admin/download_documents_text.blade.php
@@ -0,0 +1,5 @@
+{!! ctrans('texts.invoices_backup_subject') !!}
+
+{!! ctrans('texts.download_timeframe') !!}
+
+{!! $url !!}
\ No newline at end of file
diff --git a/resources/views/email/admin/download_invoices_text.blade.php b/resources/views/email/admin/download_invoices_text.blade.php
index c39d09549ae8..13c4cd4c4dc2 100644
--- a/resources/views/email/admin/download_invoices_text.blade.php
+++ b/resources/views/email/admin/download_invoices_text.blade.php
@@ -1,4 +1,4 @@
-{!! ctrans('texts.invoices_backup_subject') !!}
+{!! ctrans('texts.document_download_subject') !!}
{!! ctrans('texts.download_timeframe') !!}
diff --git a/resources/views/email/template/client.blade.php b/resources/views/email/template/client.blade.php
index a020e48aa7e6..48d85088224d 100644
--- a/resources/views/email/template/client.blade.php
+++ b/resources/views/email/template/client.blade.php
@@ -22,43 +22,33 @@
color-scheme: light dark;
supported-color-schemes: light dark;
}
-
@if(isset($settings) && $settings->email_style === 'dark')
body {
background-color: #1a1a1a !important;
color: #ffffff !important;
}
-
div, tr, td {
border-color: #222222 !important;
}
-
h1, h2, h3, p, td {
color: #ffffff !important;
}
-
p {
color: #bbbbbc !important;
}
-
.dark-bg-base {
background-color: #222222 !important;
}
-
.dark-bg {
background-color: #3a3a3c !important;
}
-
.dark-text-white p {
color: #ffffff !important;
}
-
hr {
border-color: #474849 !important;
}
-
@endif
-
/** Content-specific styles. **/
#content .button {
display: inline-block;
@@ -72,7 +62,6 @@
font-weight: 600;
margin-bottom: 30px;
}
-
#content h1 {
font-family: 'canada-type-gibson', 'roboto', Arial, Helvetica, sans-serif;
font-weight: 600;
@@ -80,17 +69,14 @@
margin-top: 20px;
margin-bottom: 30px;
}
-
#content > p {
font-size: 16px;
font-family: 'roboto', Arial, Helvetica, sans-serif;
font-weight: 500;
}
-
#content .center {
text-align: center;
}
-
#content .left {
text-align: left !important;
}
@@ -185,4 +171,4 @@
-