From 3803daecffbc326a4cafe1df9f2aa0b7aeae5f7d Mon Sep 17 00:00:00 2001 From: Sumit Sharma Date: Fri, 14 Jan 2022 21:58:34 +0530 Subject: [PATCH] fix: Updates activity log status format --- src/controllers/FilesController.php | 2 +- src/controllers/OrderController.php | 12 ++++++------ src/services/repository/DraftRepository.php | 10 +++++++--- .../translator/AcclaroTranslationService.php | 4 +++- .../translator/Export_ImportTranslationService.php | 5 +++-- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/controllers/FilesController.php b/src/controllers/FilesController.php index d80da5c3..2b9c054e 100644 --- a/src/controllers/FilesController.php +++ b/src/controllers/FilesController.php @@ -123,7 +123,7 @@ public function actionCreateExportZip() if ($order->status !== ($newStatus = Translations::$plugin->orderRepository->getNewStatus($order))) { $order->status = $newStatus; - $order->logActivity(sprintf('Order status changed to %s', $order->getStatusLabel())); + $order->logActivity(sprintf('Order status changed to \'%s\'', $order->getStatusLabel())); } } diff --git a/src/controllers/OrderController.php b/src/controllers/OrderController.php index e1f0b004..27a3057b 100644 --- a/src/controllers/OrderController.php +++ b/src/controllers/OrderController.php @@ -386,11 +386,11 @@ public function actionSaveOrder() // This is for draft converting to order. $order = $this->service->getOrderById($orderId); - $order->logActivity(Translations::$plugin->translator->translate('app', 'Order Created')); + $order->logActivity(Translations::$plugin->translator->translate('app', 'Order created')); } else { $order = $this->service->makeNewOrder($sourceSite); - $order->logActivity(Translations::$plugin->translator->translate('app', 'Order Created')); + $order->logActivity(Translations::$plugin->translator->translate('app', 'Order created')); } $job = ''; @@ -597,7 +597,7 @@ public function actionSaveOrder() } $order->logActivity(sprintf( - Translations::$plugin->translator->translate('app', 'Order Submitted to %s'), + Translations::$plugin->translator->translate('app', 'Order submitted to %s'), $order->translator->getName() )); } @@ -1430,7 +1430,7 @@ public function actionUpdateOrderFilesSource() if ($isDefaultTranslator && !$order->isModified()) { $order->status = Constants::ORDER_STATUS_MODIFIED; $order->logActivity(sprintf( - Translations::$plugin->translator->translate('app', 'Order status changed to %s'), + Translations::$plugin->translator->translate('app', 'Order status changed to \'%s\''), $order->getStatusLabel() )); } @@ -1448,7 +1448,7 @@ public function actionUpdateOrderFilesSource() $order->status = Translations::$plugin->orderRepository->getNewStatus($order); $order->logActivity(sprintf( - Translations::$plugin->translator->translate('app', 'Order status changed to %s'), + Translations::$plugin->translator->translate('app', 'Order status changed to \'%s\''), $order->getStatusLabel() )); @@ -1468,7 +1468,7 @@ public function actionUpdateOrderFilesSource() Craft::$app->getSession()->setNotice('Entries Updated.'); } catch (\Exception $e) { $transaction->rollBack(); - Craft::debug($e, 'bhu123'); + return $this->asJson(['success' => false, 'message' => 'Error updating source. Error: ' . $e->getMessage()]); } diff --git a/src/services/repository/DraftRepository.php b/src/services/repository/DraftRepository.php index 386c89f8..05503dab 100644 --- a/src/services/repository/DraftRepository.php +++ b/src/services/repository/DraftRepository.php @@ -211,10 +211,14 @@ public function createOrderDrafts($orderId, $wordCounts, $publish, $fileIds, $qu } } - $order->status = Translations::$plugin->orderRepository->getNewStatus($order); - if ($isNewDraft) - $order->logActivity(Translations::$plugin->translator->translate('app', 'Drafts created')); + $order->logActivity(Translations::$plugin->translator->translate('app', 'Drafts created')); + + $newStatus = Translations::$plugin->orderRepository->getNewStatus($order); + if ($order->status != $newStatus) { + $order->status = $newStatus; + $order->logActivity(sprintf('Order status changed to \'%s\'', $order->getStatusLabel())); + } Translations::$plugin->orderRepository->saveOrder($order); } diff --git a/src/services/translator/AcclaroTranslationService.php b/src/services/translator/AcclaroTranslationService.php index 7862497c..4ca4e6d2 100644 --- a/src/services/translator/AcclaroTranslationService.php +++ b/src/services/translator/AcclaroTranslationService.php @@ -13,6 +13,7 @@ use Craft; use craft\elements\Asset; use craft\elements\GlobalSet; +use craft\helpers\ElementHelper; use acclaro\translations\Constants; use acclaro\translations\Translations; @@ -96,8 +97,9 @@ public function updateOrder(Order $order) $orderStatus = Translations::$plugin->orderRepository->getNewStatus($order); if ($order->status !== $orderStatus) { + $order->status = $orderStatus; $order->logActivity( - sprintf(Translations::$plugin->translator->translate('app', 'Order status changed to %s'), $orderStatus) + sprintf(Translations::$plugin->translator->translate('app', 'Order status changed to \'%s\''), $order->getStatusLabel()) ); } diff --git a/src/services/translator/Export_ImportTranslationService.php b/src/services/translator/Export_ImportTranslationService.php index ba5c42a7..f3b94ecb 100644 --- a/src/services/translator/Export_ImportTranslationService.php +++ b/src/services/translator/Export_ImportTranslationService.php @@ -57,8 +57,9 @@ public function updateOrder(Order $order) { $newStatus = Translations::$plugin->orderRepository->getNewStatus($order); if ($order->status !== $newStatus) { + $order->status = $newStatus; $order->logActivity( - sprintf(Translations::$plugin->translator->translate('app', 'Order status changed to %s'), $newStatus) + sprintf(Translations::$plugin->translator->translate('app', 'Order status changed to \'%s\''), $order->getStatusLabel()) ); } @@ -120,7 +121,7 @@ public function updateDraft($element, $draft, $translatedContent, $sourceSite, $ $errorMessage .= implode('; ', $r); } $order->logActivity( - Translations::$plugin->translator->translate('app', 'error saving drafts content. Error: '.$errorMessage) + Translations::$plugin->translator->translate('app', 'Error saving drafts content. Error: '.$errorMessage) ); } else { $order->logActivity(