recaptime.dev / phorge
@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Move Phortune Contollers into folders

Summary: Move individual controller files into cooresponding folders. Makes it easier to locate sections and expand without clutter. Also made "chargelist" part of account since it's tied to having an account specifically.

Test Plan: Vist charges, merchants, subscription, accounts, and other pages. No errors from file move.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D17587

Chad Little 86673486 130ebd2c

+31 -31
+29 -29
src/__phutil_library_map__.php
··· 4311 4311 'PholioTransactionView' => 'applications/pholio/view/PholioTransactionView.php', 4312 4312 'PholioUploadedImageView' => 'applications/pholio/view/PholioUploadedImageView.php', 4313 4313 'PhortuneAccount' => 'applications/phortune/storage/PhortuneAccount.php', 4314 - 'PhortuneAccountEditController' => 'applications/phortune/controller/PhortuneAccountEditController.php', 4314 + 'PhortuneAccountChargeListController' => 'applications/phortune/controller/account/PhortuneAccountChargeListController.php', 4315 + 'PhortuneAccountEditController' => 'applications/phortune/controller/account/PhortuneAccountEditController.php', 4315 4316 'PhortuneAccountEditor' => 'applications/phortune/editor/PhortuneAccountEditor.php', 4316 4317 'PhortuneAccountHasMemberEdgeType' => 'applications/phortune/edge/PhortuneAccountHasMemberEdgeType.php', 4317 - 'PhortuneAccountListController' => 'applications/phortune/controller/PhortuneAccountListController.php', 4318 + 'PhortuneAccountListController' => 'applications/phortune/controller/account/PhortuneAccountListController.php', 4318 4319 'PhortuneAccountPHIDType' => 'applications/phortune/phid/PhortuneAccountPHIDType.php', 4319 4320 'PhortuneAccountQuery' => 'applications/phortune/query/PhortuneAccountQuery.php', 4320 4321 'PhortuneAccountTransaction' => 'applications/phortune/storage/PhortuneAccountTransaction.php', 4321 4322 'PhortuneAccountTransactionQuery' => 'applications/phortune/query/PhortuneAccountTransactionQuery.php', 4322 - 'PhortuneAccountViewController' => 'applications/phortune/controller/PhortuneAccountViewController.php', 4323 + 'PhortuneAccountViewController' => 'applications/phortune/controller/account/PhortuneAccountViewController.php', 4323 4324 'PhortuneAdHocCart' => 'applications/phortune/cart/PhortuneAdHocCart.php', 4324 4325 'PhortuneAdHocProduct' => 'applications/phortune/product/PhortuneAdHocProduct.php', 4325 4326 'PhortuneCart' => 'applications/phortune/storage/PhortuneCart.php', 4326 - 'PhortuneCartAcceptController' => 'applications/phortune/controller/PhortuneCartAcceptController.php', 4327 - 'PhortuneCartCancelController' => 'applications/phortune/controller/PhortuneCartCancelController.php', 4328 - 'PhortuneCartCheckoutController' => 'applications/phortune/controller/PhortuneCartCheckoutController.php', 4329 - 'PhortuneCartController' => 'applications/phortune/controller/PhortuneCartController.php', 4327 + 'PhortuneCartAcceptController' => 'applications/phortune/controller/cart/PhortuneCartAcceptController.php', 4328 + 'PhortuneCartCancelController' => 'applications/phortune/controller/cart/PhortuneCartCancelController.php', 4329 + 'PhortuneCartCheckoutController' => 'applications/phortune/controller/cart/PhortuneCartCheckoutController.php', 4330 + 'PhortuneCartController' => 'applications/phortune/controller/cart/PhortuneCartController.php', 4330 4331 'PhortuneCartEditor' => 'applications/phortune/editor/PhortuneCartEditor.php', 4331 4332 'PhortuneCartImplementation' => 'applications/phortune/cart/PhortuneCartImplementation.php', 4332 - 'PhortuneCartListController' => 'applications/phortune/controller/PhortuneCartListController.php', 4333 + 'PhortuneCartListController' => 'applications/phortune/controller/cart/PhortuneCartListController.php', 4333 4334 'PhortuneCartPHIDType' => 'applications/phortune/phid/PhortuneCartPHIDType.php', 4334 4335 'PhortuneCartQuery' => 'applications/phortune/query/PhortuneCartQuery.php', 4335 4336 'PhortuneCartReplyHandler' => 'applications/phortune/mail/PhortuneCartReplyHandler.php', 4336 4337 'PhortuneCartSearchEngine' => 'applications/phortune/query/PhortuneCartSearchEngine.php', 4337 4338 'PhortuneCartTransaction' => 'applications/phortune/storage/PhortuneCartTransaction.php', 4338 4339 'PhortuneCartTransactionQuery' => 'applications/phortune/query/PhortuneCartTransactionQuery.php', 4339 - 'PhortuneCartUpdateController' => 'applications/phortune/controller/PhortuneCartUpdateController.php', 4340 - 'PhortuneCartViewController' => 'applications/phortune/controller/PhortuneCartViewController.php', 4340 + 'PhortuneCartUpdateController' => 'applications/phortune/controller/cart/PhortuneCartUpdateController.php', 4341 + 'PhortuneCartViewController' => 'applications/phortune/controller/cart/PhortuneCartViewController.php', 4341 4342 'PhortuneCharge' => 'applications/phortune/storage/PhortuneCharge.php', 4342 - 'PhortuneChargeListController' => 'applications/phortune/controller/PhortuneChargeListController.php', 4343 4343 'PhortuneChargePHIDType' => 'applications/phortune/phid/PhortuneChargePHIDType.php', 4344 4344 'PhortuneChargeQuery' => 'applications/phortune/query/PhortuneChargeQuery.php', 4345 4345 'PhortuneChargeSearchEngine' => 'applications/phortune/query/PhortuneChargeSearchEngine.php', ··· 4358 4358 'PhortuneMemberHasMerchantEdgeType' => 'applications/phortune/edge/PhortuneMemberHasMerchantEdgeType.php', 4359 4359 'PhortuneMerchant' => 'applications/phortune/storage/PhortuneMerchant.php', 4360 4360 'PhortuneMerchantCapability' => 'applications/phortune/capability/PhortuneMerchantCapability.php', 4361 - 'PhortuneMerchantController' => 'applications/phortune/controller/PhortuneMerchantController.php', 4362 - 'PhortuneMerchantEditController' => 'applications/phortune/controller/PhortuneMerchantEditController.php', 4361 + 'PhortuneMerchantController' => 'applications/phortune/controller/merchant/PhortuneMerchantController.php', 4362 + 'PhortuneMerchantEditController' => 'applications/phortune/controller/merchant/PhortuneMerchantEditController.php', 4363 4363 'PhortuneMerchantEditEngine' => 'applications/phortune/editor/PhortuneMerchantEditEngine.php', 4364 4364 'PhortuneMerchantEditor' => 'applications/phortune/editor/PhortuneMerchantEditor.php', 4365 4365 'PhortuneMerchantHasMemberEdgeType' => 'applications/phortune/edge/PhortuneMerchantHasMemberEdgeType.php', 4366 - 'PhortuneMerchantInvoiceCreateController' => 'applications/phortune/controller/PhortuneMerchantInvoiceCreateController.php', 4367 - 'PhortuneMerchantListController' => 'applications/phortune/controller/PhortuneMerchantListController.php', 4366 + 'PhortuneMerchantInvoiceCreateController' => 'applications/phortune/controller/merchant/PhortuneMerchantInvoiceCreateController.php', 4367 + 'PhortuneMerchantListController' => 'applications/phortune/controller/merchant/PhortuneMerchantListController.php', 4368 4368 'PhortuneMerchantPHIDType' => 'applications/phortune/phid/PhortuneMerchantPHIDType.php', 4369 - 'PhortuneMerchantPictureController' => 'applications/phortune/controller/PhortuneMerchantPictureController.php', 4369 + 'PhortuneMerchantPictureController' => 'applications/phortune/controller/merchant/PhortuneMerchantPictureController.php', 4370 4370 'PhortuneMerchantQuery' => 'applications/phortune/query/PhortuneMerchantQuery.php', 4371 4371 'PhortuneMerchantSearchEngine' => 'applications/phortune/query/PhortuneMerchantSearchEngine.php', 4372 4372 'PhortuneMerchantTransaction' => 'applications/phortune/storage/PhortuneMerchantTransaction.php', 4373 4373 'PhortuneMerchantTransactionQuery' => 'applications/phortune/query/PhortuneMerchantTransactionQuery.php', 4374 - 'PhortuneMerchantViewController' => 'applications/phortune/controller/PhortuneMerchantViewController.php', 4374 + 'PhortuneMerchantViewController' => 'applications/phortune/controller/merchant/PhortuneMerchantViewController.php', 4375 4375 'PhortuneMonthYearExpiryControl' => 'applications/phortune/control/PhortuneMonthYearExpiryControl.php', 4376 4376 'PhortuneOrderTableView' => 'applications/phortune/view/PhortuneOrderTableView.php', 4377 4377 'PhortunePayPalPaymentProvider' => 'applications/phortune/provider/PhortunePayPalPaymentProvider.php', 4378 4378 'PhortunePaymentMethod' => 'applications/phortune/storage/PhortunePaymentMethod.php', 4379 - 'PhortunePaymentMethodCreateController' => 'applications/phortune/controller/PhortunePaymentMethodCreateController.php', 4380 - 'PhortunePaymentMethodDisableController' => 'applications/phortune/controller/PhortunePaymentMethodDisableController.php', 4381 - 'PhortunePaymentMethodEditController' => 'applications/phortune/controller/PhortunePaymentMethodEditController.php', 4379 + 'PhortunePaymentMethodCreateController' => 'applications/phortune/controller/payment/PhortunePaymentMethodCreateController.php', 4380 + 'PhortunePaymentMethodDisableController' => 'applications/phortune/controller/payment/PhortunePaymentMethodDisableController.php', 4381 + 'PhortunePaymentMethodEditController' => 'applications/phortune/controller/payment/PhortunePaymentMethodEditController.php', 4382 4382 'PhortunePaymentMethodPHIDType' => 'applications/phortune/phid/PhortunePaymentMethodPHIDType.php', 4383 4383 'PhortunePaymentMethodQuery' => 'applications/phortune/query/PhortunePaymentMethodQuery.php', 4384 4384 'PhortunePaymentProvider' => 'applications/phortune/provider/PhortunePaymentProvider.php', ··· 4391 4391 'PhortunePaymentProviderTestCase' => 'applications/phortune/provider/__tests__/PhortunePaymentProviderTestCase.php', 4392 4392 'PhortuneProduct' => 'applications/phortune/storage/PhortuneProduct.php', 4393 4393 'PhortuneProductImplementation' => 'applications/phortune/product/PhortuneProductImplementation.php', 4394 - 'PhortuneProductListController' => 'applications/phortune/controller/PhortuneProductListController.php', 4394 + 'PhortuneProductListController' => 'applications/phortune/controller/product/PhortuneProductListController.php', 4395 4395 'PhortuneProductPHIDType' => 'applications/phortune/phid/PhortuneProductPHIDType.php', 4396 4396 'PhortuneProductQuery' => 'applications/phortune/query/PhortuneProductQuery.php', 4397 - 'PhortuneProductViewController' => 'applications/phortune/controller/PhortuneProductViewController.php', 4398 - 'PhortuneProviderActionController' => 'applications/phortune/controller/PhortuneProviderActionController.php', 4399 - 'PhortuneProviderDisableController' => 'applications/phortune/controller/PhortuneProviderDisableController.php', 4400 - 'PhortuneProviderEditController' => 'applications/phortune/controller/PhortuneProviderEditController.php', 4397 + 'PhortuneProductViewController' => 'applications/phortune/controller/product/PhortuneProductViewController.php', 4398 + 'PhortuneProviderActionController' => 'applications/phortune/controller/provider/PhortuneProviderActionController.php', 4399 + 'PhortuneProviderDisableController' => 'applications/phortune/controller/provider/PhortuneProviderDisableController.php', 4400 + 'PhortuneProviderEditController' => 'applications/phortune/controller/provider/PhortuneProviderEditController.php', 4401 4401 'PhortunePurchase' => 'applications/phortune/storage/PhortunePurchase.php', 4402 4402 'PhortunePurchasePHIDType' => 'applications/phortune/phid/PhortunePurchasePHIDType.php', 4403 4403 'PhortunePurchaseQuery' => 'applications/phortune/query/PhortunePurchaseQuery.php', ··· 4405 4405 'PhortuneStripePaymentProvider' => 'applications/phortune/provider/PhortuneStripePaymentProvider.php', 4406 4406 'PhortuneSubscription' => 'applications/phortune/storage/PhortuneSubscription.php', 4407 4407 'PhortuneSubscriptionCart' => 'applications/phortune/cart/PhortuneSubscriptionCart.php', 4408 - 'PhortuneSubscriptionEditController' => 'applications/phortune/controller/PhortuneSubscriptionEditController.php', 4408 + 'PhortuneSubscriptionEditController' => 'applications/phortune/controller/subscription/PhortuneSubscriptionEditController.php', 4409 4409 'PhortuneSubscriptionImplementation' => 'applications/phortune/subscription/PhortuneSubscriptionImplementation.php', 4410 - 'PhortuneSubscriptionListController' => 'applications/phortune/controller/PhortuneSubscriptionListController.php', 4410 + 'PhortuneSubscriptionListController' => 'applications/phortune/controller/subscription/PhortuneSubscriptionListController.php', 4411 4411 'PhortuneSubscriptionPHIDType' => 'applications/phortune/phid/PhortuneSubscriptionPHIDType.php', 4412 4412 'PhortuneSubscriptionProduct' => 'applications/phortune/product/PhortuneSubscriptionProduct.php', 4413 4413 'PhortuneSubscriptionQuery' => 'applications/phortune/query/PhortuneSubscriptionQuery.php', 4414 4414 'PhortuneSubscriptionSearchEngine' => 'applications/phortune/query/PhortuneSubscriptionSearchEngine.php', 4415 4415 'PhortuneSubscriptionTableView' => 'applications/phortune/view/PhortuneSubscriptionTableView.php', 4416 - 'PhortuneSubscriptionViewController' => 'applications/phortune/controller/PhortuneSubscriptionViewController.php', 4416 + 'PhortuneSubscriptionViewController' => 'applications/phortune/controller/subscription/PhortuneSubscriptionViewController.php', 4417 4417 'PhortuneSubscriptionWorker' => 'applications/phortune/worker/PhortuneSubscriptionWorker.php', 4418 4418 'PhortuneTestPaymentProvider' => 'applications/phortune/provider/PhortuneTestPaymentProvider.php', 4419 4419 'PhortuneWePayPaymentProvider' => 'applications/phortune/provider/PhortuneWePayPaymentProvider.php', ··· 9742 9742 'PhabricatorApplicationTransactionInterface', 9743 9743 'PhabricatorPolicyInterface', 9744 9744 ), 9745 + 'PhortuneAccountChargeListController' => 'PhortuneController', 9745 9746 'PhortuneAccountEditController' => 'PhortuneController', 9746 9747 'PhortuneAccountEditor' => 'PhabricatorApplicationTransactionEditor', 9747 9748 'PhortuneAccountHasMemberEdgeType' => 'PhabricatorEdgeType', ··· 9777 9778 'PhortuneDAO', 9778 9779 'PhabricatorPolicyInterface', 9779 9780 ), 9780 - 'PhortuneChargeListController' => 'PhortuneController', 9781 9781 'PhortuneChargePHIDType' => 'PhabricatorPHIDType', 9782 9782 'PhortuneChargeQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 9783 9783 'PhortuneChargeSearchEngine' => 'PhabricatorApplicationSearchEngine',
+1 -1
src/applications/phortune/application/PhabricatorPhortuneApplication.php
··· 52 52 => 'PhortuneCartListController', 53 53 ), 54 54 'charge/(?:query/(?P<queryKey>[^/]+)/)?' 55 - => 'PhortuneChargeListController', 55 + => 'PhortuneAccountChargeListController', 56 56 ), 57 57 'card/(?P<id>\d+)/' => array( 58 58 'edit/' => 'PhortunePaymentMethodEditController',
src/applications/phortune/controller/PhortuneAccountEditController.php src/applications/phortune/controller/account/PhortuneAccountEditController.php
src/applications/phortune/controller/PhortuneAccountListController.php src/applications/phortune/controller/account/PhortuneAccountListController.php
src/applications/phortune/controller/PhortuneAccountViewController.php src/applications/phortune/controller/account/PhortuneAccountViewController.php
src/applications/phortune/controller/PhortuneCartAcceptController.php src/applications/phortune/controller/cart/PhortuneCartAcceptController.php
src/applications/phortune/controller/PhortuneCartCancelController.php src/applications/phortune/controller/cart/PhortuneCartCancelController.php
src/applications/phortune/controller/PhortuneCartCheckoutController.php src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php
src/applications/phortune/controller/PhortuneCartController.php src/applications/phortune/controller/cart/PhortuneCartController.php
src/applications/phortune/controller/PhortuneCartListController.php src/applications/phortune/controller/cart/PhortuneCartListController.php
src/applications/phortune/controller/PhortuneCartUpdateController.php src/applications/phortune/controller/cart/PhortuneCartUpdateController.php
src/applications/phortune/controller/PhortuneCartViewController.php src/applications/phortune/controller/cart/PhortuneCartViewController.php
+1 -1
src/applications/phortune/controller/PhortuneChargeListController.php src/applications/phortune/controller/account/PhortuneAccountChargeListController.php
··· 1 1 <?php 2 2 3 - final class PhortuneChargeListController 3 + final class PhortuneAccountChargeListController 4 4 extends PhortuneController { 5 5 6 6 private $account;
src/applications/phortune/controller/PhortuneMerchantController.php src/applications/phortune/controller/merchant/PhortuneMerchantController.php
src/applications/phortune/controller/PhortuneMerchantEditController.php src/applications/phortune/controller/merchant/PhortuneMerchantEditController.php
src/applications/phortune/controller/PhortuneMerchantInvoiceCreateController.php src/applications/phortune/controller/merchant/PhortuneMerchantInvoiceCreateController.php
src/applications/phortune/controller/PhortuneMerchantListController.php src/applications/phortune/controller/merchant/PhortuneMerchantListController.php
src/applications/phortune/controller/PhortuneMerchantPictureController.php src/applications/phortune/controller/merchant/PhortuneMerchantPictureController.php
src/applications/phortune/controller/PhortuneMerchantViewController.php src/applications/phortune/controller/merchant/PhortuneMerchantViewController.php
src/applications/phortune/controller/PhortunePaymentMethodCreateController.php src/applications/phortune/controller/payment/PhortunePaymentMethodCreateController.php
src/applications/phortune/controller/PhortunePaymentMethodDisableController.php src/applications/phortune/controller/payment/PhortunePaymentMethodDisableController.php
src/applications/phortune/controller/PhortunePaymentMethodEditController.php src/applications/phortune/controller/payment/PhortunePaymentMethodEditController.php
src/applications/phortune/controller/PhortuneProductListController.php src/applications/phortune/controller/product/PhortuneProductListController.php
src/applications/phortune/controller/PhortuneProductViewController.php src/applications/phortune/controller/product/PhortuneProductViewController.php
src/applications/phortune/controller/PhortuneProviderActionController.php src/applications/phortune/controller/provider/PhortuneProviderActionController.php
src/applications/phortune/controller/PhortuneProviderDisableController.php src/applications/phortune/controller/provider/PhortuneProviderDisableController.php
src/applications/phortune/controller/PhortuneProviderEditController.php src/applications/phortune/controller/provider/PhortuneProviderEditController.php
src/applications/phortune/controller/PhortuneSubscriptionEditController.php src/applications/phortune/controller/subscription/PhortuneSubscriptionEditController.php
src/applications/phortune/controller/PhortuneSubscriptionListController.php src/applications/phortune/controller/subscription/PhortuneSubscriptionListController.php
src/applications/phortune/controller/PhortuneSubscriptionViewController.php src/applications/phortune/controller/subscription/PhortuneSubscriptionViewController.php