Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Updates activity log status format #290

Merged
merged 1 commit into from
Jan 14, 2022
Merged

fix: Updates activity log status format #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/controllers/FilesController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/controllers/OrderController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '';
Expand Down Expand Up @@ -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()
));
}
Expand Down Expand Up @@ -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()
));
}
Expand All @@ -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()
));

Expand All @@ -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()]);
}

Expand Down
10 changes: 7 additions & 3 deletions src/services/repository/DraftRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 3 additions & 1 deletion src/services/translator/AcclaroTranslationService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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())
);
}

Expand Down
5 changes: 3 additions & 2 deletions src/services/translator/Export_ImportTranslationService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
);

}
Expand Down Expand Up @@ -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(
Expand Down