diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php index 955e4b3b7adb..1e1b363c6d25 100644 --- a/app/Http/Controllers/MigrationController.php +++ b/app/Http/Controllers/MigrationController.php @@ -147,6 +147,8 @@ class MigrationController extends BaseController { $company->clients()->delete(); + $company->products()->delete(); + $company->save(); return response()->json(['message' => 'Settings preserved'], 200); diff --git a/app/Repositories/ActivityRepository.php b/app/Repositories/ActivityRepository.php index 0875bcbb87ff..d66fdca93377 100644 --- a/app/Repositories/ActivityRepository.php +++ b/app/Repositories/ActivityRepository.php @@ -69,6 +69,7 @@ class ActivityRepository extends BaseRepository if (get_class($entity) == Invoice::class || get_class($entity) == Quote::class || get_class($entity) == Credit::class){ $contact = $entity->client->primary_contact()->first(); $backup->html_backup = $this->generateEntityHtml($entity->getEntityDesigner(), $entity, $contact); + $backup->amount = $entity->amount; } $backup->activity_id = $activity->id; diff --git a/app/Transformers/CreditTransformer.php b/app/Transformers/CreditTransformer.php index 988e5f1329a2..f9bf7ff61676 100644 --- a/app/Transformers/CreditTransformer.php +++ b/app/Transformers/CreditTransformer.php @@ -27,7 +27,6 @@ class CreditTransformer extends EntityTransformer protected $defaultIncludes = [ 'invitations', 'documents', - 'history', ]; protected $availableIncludes = [ diff --git a/app/Transformers/QuoteTransformer.php b/app/Transformers/QuoteTransformer.php index b20f6f95bf33..7621b80d8d83 100644 --- a/app/Transformers/QuoteTransformer.php +++ b/app/Transformers/QuoteTransformer.php @@ -27,7 +27,6 @@ class QuoteTransformer extends EntityTransformer protected $defaultIncludes = [ 'invitations', 'documents', - 'history' ]; protected $availableIncludes = [ diff --git a/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php b/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php index f5d7664aefa7..382ccf679fe6 100644 --- a/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php +++ b/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php @@ -16,6 +16,10 @@ class AddIsPublicToDocumentsTable extends Migration Schema::table('documents', function (Blueprint $table) { $table->boolean('is_public')->default(false); }); + + Schema::table('backups', function (Blueprint $table) { + $table->decimal('amount', 16, 4); + }); } /** @@ -25,8 +29,6 @@ class AddIsPublicToDocumentsTable extends Migration */ public function down() { - Schema::table('documents', function (Blueprint $table) { - $table->dropColumn('is_public'); - }); + } }