AC-1726 Solved Order gift message issue and conflicts

engcom-Charlie · engcom-Charlie · commit ccf2225b433f · 2022-09-12T23:42:06.000+05:30
diff --git a/app/code/Magento/GiftMessageGraphQl/Model/Resolver/Order/GiftMessage.php b/app/code/Magento/GiftMessageGraphQl/Model/Resolver/Order/GiftMessage.php
@@ -76,7 +76,8 @@ public function resolve(
             throw new GraphQlInputException(__('"id" value should be specified'));
         }
 
-        $orderId = $this->uidEncoder->decode((string) $this->uidEncoder->encode((string) $value['id']));
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $orderId = (int)base64_decode($value['id']) ?: (int)$value['id'];
 
         try {
             $orderGiftMessage = $this->orderRepository->get($orderId);

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@ public function resolve(`
`76`	`76`	`throw new GraphQlInputException(__('"id" value should be specified'));`
`77`	`77`	`}`
`78`	`78`
`79`		`- $orderId = $this->uidEncoder->decode((string) $this->uidEncoder->encode((string) $value['id']));`
	`79`	`+ // phpcs:ignore Magento2.Functions.DiscouragedFunction`
	`80`	`+ $orderId = (int)base64_decode($value['id']) ?: (int)$value['id'];`
`80`	`81`
`81`	`82`	`try {`
`82`	`83`	`$orderGiftMessage = $this->orderRepository->get($orderId);`