Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor: Give_Setting_Gateways ---> Give_Gateways_Report #1881

Merged
merged 2 commits into from
Jul 18, 2017
Merged

Refactor: Give_Setting_Gateways ---> Give_Gateways_Report #1881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efb5c75
Refactor: file names reporting -> reports and settings --> report
Jul 18, 2017
677d2b0
Fix: phpunit test
ravinderk Jul 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions give.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,9 +455,9 @@ private function includes() {
require_once GIVE_PLUGIN_DIR . 'includes/admin/tools/export/export-actions.php';
require_once GIVE_PLUGIN_DIR . 'includes/admin/tools/export/pdf-reports.php';

require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/reports.php';
require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/class-give-graph.php';
require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/graphing.php';
require_once GIVE_PLUGIN_DIR . 'includes/admin/reports/reports.php';
require_once GIVE_PLUGIN_DIR . 'includes/admin/reports/class-give-graph.php';
require_once GIVE_PLUGIN_DIR . 'includes/admin/reports/graphing.php';

require_once GIVE_PLUGIN_DIR . 'includes/admin/tools/logs/logs.php';

Expand Down
8 changes: 4 additions & 4 deletions includes/admin/admin-pages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,16 +392,16 @@ function give_reports_page_pages( $settings ) {

$settings = array(
// Earnings.
include( 'reporting/class-settings-earnings.php' ),
include( 'reports/class-earnings-report.php' ),

// Forms.
include( 'reporting/class-settings-forms.php' ),
include( 'reports/class-forms-report.php' ),

// Donors.
include( 'reporting/class-settings-donors.php' ),
include( 'reports/class-donors-report.php' ),

// Gateways.
include( 'reporting/class-settings-gateways.php' ),
include( 'reports/class-gateways-report.php' ),

);

Expand Down
0 ...n/reporting/class-donor-reports-table.php → ...min/reports/class-donor-reports-table.php
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions ...admin/reporting/class-settings-donors.php → ...des/admin/reports/class-donors-report.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Give Reports Page/Tab
*
* @package Give
* @subpackage Classes/Give_Settings_Donors
* @subpackage Classes/Give_Donors_Report
* @copyright Copyright (c) 2016, WordImpress
* @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
* @since 1.8
Expand All @@ -13,14 +13,14 @@
exit; // Exit if accessed directly
}

if ( ! class_exists( 'Give_Settings_Donors' ) ) :
if ( ! class_exists( 'Give_Donors_Report' ) ) :

/**
* Give_Settings_Donors.
* Give_Donors_Report.
*
* @sine 1.8
*/
class Give_Settings_Donors {
class Give_Donors_Report {

/**
* Setting page id.
Expand Down Expand Up @@ -133,4 +133,4 @@ public function render_report_donors_field( $field, $option_value ) {

endif;

return new Give_Settings_Donors();
return new Give_Donors_Report();
10 changes: 5 additions & 5 deletions ...min/reporting/class-settings-earnings.php → ...s/admin/reports/class-earnings-report.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Give Reports Page/Tab
*
* @package Give
* @subpackage Classes/Give_Settings_Earnings
* @subpackage Classes/Give_Earnings_Report
* @copyright Copyright (c) 2016, WordImpress
* @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
* @since 1.8
Expand All @@ -13,14 +13,14 @@
exit; // Exit if accessed directly
}

if ( ! class_exists( 'Give_Settings_Earnings' ) ) :
if ( ! class_exists( 'Give_Earnings_Report' ) ) :

/**
* Give_Settings_Earnings.
* Give_Earnings_Report.
*
* @sine 1.8
*/
class Give_Settings_Earnings {
class Give_Earnings_Report {

/**
* Setting page id.
Expand Down Expand Up @@ -138,4 +138,4 @@ public function render_report_earnings_field( $field, $option_value ) {

endif;

return new Give_Settings_Earnings();
return new Give_Earnings_Report();
0 ...in/reporting/class-form-reports-table.php → ...dmin/reports/class-form-reports-table.php
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions .../admin/reporting/class-settings-forms.php → ...udes/admin/reports/class-forms-report.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Give Reports Page/Tab
*
* @package Give
* @subpackage Classes/Give_Settings_Forms
* @subpackage Classes/Give_Forms_Report
* @copyright Copyright (c) 2016, WordImpress
* @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
* @since 1.8
Expand All @@ -13,14 +13,14 @@
exit; // Exit if accessed directly
}

if ( ! class_exists( 'Give_Settings_Forms' ) ) :
if ( ! class_exists( 'Give_Forms_Report' ) ) :

/**
* Give_Settings_Forms.
* Give_Forms_Report.
*
* @sine 1.8
*/
class Give_Settings_Forms {
class Give_Forms_Report {

/**
* Setting page id.
Expand Down Expand Up @@ -133,4 +133,4 @@ public function render_report_forms_field( $field, $option_value ) {

endif;

return new Give_Settings_Forms();
return new Give_Forms_Report();
10 changes: 5 additions & 5 deletions ...min/reporting/class-settings-gateways.php → ...s/admin/reports/class-gateways-report.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Give Reports Page/Tab
*
* @package Give
* @subpackage Classes/Give_Settings_Gateways
* @subpackage Classes/Give_Gateways_Report
* @copyright Copyright (c) 2016, WordImpress
* @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
* @since 1.8
Expand All @@ -13,14 +13,14 @@
exit; // Exit if accessed directly
}

if ( ! class_exists( 'Give_Settings_Gateways' ) ) :
if ( ! class_exists( 'Give_Gateways_Report' ) ) :

/**
* Give_Settings_Gateways.
* Give_Gateways_Report.
*
* @sine 1.8
*/
class Give_Settings_Gateways {
class Give_Gateways_Report {

/**
* Setting page id.
Expand Down Expand Up @@ -138,4 +138,4 @@ public function render_report_gateways_field( $field, $option_value ) {

endif;

return new Give_Settings_Gateways();
return new Give_Gateways_Report();
0 ...eporting/class-gateways-reports-table.php → .../reports/class-gateways-reports-table.php
View file
Open in desktop
File renamed without changes.
0 ...udes/admin/reporting/class-give-graph.php → includes/admin/reports/class-give-graph.php
View file
Open in desktop
File renamed without changes.
0 includes/admin/reporting/graphing.php → includes/admin/reports/graphing.php
View file
Open in desktop
File renamed without changes.
0 includes/admin/reporting/reports.php → includes/admin/reports/reports.php
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions tests/unit-tests/tests-give.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,9 @@ public function test_includes() {
$this->assertFileExists( GIVE_PLUGIN_DIR . 'includes/admin/tools/views/html-admin-page-exports.php' );
$this->assertFileExists( GIVE_PLUGIN_DIR . 'includes/admin/tools/views/html-admin-page-system-info.php' );

$this->assertFileExists( GIVE_PLUGIN_DIR . 'includes/admin/reporting/reports.php' );
$this->assertFileExists( GIVE_PLUGIN_DIR . 'includes/admin/reporting/class-give-graph.php' );
$this->assertFileExists( GIVE_PLUGIN_DIR . 'includes/admin/reporting/graphing.php' );
$this->assertFileExists( GIVE_PLUGIN_DIR . 'includes/admin/reports/reports.php' );
$this->assertFileExists( GIVE_PLUGIN_DIR . 'includes/admin/reports/class-give-graph.php' );
$this->assertFileExists( GIVE_PLUGIN_DIR . 'includes/admin/reports/graphing.php' );

$this->assertFileExists( GIVE_PLUGIN_DIR . 'includes/admin/shortcodes/abstract-shortcode-generator.php' );
$this->assertFileExists( GIVE_PLUGIN_DIR . 'includes/admin/shortcodes/class-shortcode-button.php' );
Expand Down