Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 03:17:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3856 from turbo124/v2

Browse Source 
Client can register
This commit is contained in:
David Bomba 2020-06-28 20:28:51 +10:00 committed by GitHub
commit c72c8181c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 59 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Transformers/CompanyTransformer.php
View File

@ -121,7 +121,8 @@ class CompanyTransformer extends EntityTransformer
'slack_webhook_url' => (string)$company->slack_webhook_url, 'slack_webhook_url' => (string)$company->slack_webhook_url,
'google_analytics_url' => (string)$company->google_analytics_key, //@deprecate 'google_analytics_url' => (string)$company->google_analytics_key, //@deprecate
'google_analytics_key' => (string)$company->google_analytics_key, '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,
]; ];
} }

27
app/Utils/SystemHealth.php
View File

@ -45,16 +45,18 @@ class SystemHealth
*/ */
public static function check() : array public static function check() : array
{ {
$system_health = true; $system_health = "true";
if (in_array(false, Arr::dot(self::extensions()))) { if (in_array(false, Arr::dot(self::extensions()))) {
$system_health = false; $system_health = "false";
} elseif (phpversion() < self::$php_version) { } elseif (phpversion() < self::$php_version) {
$system_health = false; $system_health = "false";
} elseif(!self::simpleDbCheck()) {
$system_health = "false";
} }
return [ return [
'system_health' => (bool) $system_health, 'system_health' => $system_health,
'extensions' => self::extensions(), 'extensions' => self::extensions(),
'php_version' => [ 'php_version' => [
'minimum_php_version' => self::$php_version, 'minimum_php_version' => self::$php_version,
@ -62,11 +64,26 @@ class SystemHealth
'is_okay' => version_compare(phpversion(), self::$php_version, '>='), 'is_okay' => version_compare(phpversion(), self::$php_version, '>='),
], ],
'env_writable' => self::checkEnvWritable(), 'env_writable' => self::checkEnvWritable(),
//'dbs' => self::dbCheck(),
//'mail' => self::testMailServer(), //'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 private static function extensions() :array
{ {
$loaded_extensions = []; $loaded_extensions = [];

2
app/Utils/Traits/AppSetup.php
View File

@ -24,6 +24,6 @@ trait AppSetup
$check = SystemHealth::check(); $check = SystemHealth::check();
return settype($check['system_health'], "bool"); // Do the system tests pass? return $check == "true";
} }
} }

68
database/seeds/RandomDataSeeder.php
View File

@ -265,29 +265,29 @@ class RandomDataSeeder extends Seeder
]); ]);
// if (config('ninja.testvars.stripe')) { if (config('ninja.testvars.stripe')) {
// $cg = new CompanyGateway; $cg = new CompanyGateway;
// $cg->company_id = $company->id; $cg->company_id = $company->id;
// $cg->user_id = $user->id; $cg->user_id = $user->id;
// $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23'; $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23';
// $cg->require_cvv = true; $cg->require_cvv = true;
// $cg->show_billing_address = true; $cg->show_billing_address = true;
// $cg->show_shipping_address = true; $cg->show_shipping_address = true;
// $cg->update_details = true; $cg->update_details = true;
// $cg->config = encrypt(config('ninja.testvars.stripe')); $cg->config = encrypt(config('ninja.testvars.stripe'));
// $cg->save(); $cg->save();
// $cg = new CompanyGateway; $cg = new CompanyGateway;
// $cg->company_id = $company->id; $cg->company_id = $company->id;
// $cg->user_id = $user->id; $cg->user_id = $user->id;
// $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23'; $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23';
// $cg->require_cvv = true; $cg->require_cvv = true;
// $cg->show_billing_address = true; $cg->show_billing_address = true;
// $cg->show_shipping_address = true; $cg->show_shipping_address = true;
// $cg->update_details = true; $cg->update_details = true;
// $cg->config = encrypt(config('ninja.testvars.stripe')); $cg->config = encrypt(config('ninja.testvars.stripe'));
// $cg->save(); $cg->save();
// } }
// if (config('ninja.testvars.paypal')) { // if (config('ninja.testvars.paypal')) {
// $cg = new CompanyGateway; // $cg = new CompanyGateway;
@ -315,18 +315,18 @@ class RandomDataSeeder extends Seeder
// $cg->save(); // $cg->save();
// } // }
if(config('ninja.testvars.authorize')) { // if(config('ninja.testvars.authorize')) {
$cg = new CompanyGateway; // $cg = new CompanyGateway;
$cg->company_id = $company->id; // $cg->company_id = $company->id;
$cg->user_id = $user->id; // $cg->user_id = $user->id;
$cg->gateway_key = '3b6621f970ab18887c4f6dca78d3f8bb'; // $cg->gateway_key = '3b6621f970ab18887c4f6dca78d3f8bb';
$cg->require_cvv = true; // $cg->require_cvv = true;
$cg->show_billing_address = true; // $cg->show_billing_address = true;
$cg->show_shipping_address = true; // $cg->show_shipping_address = true;
$cg->update_details = true; // $cg->update_details = true;
$cg->config = encrypt(config('ninja.testvars.authorize')); // $cg->config = encrypt(config('ninja.testvars.authorize'));
$cg->save(); // $cg->save();
} // }
} }
} }