+8

src/__phutil_library_map__.php

reviewed

··· 2571 2571 'PhortuneCartUpdateController' => 'applications/phortune/controller/PhortuneCartUpdateController.php', 2572 2572 'PhortuneCartViewController' => 'applications/phortune/controller/PhortuneCartViewController.php', 2573 2573 'PhortuneCharge' => 'applications/phortune/storage/PhortuneCharge.php', 2574 2574 + 'PhortuneChargeListController' => 'applications/phortune/controller/PhortuneChargeListController.php', 2574 2575 'PhortuneChargePHIDType' => 'applications/phortune/phid/PhortuneChargePHIDType.php', 2575 2576 'PhortuneChargeQuery' => 'applications/phortune/query/PhortuneChargeQuery.php', 2577 2577 + 'PhortuneChargeSearchEngine' => 'applications/phortune/query/PhortuneChargeSearchEngine.php', 2578 2578 + 'PhortuneChargeTableView' => 'applications/phortune/view/PhortuneChargeTableView.php', 2576 2579 'PhortuneConstants' => 'applications/phortune/constants/PhortuneConstants.php', 2577 2580 'PhortuneController' => 'applications/phortune/controller/PhortuneController.php', 2578 2581 'PhortuneCreditCardForm' => 'applications/phortune/view/PhortuneCreditCardForm.php', ··· 2601 2604 'PhortuneMultiplePaymentProvidersException' => 'applications/phortune/exception/PhortuneMultiplePaymentProvidersException.php', 2602 2605 'PhortuneNoPaymentProviderException' => 'applications/phortune/exception/PhortuneNoPaymentProviderException.php', 2603 2606 'PhortuneNotImplementedException' => 'applications/phortune/exception/PhortuneNotImplementedException.php', 2607 2607 + 'PhortuneOrderTableView' => 'applications/phortune/view/PhortuneOrderTableView.php', 2604 2608 'PhortunePayPalPaymentProvider' => 'applications/phortune/provider/PhortunePayPalPaymentProvider.php', 2605 2609 'PhortunePaymentMethod' => 'applications/phortune/storage/PhortunePaymentMethod.php', 2606 2610 'PhortunePaymentMethodCreateController' => 'applications/phortune/controller/PhortunePaymentMethodCreateController.php', ··· 5637 5641 'PhortuneDAO', 5638 5642 'PhabricatorPolicyInterface', 5639 5643 ), 5644 5644 + 'PhortuneChargeListController' => 'PhortuneController', 5640 5645 'PhortuneChargePHIDType' => 'PhabricatorPHIDType', 5641 5646 'PhortuneChargeQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 5647 5647 + 'PhortuneChargeSearchEngine' => 'PhabricatorApplicationSearchEngine', 5648 5648 + 'PhortuneChargeTableView' => 'AphrontView', 5642 5649 'PhortuneController' => 'PhabricatorController', 5643 5650 'PhortuneCurrency' => 'Phobject', 5644 5651 'PhortuneCurrencySerializer' => 'PhabricatorLiskSerializer', ··· 5668 5675 'PhortuneMultiplePaymentProvidersException' => 'Exception', 5669 5676 'PhortuneNoPaymentProviderException' => 'Exception', 5670 5677 'PhortuneNotImplementedException' => 'Exception', 5678 5678 + 'PhortuneOrderTableView' => 'AphrontView', 5671 5679 'PhortunePayPalPaymentProvider' => 'PhortunePaymentProvider', 5672 5680 'PhortunePaymentMethod' => array( 5673 5681 'PhortuneDAO',

+4

src/applications/phortune/application/PhabricatorPhortuneApplication.php

reviewed

··· 39 39 'card/' => array( 40 40 'new/' => 'PhortunePaymentMethodCreateController', 41 41 ), 42 42 + 'order/(?:query/(?P<queryKey>[^/]+)/)?' 43 43 + => 'PhortuneCartListController', 44 44 + 'charge/(?:query/(?P<queryKey>[^/]+)/)?' 45 45 + => 'PhortuneChargeListController', 42 46 ), 43 47 'card/(?P<id>\d+)/' => array( 44 48 'edit/' => 'PhortunePaymentMethodEditController',

+2 -2

src/applications/phortune/controller/PhortuneAccountListController.php

reviewed

··· 83 83 ->setHref($this->getApplicationURI('merchant/')) 84 84 ->setIcon( 85 85 id(new PHUIIconView()) 86 86 - ->setIconFont('fa-folder-open')) 87 87 - ->setText(pht('Browse Merchants'))); 86 86 + ->setIconFont('fa-list')) 87 87 + ->setText(pht('View All Merchants'))); 88 88 89 89 $merchant_box = id(new PHUIObjectBoxView()) 90 90 ->setHeader($merchant_header)

+47 -65

src/applications/phortune/controller/PhortuneAccountViewController.php

reviewed

··· 179 179 PhortuneCart::STATUS_REVIEW, 180 180 PhortuneCart::STATUS_PURCHASED, 181 181 )) 182 182 + ->setLimit(10) 182 183 ->execute(); 183 184 184 185 $phids = array(); ··· 190 191 } 191 192 $handles = $this->loadViewerHandles($phids); 192 193 193 193 - $rows = array(); 194 194 - $rowc = array(); 195 195 - foreach ($carts as $cart) { 196 196 - $cart_link = $handles[$cart->getPHID()]->renderLink(); 197 197 - $purchases = $cart->getPurchases(); 198 198 - 199 199 - if (count($purchases) == 1) { 200 200 - $purchase_name = $handles[$purchase->getPHID()]->renderLink(); 201 201 - $purchases = array(); 202 202 - } else { 203 203 - $purchase_name = ''; 204 204 - } 205 205 - 206 206 - $rowc[] = ''; 207 207 - $rows[] = array( 208 208 - $cart->getID(), 209 209 - phutil_tag( 210 210 - 'strong', 211 211 - array(), 212 212 - $cart_link), 213 213 - $purchase_name, 214 214 - phutil_tag( 215 215 - 'strong', 216 216 - array(), 217 217 - $cart->getTotalPriceAsCurrency()->formatForDisplay()), 218 218 - PhortuneCart::getNameForStatus($cart->getStatus()), 219 219 - phabricator_datetime($cart->getDateModified(), $viewer), 220 220 - ); 221 221 - foreach ($purchases as $purchase) { 222 222 - $id = $purchase->getID(); 223 223 - 224 224 - $price = $purchase->getTotalPriceAsCurrency()->formatForDisplay(); 225 225 - 226 226 - $rowc[] = ''; 227 227 - $rows[] = array( 228 228 - '', 229 229 - $handles[$purchase->getPHID()]->renderLink(), 230 230 - $price, 231 231 - '', 232 232 - '', 233 233 - ); 234 234 - } 235 235 - } 194 194 + $orders_uri = $this->getApplicationURI($account->getID().'/order/'); 236 195 237 237 - $table = id(new AphrontTableView($rows)) 238 238 - ->setRowClasses($rowc) 239 239 - ->setHeaders( 240 240 - array( 241 241 - pht('ID'), 242 242 - pht('Order'), 243 243 - pht('Purchase'), 244 244 - pht('Amount'), 245 245 - pht('Status'), 246 246 - pht('Updated'), 247 247 - )) 248 248 - ->setColumnClasses( 249 249 - array( 250 250 - '', 251 251 - '', 252 252 - 'wide', 253 253 - 'right', 254 254 - '', 255 255 - 'right', 256 256 - )); 196 196 + $table = id(new PhortuneOrderTableView()) 197 197 + ->setUser($viewer) 198 198 + ->setCarts($carts) 199 199 + ->setHandles($handles); 257 200 258 201 $header = id(new PHUIHeaderView()) 259 259 - ->setHeader(pht('Order History')); 202 202 + ->setHeader(pht('Recent Orders')) 203 203 + ->addActionLink( 204 204 + id(new PHUIButtonView()) 205 205 + ->setTag('a') 206 206 + ->setIcon( 207 207 + id(new PHUIIconView()) 208 208 + ->setIconFont('fa-list')) 209 209 + ->setHref($orders_uri) 210 210 + ->setText(pht('View All Orders'))); 260 211 261 212 return id(new PHUIObjectBoxView()) 262 213 ->setHeader($header) ··· 271 222 ->setViewer($viewer) 272 223 ->withAccountPHIDs(array($account->getPHID())) 273 224 ->needCarts(true) 225 225 + ->setLimit(10) 274 226 ->execute(); 275 227 276 276 - return $this->buildChargesTable($charges); 228 228 + $phids = array(); 229 229 + foreach ($charges as $charge) { 230 230 + $phids[] = $charge->getProviderPHID(); 231 231 + $phids[] = $charge->getCartPHID(); 232 232 + $phids[] = $charge->getMerchantPHID(); 233 233 + $phids[] = $charge->getPaymentMethodPHID(); 234 234 + } 235 235 + 236 236 + $handles = $this->loadViewerHandles($phids); 237 237 + 238 238 + $charges_uri = $this->getApplicationURI($account->getID().'/charge/'); 239 239 + 240 240 + $table = id(new PhortuneChargeTableView()) 241 241 + ->setUser($viewer) 242 242 + ->setCharges($charges) 243 243 + ->setHandles($handles); 244 244 + 245 245 + $header = id(new PHUIHeaderView()) 246 246 + ->setHeader(pht('Recent Charges')) 247 247 + ->addActionLink( 248 248 + id(new PHUIButtonView()) 249 249 + ->setTag('a') 250 250 + ->setIcon( 251 251 + id(new PHUIIconView()) 252 252 + ->setIconFont('fa-list')) 253 253 + ->setHref($charges_uri) 254 254 + ->setText(pht('View All Charges'))); 255 255 + 256 256 + return id(new PHUIObjectBoxView()) 257 257 + ->setHeader($header) 258 258 + ->appendChild($table); 277 259 } 278 260 279 261 private function buildAccountHistorySection(PhortuneAccount $account) {

+31

src/applications/phortune/controller/PhortuneCartListController.php

reviewed

··· 3 3 final class PhortuneCartListController 4 4 extends PhortuneController { 5 5 6 6 + private $accountID; 6 7 private $merchantID; 7 8 private $queryKey; 8 9 9 10 private $merchant; 11 11 + private $account; 10 12 11 13 public function willProcessRequest(array $data) { 12 14 $this->merchantID = idx($data, 'merchantID'); 15 15 + $this->accountID = idx($data, 'accountID'); 13 16 $this->queryKey = idx($data, 'queryKey'); 14 17 } 15 18 ··· 34 37 } 35 38 $this->merchant = $merchant; 36 39 $engine->setMerchant($merchant); 40 40 + } else if ($this->accountID) { 41 41 + $account = id(new PhortuneAccountQuery()) 42 42 + ->setViewer($viewer) 43 43 + ->withIDs(array($this->accountID)) 44 44 + ->requireCapabilities( 45 45 + array( 46 46 + PhabricatorPolicyCapability::CAN_VIEW, 47 47 + PhabricatorPolicyCapability::CAN_EDIT, 48 48 + )) 49 49 + ->executeOne(); 50 50 + if (!$account) { 51 51 + return new Aphront404Response(); 52 52 + } 53 53 + $this->account = $account; 54 54 + $engine->setAccount($account); 55 55 + } else { 56 56 + return new Aphront404Response(); 37 57 } 38 58 39 59 $controller = id(new PhabricatorApplicationSearchController($request)) ··· 71 91 $crumbs->addTextCrumb( 72 92 pht('Orders'), 73 93 $this->getApplicationURI("merchant/orders/{$id}/")); 94 94 + } 95 95 + 96 96 + $account = $this->account; 97 97 + if ($account) { 98 98 + $id = $account->getID(); 99 99 + $crumbs->addTextCrumb( 100 100 + $account->getName(), 101 101 + $this->getApplicationURI("{$id}/")); 102 102 + $crumbs->addTextCrumb( 103 103 + pht('Orders'), 104 104 + $this->getApplicationURI("{$id}/order/")); 74 105 } 75 106 76 107 return $crumbs;

+19 -2

src/applications/phortune/controller/PhortuneCartViewController.php

reviewed

··· 135 135 ->needCarts(true) 136 136 ->execute(); 137 137 138 138 - $charges_table = $this->buildChargesTable($charges, false); 138 138 + $phids = array(); 139 139 + foreach ($charges as $charge) { 140 140 + $phids[] = $charge->getProviderPHID(); 141 141 + $phids[] = $charge->getCartPHID(); 142 142 + $phids[] = $charge->getMerchantPHID(); 143 143 + $phids[] = $charge->getPaymentMethodPHID(); 144 144 + } 145 145 + $handles = $this->loadViewerHandles($phids); 146 146 + 147 147 + $charges_table = id(new PhortuneChargeTableView()) 148 148 + ->setUser($viewer) 149 149 + ->setHandles($handles) 150 150 + ->setCharges($charges) 151 151 + ->setShowOrder(false); 152 152 + 153 153 + $charges = id(new PHUIObjectBoxView()) 154 154 + ->setHeaderText(pht('Charges')) 155 155 + ->appendChild($charges_table); 139 156 140 157 $account = $cart->getAccount(); 141 158 ··· 147 164 array( 148 165 $crumbs, 149 166 $cart_box, 150 150 - $charges_table, 167 167 + $charges, 151 168 ), 152 169 array( 153 170 'title' => pht('Cart'),

+81

src/applications/phortune/controller/PhortuneChargeListController.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class PhortuneChargeListController 4 4 + extends PhortuneController { 5 5 + 6 6 + private $accountID; 7 7 + private $queryKey; 8 8 + 9 9 + private $account; 10 10 + 11 11 + public function willProcessRequest(array $data) { 12 12 + $this->accountID = idx($data, 'accountID'); 13 13 + $this->queryKey = idx($data, 'queryKey'); 14 14 + } 15 15 + 16 16 + public function processRequest() { 17 17 + $request = $this->getRequest(); 18 18 + $viewer = $request->getUser(); 19 19 + 20 20 + $engine = new PhortuneChargeSearchEngine(); 21 21 + 22 22 + if ($this->accountID) { 23 23 + $account = id(new PhortuneAccountQuery()) 24 24 + ->setViewer($viewer) 25 25 + ->withIDs(array($this->accountID)) 26 26 + ->requireCapabilities( 27 27 + array( 28 28 + PhabricatorPolicyCapability::CAN_VIEW, 29 29 + PhabricatorPolicyCapability::CAN_EDIT, 30 30 + )) 31 31 + ->executeOne(); 32 32 + if (!$account) { 33 33 + return new Aphront404Response(); 34 34 + } 35 35 + $this->account = $account; 36 36 + $engine->setAccount($account); 37 37 + } else { 38 38 + return new Aphront404Response(); 39 39 + } 40 40 + 41 41 + $controller = id(new PhabricatorApplicationSearchController($request)) 42 42 + ->setQueryKey($this->queryKey) 43 43 + ->setSearchEngine($engine) 44 44 + ->setNavigation($this->buildSideNavView()); 45 45 + 46 46 + return $this->delegateToController($controller); 47 47 + } 48 48 + 49 49 + public function buildSideNavView() { 50 50 + $viewer = $this->getRequest()->getUser(); 51 51 + 52 52 + $nav = new AphrontSideNavFilterView(); 53 53 + $nav->setBaseURI(new PhutilURI($this->getApplicationURI())); 54 54 + 55 55 + id(new PhortuneChargeSearchEngine()) 56 56 + ->setViewer($viewer) 57 57 + ->addNavigationItems($nav->getMenu()); 58 58 + 59 59 + $nav->selectFilter(null); 60 60 + 61 61 + return $nav; 62 62 + } 63 63 + 64 64 + public function buildApplicationCrumbs() { 65 65 + $crumbs = parent::buildApplicationCrumbs(); 66 66 + 67 67 + $account = $this->account; 68 68 + if ($account) { 69 69 + $id = $account->getID(); 70 70 + $crumbs->addTextCrumb( 71 71 + $account->getName(), 72 72 + $this->getApplicationURI("{$id}/")); 73 73 + $crumbs->addTextCrumb( 74 74 + pht('Charges'), 75 75 + $this->getApplicationURI("{$id}/charge/")); 76 76 + } 77 77 + 78 78 + return $crumbs; 79 79 + } 80 80 + 81 81 + }

-67

src/applications/phortune/controller/PhortuneController.php

reviewed

··· 2 2 3 3 abstract class PhortuneController extends PhabricatorController { 4 4 5 5 - protected function buildChargesTable(array $charges, $show_cart = true) { 6 6 - $request = $this->getRequest(); 7 7 - $viewer = $request->getUser(); 8 8 - 9 9 - $phids = array(); 10 10 - foreach ($charges as $charge) { 11 11 - $phids[] = $charge->getProviderPHID(); 12 12 - $phids[] = $charge->getCartPHID(); 13 13 - $phids[] = $charge->getMerchantPHID(); 14 14 - $phids[] = $charge->getPaymentMethodPHID(); 15 15 - } 16 16 - 17 17 - $handles = $this->loadViewerHandles($phids); 18 18 - 19 19 - $rows = array(); 20 20 - foreach ($charges as $charge) { 21 21 - $rows[] = array( 22 22 - $charge->getID(), 23 23 - $handles[$charge->getCartPHID()]->renderLink(), 24 24 - $handles[$charge->getProviderPHID()]->renderLink(), 25 25 - $charge->getPaymentMethodPHID() 26 26 - ? $handles[$charge->getPaymentMethodPHID()]->renderLink() 27 27 - : null, 28 28 - $handles[$charge->getMerchantPHID()]->renderLink(), 29 29 - $charge->getAmountAsCurrency()->formatForDisplay(), 30 30 - $charge->getStatusForDisplay(), 31 31 - phabricator_datetime($charge->getDateCreated(), $viewer), 32 32 - ); 33 33 - } 34 34 - 35 35 - $charge_table = id(new AphrontTableView($rows)) 36 36 - ->setHeaders( 37 37 - array( 38 38 - pht('ID'), 39 39 - pht('Cart'), 40 40 - pht('Provider'), 41 41 - pht('Method'), 42 42 - pht('Merchant'), 43 43 - pht('Amount'), 44 44 - pht('Status'), 45 45 - pht('Created'), 46 46 - )) 47 47 - ->setColumnClasses( 48 48 - array( 49 49 - '', 50 50 - '', 51 51 - '', 52 52 - '', 53 53 - '', 54 54 - 'wide right', 55 55 - '', 56 56 - '', 57 57 - )) 58 58 - ->setColumnVisibility( 59 59 - array( 60 60 - true, 61 61 - $show_cart, 62 62 - )); 63 63 - 64 64 - $header = id(new PHUIHeaderView()) 65 65 - ->setHeader(pht('Charge History')); 66 66 - 67 67 - return id(new PHUIObjectBoxView()) 68 68 - ->setHeader($header) 69 69 - ->appendChild($charge_table); 70 70 - } 71 71 - 72 5 protected function addAccountCrumb( 73 6 $crumbs, 74 7 PhortuneAccount $account,

+27 -1

src/applications/phortune/query/PhortuneCartSearchEngine.php

reviewed

··· 4 4 extends PhabricatorApplicationSearchEngine { 5 5 6 6 private $merchant; 7 7 + private $account; 8 8 + 9 9 + public function setAccount(PhortuneAccount $account) { 10 10 + $this->account = $account; 11 11 + return $this; 12 12 + } 13 13 + 14 14 + public function getAccount() { 15 15 + return $this->account; 16 16 + } 7 17 8 18 public function setMerchant(PhortuneMerchant $merchant) { 9 19 $this->merchant = $merchant; ··· 39 49 $viewer = $this->requireViewer(); 40 50 41 51 $merchant = $this->getMerchant(); 52 52 + $account = $this->getAccount(); 42 53 if ($merchant) { 43 54 $can_edit = PhabricatorPolicyFilter::hasCapability( 44 55 $viewer, ··· 49 60 pht('You can not query orders for a merchant you do not control.')); 50 61 } 51 62 $query->withMerchantPHIDs(array($merchant->getPHID())); 63 63 + } else if ($account) { 64 64 + $can_edit = PhabricatorPolicyFilter::hasCapability( 65 65 + $viewer, 66 66 + $account, 67 67 + PhabricatorPolicyCapability::CAN_EDIT); 68 68 + if (!$can_edit) { 69 69 + throw new Exception( 70 70 + pht( 71 71 + 'You can not query orders for an account you are not '. 72 72 + 'a member of.')); 73 73 + } 74 74 + $query->withAccountPHIDs(array($account->getPHID())); 52 75 } else { 53 76 $accounts = id(new PhortuneAccountQuery()) 54 54 - ->withMemberPHIDs($viewer->getPHID()) 77 77 + ->withMemberPHIDs(array($viewer->getPHID())) 55 78 ->execute(); 56 79 if ($accounts) { 57 80 $query->withAccountPHIDs(mpull($accounts, 'getPHID')); ··· 69 92 70 93 protected function getURI($path) { 71 94 $merchant = $this->getMerchant(); 95 95 + $account = $this->getAccount(); 72 96 if ($merchant) { 73 97 return '/phortune/merchant/'.$merchant->getID().'/order/'.$path; 98 98 + } else if ($account) { 99 99 + return '/phortune/'.$account->getID().'/order/'; 74 100 } else { 75 101 return '/phortune/order/'.$path; 76 102 }

+125

src/applications/phortune/query/PhortuneChargeSearchEngine.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class PhortuneChargeSearchEngine 4 4 + extends PhabricatorApplicationSearchEngine { 5 5 + 6 6 + private $account; 7 7 + 8 8 + public function setAccount(PhortuneAccount $account) { 9 9 + $this->account = $account; 10 10 + return $this; 11 11 + } 12 12 + 13 13 + public function getAccount() { 14 14 + return $this->account; 15 15 + } 16 16 + 17 17 + public function getResultTypeDescription() { 18 18 + return pht('Phortune Charges'); 19 19 + } 20 20 + 21 21 + public function buildSavedQueryFromRequest(AphrontRequest $request) { 22 22 + $saved = new PhabricatorSavedQuery(); 23 23 + 24 24 + return $saved; 25 25 + } 26 26 + 27 27 + public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) { 28 28 + $query = id(new PhortuneChargeQuery()); 29 29 + 30 30 + $viewer = $this->requireViewer(); 31 31 + 32 32 + $account = $this->getAccount(); 33 33 + if ($account) { 34 34 + $can_edit = PhabricatorPolicyFilter::hasCapability( 35 35 + $viewer, 36 36 + $account, 37 37 + PhabricatorPolicyCapability::CAN_EDIT); 38 38 + if (!$can_edit) { 39 39 + throw new Exception( 40 40 + pht( 41 41 + 'You can not query charges for an account you are not '. 42 42 + 'a member of.')); 43 43 + } 44 44 + $query->withAccountPHIDs(array($account->getPHID())); 45 45 + } else { 46 46 + $accounts = id(new PhortuneAccountQuery()) 47 47 + ->withMemberPHIDs(array($viewer->getPHID())) 48 48 + ->execute(); 49 49 + if ($accounts) { 50 50 + $query->withAccountPHIDs(mpull($accounts, 'getPHID')); 51 51 + } else { 52 52 + throw new Exception(pht('You have no accounts!')); 53 53 + } 54 54 + } 55 55 + 56 56 + return $query; 57 57 + } 58 58 + 59 59 + public function buildSearchForm( 60 60 + AphrontFormView $form, 61 61 + PhabricatorSavedQuery $saved_query) {} 62 62 + 63 63 + protected function getURI($path) { 64 64 + $account = $this->getAccount(); 65 65 + if ($account) { 66 66 + return '/phortune/'.$account->getID().'/charge/'; 67 67 + } else { 68 68 + return '/phortune/charge/'.$path; 69 69 + } 70 70 + } 71 71 + 72 72 + public function getBuiltinQueryNames() { 73 73 + $names = array( 74 74 + 'all' => pht('All Charges'), 75 75 + ); 76 76 + 77 77 + return $names; 78 78 + } 79 79 + 80 80 + public function buildSavedQueryFromBuiltin($query_key) { 81 81 + 82 82 + $query = $this->newSavedQuery(); 83 83 + $query->setQueryKey($query_key); 84 84 + 85 85 + switch ($query_key) { 86 86 + case 'all': 87 87 + return $query; 88 88 + } 89 89 + 90 90 + return parent::buildSavedQueryFromBuiltin($query_key); 91 91 + } 92 92 + 93 93 + protected function getRequiredHandlePHIDsForResultList( 94 94 + array $charges, 95 95 + PhabricatorSavedQuery $query) { 96 96 + 97 97 + $phids = array(); 98 98 + foreach ($charges as $charge) { 99 99 + $phids[] = $charge->getProviderPHID(); 100 100 + $phids[] = $charge->getCartPHID(); 101 101 + $phids[] = $charge->getMerchantPHID(); 102 102 + $phids[] = $charge->getPaymentMethodPHID(); 103 103 + } 104 104 + 105 105 + return $phids; 106 106 + } 107 107 + 108 108 + protected function renderResultList( 109 109 + array $charges, 110 110 + PhabricatorSavedQuery $query, 111 111 + array $handles) { 112 112 + assert_instances_of($charges, 'PhortuneCharge'); 113 113 + 114 114 + $viewer = $this->requireViewer(); 115 115 + 116 116 + $table = id(new PhortuneChargeTableView()) 117 117 + ->setUser($viewer) 118 118 + ->setCharges($charges) 119 119 + ->setHandles($handles); 120 120 + 121 121 + return id(new PHUIObjectBoxView()) 122 122 + ->setHeaderText(pht('Charges')) 123 123 + ->appendChild($table); 124 124 + } 125 125 + }

+89

src/applications/phortune/view/PhortuneChargeTableView.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class PhortuneChargeTableView extends AphrontView { 4 4 + 5 5 + private $charges; 6 6 + private $handles; 7 7 + private $showOrder; 8 8 + 9 9 + public function setShowOrder($show_order) { 10 10 + $this->showOrder = $show_order; 11 11 + return $this; 12 12 + } 13 13 + 14 14 + public function getShowOrder() { 15 15 + return $this->showOrder; 16 16 + } 17 17 + 18 18 + public function setHandles(array $handles) { 19 19 + $this->handles = $handles; 20 20 + return $this; 21 21 + } 22 22 + 23 23 + public function getHandles() { 24 24 + return $this->handles; 25 25 + } 26 26 + 27 27 + public function setCharges(array $charges) { 28 28 + $this->charges = $charges; 29 29 + return $this; 30 30 + } 31 31 + 32 32 + public function getCharges() { 33 33 + return $this->charges; 34 34 + } 35 35 + 36 36 + public function render() { 37 37 + $charges = $this->getCharges(); 38 38 + $handles = $this->getHandles(); 39 39 + $viewer = $this->getUser(); 40 40 + 41 41 + $rows = array(); 42 42 + foreach ($charges as $charge) { 43 43 + $rows[] = array( 44 44 + $charge->getID(), 45 45 + $handles[$charge->getCartPHID()]->renderLink(), 46 46 + $handles[$charge->getProviderPHID()]->renderLink(), 47 47 + $charge->getPaymentMethodPHID() 48 48 + ? $handles[$charge->getPaymentMethodPHID()]->renderLink() 49 49 + : null, 50 50 + $handles[$charge->getMerchantPHID()]->renderLink(), 51 51 + $charge->getAmountAsCurrency()->formatForDisplay(), 52 52 + $charge->getStatusForDisplay(), 53 53 + phabricator_datetime($charge->getDateCreated(), $viewer), 54 54 + ); 55 55 + } 56 56 + 57 57 + $table = id(new AphrontTableView($rows)) 58 58 + ->setHeaders( 59 59 + array( 60 60 + pht('ID'), 61 61 + pht('Cart'), 62 62 + pht('Provider'), 63 63 + pht('Method'), 64 64 + pht('Merchant'), 65 65 + pht('Amount'), 66 66 + pht('Status'), 67 67 + pht('Created'), 68 68 + )) 69 69 + ->setColumnClasses( 70 70 + array( 71 71 + '', 72 72 + '', 73 73 + '', 74 74 + '', 75 75 + '', 76 76 + 'wide right', 77 77 + '', 78 78 + '', 79 79 + )) 80 80 + ->setColumnVisibility( 81 81 + array( 82 82 + true, 83 83 + $this->getShowOrder(), 84 84 + )); 85 85 + 86 86 + return $table; 87 87 + } 88 88 + 89 89 + }

+100

src/applications/phortune/view/PhortuneOrderTableView.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class PhortuneOrderTableView extends AphrontView { 4 4 + 5 5 + private $carts; 6 6 + private $handles; 7 7 + 8 8 + public function setHandles(array $handles) { 9 9 + $this->handles = $handles; 10 10 + return $this; 11 11 + } 12 12 + 13 13 + public function getHandles() { 14 14 + return $this->handles; 15 15 + } 16 16 + 17 17 + public function setCarts(array $carts) { 18 18 + $this->carts = $carts; 19 19 + return $this; 20 20 + } 21 21 + 22 22 + public function getCarts() { 23 23 + return $this->carts; 24 24 + } 25 25 + 26 26 + public function render() { 27 27 + $carts = $this->getCarts(); 28 28 + $handles = $this->getHandles(); 29 29 + $viewer = $this->getUser(); 30 30 + 31 31 + $rows = array(); 32 32 + $rowc = array(); 33 33 + foreach ($carts as $cart) { 34 34 + $cart_link = $handles[$cart->getPHID()]->renderLink(); 35 35 + $purchases = $cart->getPurchases(); 36 36 + 37 37 + if (count($purchases) == 1) { 38 38 + $purchase = head($purchases); 39 39 + $purchase_name = $handles[$purchase->getPHID()]->renderLink(); 40 40 + $purchases = array(); 41 41 + } else { 42 42 + $purchase_name = ''; 43 43 + } 44 44 + 45 45 + $rowc[] = ''; 46 46 + $rows[] = array( 47 47 + $cart->getID(), 48 48 + phutil_tag( 49 49 + 'strong', 50 50 + array(), 51 51 + $cart_link), 52 52 + $purchase_name, 53 53 + phutil_tag( 54 54 + 'strong', 55 55 + array(), 56 56 + $cart->getTotalPriceAsCurrency()->formatForDisplay()), 57 57 + PhortuneCart::getNameForStatus($cart->getStatus()), 58 58 + phabricator_datetime($cart->getDateModified(), $viewer), 59 59 + ); 60 60 + foreach ($purchases as $purchase) { 61 61 + $id = $purchase->getID(); 62 62 + 63 63 + $price = $purchase->getTotalPriceAsCurrency()->formatForDisplay(); 64 64 + 65 65 + $rowc[] = ''; 66 66 + $rows[] = array( 67 67 + '', 68 68 + $handles[$purchase->getPHID()]->renderLink(), 69 69 + $price, 70 70 + '', 71 71 + '', 72 72 + ); 73 73 + } 74 74 + } 75 75 + 76 76 + $table = id(new AphrontTableView($rows)) 77 77 + ->setRowClasses($rowc) 78 78 + ->setHeaders( 79 79 + array( 80 80 + pht('ID'), 81 81 + pht('Order'), 82 82 + pht('Purchase'), 83 83 + pht('Amount'), 84 84 + pht('Status'), 85 85 + pht('Updated'), 86 86 + )) 87 87 + ->setColumnClasses( 88 88 + array( 89 89 + '', 90 90 + '', 91 91 + 'wide', 92 92 + 'right', 93 93 + '', 94 94 + 'right', 95 95 + )); 96 96 + 97 97 + return $table; 98 98 + } 99 99 + 100 100 + }