From 6bf5621cde25789422d12f12858a12ca8269775c Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 28 Jun 2020 20:28:35 +1000 Subject: [PATCH] Client can register --- app/Transformers/CompanyTransformer.php | 3 +- app/Utils/SystemHealth.php | 27 ++++++++-- app/Utils/Traits/AppSetup.php | 2 +- database/seeds/RandomDataSeeder.php | 68 ++++++++++++------------- 4 files changed, 59 insertions(+), 41 deletions(-) diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index 96e7d2be7038..697190bd50cb 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -121,7 +121,8 @@ class CompanyTransformer extends EntityTransformer 'slack_webhook_url' => (string)$company->slack_webhook_url, 'google_analytics_url' => (string)$company->google_analytics_key, //@deprecate 'google_analytics_key' => (string)$company->google_analytics_key, - 'enabled_item_tax_rates' => (int) $company->enabled_item_tax_rates + 'enabled_item_tax_rates' => (int) $company->enabled_item_tax_rates, + 'client_can_register' => (bool) $company->client_can_register, ]; } diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php index 783eb16cdb50..87cbb8ba81ac 100644 --- a/app/Utils/SystemHealth.php +++ b/app/Utils/SystemHealth.php @@ -45,16 +45,18 @@ class SystemHealth */ public static function check() : array { - $system_health = true; + $system_health = "true"; if (in_array(false, Arr::dot(self::extensions()))) { - $system_health = false; + $system_health = "false"; } elseif (phpversion() < self::$php_version) { - $system_health = false; + $system_health = "false"; + } elseif(!self::simpleDbCheck()) { + $system_health = "false"; } return [ - 'system_health' => (bool) $system_health, + 'system_health' => $system_health, 'extensions' => self::extensions(), 'php_version' => [ 'minimum_php_version' => self::$php_version, @@ -62,11 +64,26 @@ class SystemHealth 'is_okay' => version_compare(phpversion(), self::$php_version, '>='), ], 'env_writable' => self::checkEnvWritable(), - //'dbs' => self::dbCheck(), //'mail' => self::testMailServer(), ]; } + private static function simpleDbCheck() :bool + { + $result = true; + + try { + $pdo = DB::connection()->getPdo(); + $result = true; + } + catch (\Exception $e) { + $result = false; + } + info("returning false"); + + return $result; + } + private static function extensions() :array { $loaded_extensions = []; diff --git a/app/Utils/Traits/AppSetup.php b/app/Utils/Traits/AppSetup.php index 9b60697b70e7..e0469f9d7e38 100644 --- a/app/Utils/Traits/AppSetup.php +++ b/app/Utils/Traits/AppSetup.php @@ -24,6 +24,6 @@ trait AppSetup $check = SystemHealth::check(); - return settype($check['system_health'], "bool"); // Do the system tests pass? + return $check == "true"; } } diff --git a/database/seeds/RandomDataSeeder.php b/database/seeds/RandomDataSeeder.php index c4eed11060dc..855dfecf51dc 100644 --- a/database/seeds/RandomDataSeeder.php +++ b/database/seeds/RandomDataSeeder.php @@ -265,29 +265,29 @@ class RandomDataSeeder extends Seeder ]); - // if (config('ninja.testvars.stripe')) { - // $cg = new CompanyGateway; - // $cg->company_id = $company->id; - // $cg->user_id = $user->id; - // $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23'; - // $cg->require_cvv = true; - // $cg->show_billing_address = true; - // $cg->show_shipping_address = true; - // $cg->update_details = true; - // $cg->config = encrypt(config('ninja.testvars.stripe')); - // $cg->save(); + if (config('ninja.testvars.stripe')) { + $cg = new CompanyGateway; + $cg->company_id = $company->id; + $cg->user_id = $user->id; + $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23'; + $cg->require_cvv = true; + $cg->show_billing_address = true; + $cg->show_shipping_address = true; + $cg->update_details = true; + $cg->config = encrypt(config('ninja.testvars.stripe')); + $cg->save(); - // $cg = new CompanyGateway; - // $cg->company_id = $company->id; - // $cg->user_id = $user->id; - // $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23'; - // $cg->require_cvv = true; - // $cg->show_billing_address = true; - // $cg->show_shipping_address = true; - // $cg->update_details = true; - // $cg->config = encrypt(config('ninja.testvars.stripe')); - // $cg->save(); - // } + $cg = new CompanyGateway; + $cg->company_id = $company->id; + $cg->user_id = $user->id; + $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23'; + $cg->require_cvv = true; + $cg->show_billing_address = true; + $cg->show_shipping_address = true; + $cg->update_details = true; + $cg->config = encrypt(config('ninja.testvars.stripe')); + $cg->save(); + } // if (config('ninja.testvars.paypal')) { // $cg = new CompanyGateway; @@ -315,18 +315,18 @@ class RandomDataSeeder extends Seeder // $cg->save(); // } - if(config('ninja.testvars.authorize')) { - $cg = new CompanyGateway; - $cg->company_id = $company->id; - $cg->user_id = $user->id; - $cg->gateway_key = '3b6621f970ab18887c4f6dca78d3f8bb'; - $cg->require_cvv = true; - $cg->show_billing_address = true; - $cg->show_shipping_address = true; - $cg->update_details = true; - $cg->config = encrypt(config('ninja.testvars.authorize')); - $cg->save(); - } + // if(config('ninja.testvars.authorize')) { + // $cg = new CompanyGateway; + // $cg->company_id = $company->id; + // $cg->user_id = $user->id; + // $cg->gateway_key = '3b6621f970ab18887c4f6dca78d3f8bb'; + // $cg->require_cvv = true; + // $cg->show_billing_address = true; + // $cg->show_shipping_address = true; + // $cg->update_details = true; + // $cg->config = encrypt(config('ninja.testvars.authorize')); + // $cg->save(); + // } } }