diff --git a/app/Http/Controllers/SubdomainController.php b/app/Http/Controllers/SubdomainController.php index 153c12b91d60..2239cec64b2f 100644 --- a/app/Http/Controllers/SubdomainController.php +++ b/app/Http/Controllers/SubdomainController.php @@ -31,6 +31,7 @@ class SubdomainController extends BaseController 'cname', 'sandbox', 'stage', + 'html', ]; public function __construct() diff --git a/app/Jobs/Util/WebhookHandler.php b/app/Jobs/Util/WebhookHandler.php index 38cafd03bb4c..27a8748d93fd 100644 --- a/app/Jobs/Util/WebhookHandler.php +++ b/app/Jobs/Util/WebhookHandler.php @@ -127,8 +127,8 @@ class WebhookHandler implements ShouldQueue $this->company ); - // if ($response->getStatusCode() == 410 || $response->getStatusCode() == 200) - // return true;// $subscription->delete(); + // if ($response->getStatusCode() == 410) + // return true; $subscription->delete(); } catch(\Exception $e){ diff --git a/app/Mail/SupportMessageSent.php b/app/Mail/SupportMessageSent.php index 888fcf1c235b..afc8d0ea9438 100644 --- a/app/Mail/SupportMessageSent.php +++ b/app/Mail/SupportMessageSent.php @@ -65,9 +65,10 @@ class SupportMessageSent extends Mailable $is_large = $company->is_large ? "L" : "S"; $platform = array_key_exists('platform', $this->data) ? $this->data['platform'] : "U"; $migrated = strlen($company->company_key) == 32 ? "M" : ""; + $trial = $account->isTrial() ? "T" : ""; if(Ninja::isHosted()) - $subject = "{$priority}Hosted-{$db}-{$is_large}{$platform}{$migrated} :: {$plan} :: ".date('M jS, g:ia'); + $subject = "{$priority}Hosted-{$db}-{$is_large}{$platform}{$migrated}{$trial} :: {$plan} :: ".date('M jS, g:ia'); else $subject = "{$priority}Self Hosted :: {$plan} :: {$is_large}{$platform}{$migrated} :: ".date('M jS, g:ia');