Skip to content

Commit

Permalink
Merge branch 'v1.3' of https://github.com/strangerstudios/sitewide-sales
Browse files Browse the repository at this point in the history 
 into banner-dismiss-settings
  • Loading branch information
@kimcoleman
kimcoleman committed Jun 29, 2022
2 parents 6132d75 + 641869d commit b562647
Show file tree
Hide file tree
Showing 6 changed files with 186 additions and 83 deletions.
98 changes: 44 additions & 54 deletions classes/class-swsales-metaboxes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,14 @@ public static function add_swsales_metaboxes() {
'side',
'high'
);
add_meta_box(
'swsales_cpt_reports',
__( 'Quick Reports', 'sitewide-sales' ),
array( __CLASS__, 'display_cpt_reports' ),
array( 'sitewide_sale' ),
'side',
'high'
);
add_meta_box(
'swsales_documentation',
__( 'Documentation', 'sitewide-sales' ),
Expand Down Expand Up @@ -112,14 +120,6 @@ public static function add_swsales_metaboxes() {
'normal',
'high'
);
add_meta_box(
'swsales_cpt_step_5',
__( 'Step 5: Reports', 'sitewide-sales' ),
array( __CLASS__, 'display_step_5' ),
array( 'sitewide_sale' ),
'normal',
'high'
);

// remove some default metaboxes
remove_meta_box( 'slugdiv', 'sitewide_sale', 'normal' );
Expand Down Expand Up @@ -147,16 +147,43 @@ public static function publish_sitewide_sale( $post ) {
}
}
?>
<?php
$sale_status_running = $cur_sale->is_running();

if ( $sale_status_running === true ) {
echo '<div class="sitewide_sales_message sitewide_sales_success">';
echo '<strong>' . esc_html( 'Running.', 'sitewide-sales' ) . '</strong>';
echo ' ' . esc_html( 'This is the active sitewide sale.', 'sitewide-sales' );
} else {
echo '<div class="sitewide_sales_message sitewide_sales_alert">';
echo '<strong>' . esc_html( 'Not Running.', 'sitewide-sales' ) . '</strong>';

if ( ! $cur_sale->is_active_sitewide_sale() ) {
$error_message = esc_html( 'This is not the active sitewide sale.', 'sitewide-sales' );
} else {
switch ( $cur_sale->get_time_period() ) {
case 'error':
$error_message = esc_html( 'Invalid timeframe.', 'sitewide-sales' );
break;
case 'pre-sale':
$error_message = esc_html( 'Sale has not yet started.', 'sitewide-sales' );
break;
case 'post-sale':
$error_message = esc_html( 'Sale has ended.', 'sitewide-sales' );
break;
}
}
echo ' ' . $error_message . ' ' . esc_html( 'Banner will not be shown.', 'sitewide-sales' );
}
echo '</div>';
?>
<div id="misc-publishing-actions">
<div class="misc-pub-section">
<p>
<label for="swsales_set_as_sitewide_sale"><strong><?php esc_html_e( 'Set as Current Sitewide Sale', 'sitewide-sales' ); ?></strong></label>
<input name="swsales_set_as_sitewide_sale" id="swsales_set_as_sitewide_sale" type="checkbox" <?php checked( $init_checked, true ); ?> />
</p>
</div>
<div class="misc-pub-section">
<p><a target="_blank" href="<?php echo esc_url( admin_url( 'edit.php?post_type=sitewide_sale&page=sitewide_sales_reports&sitewide_sale=' . $post->ID ) ); ?>"><?php esc_html_e( 'View Sitewide Sale Reports', 'sitewide-sales' ); ?></a></p>
</div>
</div>
<div id="major-publishing-actions">
<div id="publishing-action">
Expand Down Expand Up @@ -244,40 +271,6 @@ public static function display_step_1( $post ) {
<p class="description"><?php esc_html_e( 'Set this date and time to when your sale should end.', 'sitewide-sales' ); ?></p>
</td>
</tr>
<th scope="row" valign="top"><label><?php esc_html_e( 'Sale Status', 'sitewide-sales' ); ?></label></th>
<td>
<?php
$sale_status_running = $cur_sale->is_running();

if ( $sale_status_running === true ) {
echo '<p class="sitewide_sales_message sitewide_sales_success">';
echo '<strong>' . esc_html( 'Running.', 'sitewide-sales' ) . '</strong>';
} else {
echo '<div class="sitewide_sales_message sitewide_sales_alert">';
echo '<strong>' . esc_html( 'Not Running.', 'sitewide-sales' ) . '</strong>';

if ( ! $cur_sale->is_active_sitewide_sale() ) {
$error_message = 'This is not the active sitewide sale.';
} else {
switch ( $cur_sale->get_time_period() ) {
case 'error':
$error_message = esc_html( 'Invalid timeframe.', 'sitewide-sales' );
break;
case 'pre-sale':
$error_message = esc_html( 'Sale has not yet started.', 'sitewide-sales' );
break;
case 'post-sale':
$error_message = esc_html( 'Sale has ended.', 'sitewide-sales' );
break;
}
}
echo ' ' . $error_message . ' ' . esc_html( 'Banner will not be shown.', 'sitewide-sales' );
}
echo '</p>';
?>
</td>
<tr>
</tr>
</tbody>
</table>
<input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Save All Settings', 'sitewide-sales' ); ?>">
Expand Down Expand Up @@ -398,11 +391,6 @@ public static function display_step_3( $post ) {
$show_shortcode_warning = true;
}
?>
<p class="sitewide_sales_message sitewide_sales_alert swsales_shortcode_warning"
<?php if ( ! $show_shortcode_warning ) { ?>style="display: none;"<?php } ?>>
<?php echo wp_kses_post( '<strong>Warning:</strong> The [sitewide_sales] shortcode was not found in this post.', 'sitewide-sales' ); ?>
</p>

<p>
<span id="swsales_after_landing_page_select"
<?php
Expand Down Expand Up @@ -543,7 +531,7 @@ public static function display_step_4( $post ) {
?>
<table class="form-table swsales_banner_module_settings" id="swsales_banner_settings_<?php echo esc_attr( $module ) ?>">
<?php
$module::echo_banner_settings_html( $cur_sale );
$module::echo_banner_settings_html_inner( $cur_sale );
?>
</table>
<?php
Expand Down Expand Up @@ -592,15 +580,17 @@ public static function display_step_4( $post ) {
<?php
}

public static function display_step_5( $post ) {
public static function display_cpt_reports( $post ) {
global $wpdb, $cur_sale;
if ( ! isset( $cur_sale ) ) {
$cur_sale = new SWSales_Sitewide_Sale();
$cur_sale->load_sitewide_sale( $post->ID );
}
SWSales_Reports::show_report( $cur_sale );
SWSales_Reports::show_quick_report( $cur_sale );
?>
<input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Save All Settings', 'sitewide-sales' ); ?>">
<div class="swsales_reports-quick-data-action">
<a class="button button-secondary" target="_blank" href="<?php echo esc_url( admin_url( 'edit.php?post_type=sitewide_sale&page=sitewide_sales_reports&sitewide_sale=' . $post->ID ) ); ?>"><?php esc_html_e( 'View Detailed Sale Report', 'sitewide-sales' ); ?></a>
</div>
<?php
}

Expand Down
29 changes: 29 additions & 0 deletions classes/class-swsales-reports.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,35 @@ function drawVisualization() {
do_action( 'swsales_additional_reports', $sitewide_sale );
}

/**
* Show summarized report content for a Sitewide Sale.
*
* @param SWSales_Sitewide_Sale $sitewide_sale to show report for.
*/
public static function show_quick_report( $sitewide_sale ) {
if ( ! is_a( $sitewide_sale, 'Sitewide_Sales\classes\SWSales_Sitewide_Sale' ) ) {
return;
}
?>
<div class="swsales_reports-quick-data-section">
<span class="swsales_reports-quick-data-label"><?php esc_html_e( 'Banner Reach', 'sitewide-sales' ); ?></span>
<span class="swsales_reports-quick-data-value"><?php echo esc_attr( $sitewide_sale->get_banner_impressions() ); ?></span>
</div>
<div class="swsales_reports-quick-data-section">
<span class="swsales_reports-quick-data-label"><?php esc_html_e( 'Landing Page Visits', 'sitewide-sales' ); ?></span>
<span class="swsales_reports-quick-data-value"><?php echo esc_attr( $sitewide_sale->get_landing_page_visits() ); ?></span>
</div>
<div class="swsales_reports-quick-data-section">
<span class="swsales_reports-quick-data-label"><?php esc_html_e( 'Conversions', 'sitewide-sales' ); ?></span>
<span class="swsales_reports-quick-data-value"><?php echo esc_attr( $sitewide_sale->get_checkout_conversions() ); ?></span>
</div>
<div class="swsales_reports-quick-data-section">
<span class="swsales_reports-quick-data-label"><?php esc_html_e( 'Sale Revenue', 'sitewide-sales' ); ?></span>
<span class="swsales_reports-quick-data-value"><?php echo esc_attr( $sitewide_sale->get_revenue() ); ?></span>
</div>
<?php
}

public static function admin_enqueue_scripts() {
global $typenow;
$screen = get_current_screen();
Expand Down
101 changes: 76 additions & 25 deletions css/admin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,34 +61,39 @@
.sitewide_sales_message,
.form-table td p.sitewide_sales_message {
background-color: #f7fcfe;
border-left: 4px solid #00a0d2;
margin-bottom: 1em;
margin-right: 1.5em;
padding: 15px;
border-color: #00a0d2;
border-style: solid;
border-width: 0 0 0 4px;
color: #3c434a;
margin-bottom: 1em;
padding: 15px;
}
.sitewide_sales_message.sitewide_sales_success,
.form-table td p.sitewide_sales_message.sitewide_sales_success {
border-left-color: #4ab866;
background-color: #eff9f1;
border-color: #c3e6cb;
background-color: #d4edda;
}
.sitewide_sales_message.sitewide_sales_error,
.form-table td p.sitewide_sales_message.sitewide_sales_error {
border-left-color: #d94f4f;
background-color: #f9e2e2;
border-color: #f5c6cb;
background-color: #f8d7da;
}
.sitewide_sales_message.sitewide_sales_alert,
.form-table td p.sitewide_sales_message.sitewide_sales_alert {
border-left-color: #f0b849;
background-color: #fef8ee;
border-color: #ffeeba;
background-color: #FFF8E0;
}
.sitewide_sales_message.sitewide_sales_success a {
color: #208A1B;
color: #0F441C;
}
.sitewide_sales_message.sitewide_sales_error a {
color: #CC0000;
color: #721c24;
}
.sitewide_sales_message.sitewide_sales_alert a {
color: #CF8516;
color: #6C5101;
}
.form-table td .sitewide_sales_message p {
margin: 0;
}

/* Sitewide Sales Custom Post Type */
Expand All @@ -114,27 +119,49 @@
}
.post-type-sitewide_sale .form-table tr th small a {
font-weight: normal;
}
.post-type-sitewide_sale #swsales_cpt_publish_sitewide_sale .inside {
margin: 0;
padding: 0;
}
.post-type-sitewide_sale #swsales_cpt_publish_sitewide_sale .misc-pub-section {
padding: 0 12px;
}
.post-type-sitewide_sale .swsales_banner_css_selectors {
background: aliceblue;
padding: 1rem;
width: 77%;
}

/* Documentation Meta Box */
#swsales_documentation.postbox {
background: #F5F5F5;
.post-type-sitewide_sale button.swsales-row-trigger-button {
align-items: center;
-webkit-appearance: none;
background: none;
border: none;
box-shadow: none;
box-sizing: border-box;
color: #2271b1;
cursor: pointer;
height: auto;
margin: 0;
outline: none;
padding: 0;
position: relative;
text-align: left;
text-decoration: underline;
width: 100%;
}
#swsales_documentation.postbox h2 {
border-bottom: 1px solid #DDD;
.post-type-sitewide_sale button.swsales-row-trigger-button:hover {
color: #135e96;
}

/* Admin Meta Box */
.post-type-sitewide_sale #swsales_cpt_publish_sitewide_sale .inside {
margin: 0;
padding: 0;
}
.post-type-sitewide_sale #swsales_cpt_publish_sitewide_sale .misc-pub-section {
padding: 0 1em;
}
.post-type-sitewide_sale #swsales_cpt_publish_sitewide_sale .sitewide_sales_message {
border-width: 0 0 4px 0;
margin-bottom: 0;
}

/* Documentation Meta Box */
#swsales_documentation.postbox ul li {
margin-bottom: 15px;
}
Expand Down Expand Up @@ -214,6 +241,30 @@
}
}

#swsales_cpt_reports .inside {
margin-top: 0;
padding: 0;
}
.swsales_reports-quick-data-section:nth-child(odd) {
background: #f6f7f7;
}
.swsales_reports-quick-data-section {
border-bottom: 1px solid #dcdcde;
display: grid;
grid-template-columns: 2fr auto;
padding: 1em;
}
.swsales_reports-quick-data-label {
font-weight: bold;
}
.swsales_reports-quick-data-value {
text-align: right;
}
.swsales_reports-quick-data-action {
padding: 1em;
text-align: center;
}

/* Sitewide Sales About Page */
.swsales-wrap {
font-size:15px;
Expand Down
2 changes: 1 addition & 1 deletion modules/banner/blocks/class-swsales-banner-module-blocks.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ protected static function is_module_active() {
*
* @param SWSales_Sitewide_Sale $sitewide_sale The sale being edited.
*/
protected static function echo_banner_settings_html_inner( $sitewide_sale ) {
public static function echo_banner_settings_html_inner( $sitewide_sale ) {
// Gather information information needed to display settings.
$banner_info = self::get_banner_info( $sitewide_sale );
$registered_locations = self::get_registered_banners();
Expand Down
7 changes: 6 additions & 1 deletion modules/banner/pum/class-swsales-banner-module-pum.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,12 @@ protected static function is_module_active() {
*
* @param SWSales_Sitewide_Sale $sitewide_sale The sale being edited.
*/
protected static function echo_banner_settings_html_inner( $sitewide_sale ) {
public static function echo_banner_settings_html_inner( $sitewide_sale ) {
// Make sure that Popup Maker is active.
if ( ! self::is_module_active() ) {
return;
}

$all_popups = pum()->popups->get_items();
$selected_popup = $sitewide_sale->swsales_banner_pum_popup_id;
?>
Expand Down
Loading

0 comments on commit b562647

Please sign in to comment.