Skip to content

Commit 60cdc50

Browse files
committed
Fix encoding
1 parent b231b92 commit 60cdc50

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

src/elements/actions/UpdateOrderStatus.php

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
use Craft;
1111
use craft\base\ElementAction;
1212
use craft\commerce\elements\Order;
13+
use craft\commerce\models\OrderStatus;
1314
use craft\commerce\Plugin;
1415
use craft\elements\db\ElementQueryInterface;
16+
use craft\helpers\Html;
1517
use craft\helpers\Json;
1618

1719
/**
@@ -52,7 +54,17 @@ public function getTriggerLabel(): string
5254
*/
5355
public function getTriggerHtml(): ?string
5456
{
55-
$orderStatuses = Json::encode(array_values(Plugin::getInstance()->getOrderStatuses()->getAllOrderStatuses()));
57+
$orderStatuses = collect(Plugin::getInstance()->getOrderStatuses()->getAllOrderStatuses())
58+
->map(function(OrderStatus $orderStatus) {
59+
// Encode for output in JS
60+
$orderStatus->name = Html::encode($orderStatus->name);
61+
$orderStatus->color = Html::encode($orderStatus->color);
62+
$orderStatus->description = Html::encode($orderStatus->description);
63+
64+
return $orderStatus;
65+
});
66+
67+
$orderStatuses = Json::encode(array_values($orderStatuses->all()));
5668
$type = Json::encode(static::class);
5769

5870
$js = <<<EOT

0 commit comments

Comments
 (0)