From e8b3390c4b6bb15080e173b667c024a8ccce9221 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 11 Aug 2020 11:33:43 +1000 Subject: [PATCH] Remove JSON backups from activities --- app/Helpers/Language/NinjaTranslator.php | 2 -- app/Repositories/ActivityRepository.php | 17 +++-------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/app/Helpers/Language/NinjaTranslator.php b/app/Helpers/Language/NinjaTranslator.php index 50517f903dad..0387a31b1f62 100644 --- a/app/Helpers/Language/NinjaTranslator.php +++ b/app/Helpers/Language/NinjaTranslator.php @@ -20,9 +20,7 @@ class NinjaTranslator extends Translator list($namespace, $group, $item) = $this->parseKey($key); if(null === $locale) - { $locale = $this->locale; - } // Load given group defaults if exists $this->load($namespace, $group, $locale); diff --git a/app/Repositories/ActivityRepository.php b/app/Repositories/ActivityRepository.php index 78394477f995..4bfef9c30d3d 100644 --- a/app/Repositories/ActivityRepository.php +++ b/app/Repositories/ActivityRepository.php @@ -64,12 +64,6 @@ class ActivityRepository extends BaseRepository { $backup = new Backup(); - // if(get_class($entity) == Client::class) - // $settings = $entity->getMergedSettings(); - // else - // $settings = $entity->client->getMergedSettings(); - // $entity->clientMergedDettings = $settings; - if (get_class($entity) == Client::class) { $entity->load('company'); } elseif (get_class($entity) == User::class) { @@ -77,15 +71,10 @@ class ActivityRepository extends BaseRepository $entity->load('company', 'client'); } - - if (get_class($entity) == Invoice::class && ($activity->activity_type_id == Activity::MARK_SENT_INVOICE || $activity->activity_type_id == Activity::PAID_INVOICE)) { - //$backup->html_backup = $this->generateInvoiceHtml($entity->design(), $entity); - $backup->html_backup = $this->generateEntityHtml($entity->getEntityDesigner(), $entity); - } - - + $backup->html_backup = $this->generateEntityHtml($entity->getEntityDesigner(), $entity); $backup->activity_id = $activity->id; - $backup->json_backup = $entity->toJson(); + $backup->json_backup = ''; + //$backup->json_backup = $entity->toJson(); $backup->save(); }