From 0d9df1f29075432945e755bb884066c82eaf155a Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 24 Aug 2020 08:20:57 +1000 Subject: [PATCH] Fixes for incorrect name spacing of validation rules --- app/Http/Controllers/MigrationController.php | 4 ++-- .../Credit/UniqueCreditNumberRule.php | 0 .../Quote/UniqueQuoteNumberRule.php | 0 app/Transformers/CompanyGatewayTransformer.php | 3 ++- 4 files changed, 4 insertions(+), 3 deletions(-) rename app/Http/{Requests => ValidationRules}/Credit/UniqueCreditNumberRule.php (100%) rename app/Http/{Requests => ValidationRules}/Quote/UniqueQuoteNumberRule.php (100%) diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php index 1e1b363c6d25..4b4c755cb3df 100644 --- a/app/Http/Controllers/MigrationController.php +++ b/app/Http/Controllers/MigrationController.php @@ -146,8 +146,8 @@ class MigrationController extends BaseController public function purgeCompanySaveSettings(Request $request, Company $company) { - $company->clients()->delete(); - $company->products()->delete(); + $company->clients()->forceDelete(); + $company->products()->forceDelete(); $company->save(); diff --git a/app/Http/Requests/Credit/UniqueCreditNumberRule.php b/app/Http/ValidationRules/Credit/UniqueCreditNumberRule.php similarity index 100% rename from app/Http/Requests/Credit/UniqueCreditNumberRule.php rename to app/Http/ValidationRules/Credit/UniqueCreditNumberRule.php diff --git a/app/Http/Requests/Quote/UniqueQuoteNumberRule.php b/app/Http/ValidationRules/Quote/UniqueQuoteNumberRule.php similarity index 100% rename from app/Http/Requests/Quote/UniqueQuoteNumberRule.php rename to app/Http/ValidationRules/Quote/UniqueQuoteNumberRule.php diff --git a/app/Transformers/CompanyGatewayTransformer.php b/app/Transformers/CompanyGatewayTransformer.php index 8261d2d4ec54..e14c9ffa0d81 100644 --- a/app/Transformers/CompanyGatewayTransformer.php +++ b/app/Transformers/CompanyGatewayTransformer.php @@ -27,7 +27,6 @@ class CompanyGatewayTransformer extends EntityTransformer * @var array */ protected $defaultIncludes = [ - 'gateway' ]; /** @@ -63,6 +62,8 @@ class CompanyGatewayTransformer extends EntityTransformer 'custom_value2' => $company_gateway->custom_value2 ?: '', 'custom_value3' => $company_gateway->custom_value3 ?: '', 'custom_value4' => $company_gateway->custom_value4 ?: '', + 'label' => (string)$company_gateway->label ?: '', + 'token_billing' => (string)$company_gateway->token_billing, ]; }