From 24dbff241be13a6dca0ecdf072d59e8d8e2b7a1e Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 31 Aug 2019 09:36:23 -0700
Subject: [PATCH] (stable) Clean up two straggling UI issues in Phortune

Ref T13401. The checkout UI didn't get fully updated to the new View objects,
and account handles are still manually building a URI that goes to the wrong
place.
---
 .../controller/cart/PhortuneCartCheckoutController.php | 10 +++-------
 .../phortune/phid/PhortuneAccountPHIDType.php          |  7 +++----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php b/src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php
index 793187c404..cbd434c900 100644
--- a/src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php
+++ b/src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php
@@ -101,13 +101,9 @@ final class PhortuneCartCheckoutController
       }
     }
 
-    $cart_table = $this->buildCartContentTable($cart);
-
-    $cart_box = id(new PHUIObjectBoxView())
-      ->setFormErrors($errors)
-      ->setHeaderText(pht('Cart Contents'))
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
-      ->setTable($cart_table);
+    $cart_box = id(new PhortuneOrderItemsView())
+      ->setViewer($viewer)
+      ->setOrder($cart);
 
     $title = $cart->getName();
 
diff --git a/src/applications/phortune/phid/PhortuneAccountPHIDType.php b/src/applications/phortune/phid/PhortuneAccountPHIDType.php
index cf5f5d06f2..90632a980d 100644
--- a/src/applications/phortune/phid/PhortuneAccountPHIDType.php
+++ b/src/applications/phortune/phid/PhortuneAccountPHIDType.php
@@ -32,10 +32,9 @@ final class PhortuneAccountPHIDType extends PhabricatorPHIDType {
     foreach ($handles as $phid => $handle) {
       $account = $objects[$phid];
 
-      $id = $account->getID();
-
-      $handle->setName($account->getName());
-      $handle->setURI("/phortune/{$id}/");
+      $handle
+        ->setName($account->getName())
+        ->setURI($account->getURI());
     }
   }