Skip to content

Commit

Permalink
Clean up imports
Browse files Browse the repository at this point in the history
  • Loading branch information
mlewis-everley committed Jan 28, 2025
1 parent c1f7a8b commit 5ce264c
Show file tree
Hide file tree
Showing 15 changed files with 6 additions and 81 deletions.
4 changes: 2 additions & 2 deletions _config/users.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
Name: ordersusers
Only:
moduleexists: 'i-lateral/silverstripe-users'
moduleexists: 'dft/silverstripe-users'
After: '#usersconfig'
---
# Setup default registration config for users module
ilateral\SilverStripe\Users\Control\AccountController:
DFT\SilverStripe\Users\Control\AccountController:
extensions:
- SilverCommerce\OrdersAdmin\Extensions\AccountControllerExtension
2 changes: 1 addition & 1 deletion src/Search/OrderSearchContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use DateTime;
use SilverStripe\Forms\DateField;
use SilverStripe\Versioned\Versioned;
use ilateral\SilverStripe\ModelAdminPlus\SearchContext;
use DFT\SilverStripe\ModelAdminPlus\SearchContext;

class OrderSearchContext extends SearchContext
{
Expand Down
5 changes: 1 addition & 4 deletions src/admin/OrderAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@
use SilverStripe\ORM\DB;
use SilverStripe\Forms\DateField;
use Colymba\BulkManager\BulkManager;
use SilverStripe\Core\Config\Config;
use SilverCommerce\OrdersAdmin\Model\Invoice;
use SilverCommerce\OrdersAdmin\Model\Estimate;
use Colymba\BulkManager\BulkAction\EditHandler;
use Colymba\BulkManager\BulkAction\UnlinkHandler;
use SilverStripe\Forms\GridField\GridFieldDetailForm;
use ilateral\SilverStripe\ModelAdminPlus\ModelAdminPlus;
use DFT\SilverStripe\ModelAdminPlus\ModelAdminPlus;
use SilverStripe\Forms\GridField\GridFieldSortableHeader;
use SilverCommerce\CatalogueAdmin\BulkManager\PaidHandler;
use SilverCommerce\CatalogueAdmin\BulkManager\CancelHandler;
Expand Down
6 changes: 0 additions & 6 deletions src/bulkmanager/CancelHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
use SilverStripe\Core\Convert;
use Colymba\BulkManager\BulkAction\Handler as GridFieldBulkActionHandler;

/**
* A {@link GridFieldBulkActionHandler} for bulk cancelling records
*
* @author i-lateral (http://www.i-lateral.com)
* @package orders-admin
*/
class CancelHandler extends GridFieldBulkActionHandler
{
private static $url_segment = 'cancel';
Expand Down
6 changes: 0 additions & 6 deletions src/bulkmanager/CollectedHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
use SilverStripe\Core\Convert;
use Colymba\BulkManager\BulkAction\Handler as GridFieldBulkActionHandler;

/**
* A {@link GridFieldBulkActionHandler} for bulk cancelling records
*
* @author i-lateral (http://www.i-lateral.com)
* @package orders-admin
*/
class CollectedHandler extends GridFieldBulkActionHandler
{
private static $url_segment = 'collected';
Expand Down
6 changes: 0 additions & 6 deletions src/bulkmanager/DispatchedHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
use SilverStripe\Core\Convert;
use Colymba\BulkManager\BulkAction\Handler as GridFieldBulkActionHandler;

/**
* A {@link GridFieldBulkActionHandler} for bulk cancelling records
*
* @author i-lateral (http://www.i-lateral.com)
* @package orders-admin
*/
class DispatchedHandler extends GridFieldBulkActionHandler
{
private static $url_segment = 'dispatched';
Expand Down
6 changes: 0 additions & 6 deletions src/bulkmanager/PaidHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
use SilverStripe\Core\Convert;
use Colymba\BulkManager\BulkAction\Handler as GridFieldBulkActionHandler;

/**
* A {@link GridFieldBulkActionHandler} for bulk cancelling records
*
* @author i-lateral (http://www.i-lateral.com)
* @package orders-admin
*/
class PaidHandler extends GridFieldBulkActionHandler
{
private static $url_segment = 'paid';
Expand Down
6 changes: 0 additions & 6 deletions src/bulkmanager/PartPaidHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
use SilverStripe\Core\Convert;
use Colymba\BulkManager\BulkAction\Handler as GridFieldBulkActionHandler;

/**
* A {@link GridFieldBulkActionHandler} for bulk cancelling records
*
* @author i-lateral (http://www.i-lateral.com)
* @package orders-admin
*/
class PartPaidHandler extends GridFieldBulkActionHandler
{
private static $url_segment = 'partpaid';
Expand Down
6 changes: 0 additions & 6 deletions src/bulkmanager/PendingHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
use SilverStripe\Core\Convert;
use Colymba\BulkManager\BulkAction\Handler as GridFieldBulkActionHandler;

/**
* A {@link GridFieldBulkActionHandler} for bulk cancelling records
*
* @author i-lateral (http://www.i-lateral.com)
* @package orders-admin
*/
class PendingHandler extends GridFieldBulkActionHandler
{
private static $url_segment = 'pending';
Expand Down
6 changes: 0 additions & 6 deletions src/bulkmanager/ProcessingHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
use SilverStripe\Core\Convert;
use Colymba\BulkManager\BulkAction\Handler as GridFieldBulkActionHandler;

/**
* A {@link GridFieldBulkActionHandler} for bulk cancelling records
*
* @author i-lateral (http://www.i-lateral.com)
* @package orders-admin
*/
class ProcessingHandler extends GridFieldBulkActionHandler
{
private static $url_segment = 'processing';
Expand Down
6 changes: 0 additions & 6 deletions src/bulkmanager/RefundHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
use SilverStripe\Core\Convert;
use Colymba\BulkManager\BulkAction\Handler as GridFieldBulkActionHandler;

/**
* A {@link GridFieldBulkActionHandler} for bulk cancelling records
*
* @author i-lateral (http://www.i-lateral.com)
* @package orders-admin
*/
class RefundHandler extends GridFieldBulkActionHandler
{
private static $url_segment = 'refund';
Expand Down
17 changes: 1 addition & 16 deletions src/extensions/AccountControllerExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,16 @@

namespace SilverCommerce\OrdersAdmin\Extensions;

use SilverStripe\i18n\i18n;
use SilverStripe\Forms\Form;
use SilverStripe\Core\Extension;
use SilverStripe\View\ArrayData;
use SilverStripe\Forms\TextField;
use SilverStripe\Forms\FieldList;
use SilverStripe\Forms\FormAction;
use SilverStripe\ORM\PaginatedList;
use SilverStripe\Forms\HeaderField;
use SilverStripe\Forms\HiddenField;
use SilverStripe\Security\Security;
use SilverStripe\Forms\LiteralField;
use SilverStripe\Forms\CheckboxField;
use SilverStripe\Forms\DropdownField;
use SilverStripe\Forms\CompositeField;
use SilverStripe\Forms\RequiredFields;
use SilverStripe\ORM\ValidationResult;
use SilverCommerce\ContactAdmin\Model\ContactLocation;
use ilateral\SilverStripe\Users\Control\AccountController;
use DFT\SilverStripe\Users\Control\AccountController;

/**
* Add extra fields to a user account (if the users module is
* installed) to allow logged in users to see their invoices.
*
* @package orders
*/
class AccountControllerExtension extends Extension
{
Expand Down
7 changes: 1 addition & 6 deletions src/forms/gridfield/AddLineItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,7 @@
* A specific gridfield field designed to allow the creation of a new
* order item and that auto completes all fields from a pre-defined
* object (default Product).
*
* @package orders-admin
*
* @author ilateral <[email protected]>
* @author Michael Strong <[email protected]>
**/
**/
class AddLineItem extends GridFieldAddExistingAutocompleter
{

Expand Down
2 changes: 0 additions & 2 deletions src/forms/gridfield/OrdersDetailForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
* with editing Order and Estimate objects specificaly and isn't really
* intended to be more flexible in terms of support (though this might
* be added later).
*
* @author ilateral
*/
class OrdersDetailForm extends GridFieldDetailForm
{
Expand Down
2 changes: 0 additions & 2 deletions src/model/LineItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@
* @method TaxRate Tax
* @method TaxRate TaxRate
* @method \SilverStripe\ORM\HasManyList Customisations
*
* @author Mo <[email protected]>
*/
class LineItem extends DataObject implements TaxableProvider
{
Expand Down

0 comments on commit 5ce264c

Please sign in to comment.