Skip to content

Fix PAYG accounts dashboard #228

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

Merged
merged 2 commits into from
Oct 14, 2020
Merged

Fix PAYG accounts dashboard #228

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
6b329b5
Make sure that key is set before using it
Oct 7, 2020
75840e8
Make sure that there is a value for stat before using it
Oct 7, 2020
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: 5 additions & 1 deletion cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-connect.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,11 @@ public function get_usage_stat( $type, $stat = null ) {

if ( 'limit' === $stat && isset( $this->usage[ $type ]['usage'] ) ) {
$value = $this->usage[ $type ]['usage'];
} elseif ( 'used_percent' === $stat && isset( $this->usage[ $type ]['credits_usage'] ) ) {
} elseif (
'used_percent' === $stat
&& isset( $this->usage[ $type ]['credits_usage'] )
&& ! empty( $this->usage['credits']['limit'] )
) {
// Calculate percentage based on credit limit and usage.
$value = round( $this->usage[ $type ]['credits_usage'] / $this->usage['credits']['limit'] * 100, 2 );
}
Expand Down
16 changes: 12 additions & 4 deletions ...ge-management-and-manipulation-in-the-cloud-cdn/ui-definitions/tabs/dashboard-content.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,29 @@
<?php if ( false !== $connection->get_usage_stat( 'credits', 'limit' ) ) : ?>
<span class="cloudinary-stat" title="<?php esc_attr_e( 'Credits', 'cloudinary' ); ?>">
<span class="dashicons dashicons-marker"></span> <?php esc_html_e( number_format_i18n( $connection->get_usage_stat( 'credits', 'limit' ) ) ); ?>
<span class="cloudinary-percent"> <?php esc_html_e( $connection->get_usage_stat( 'credits', 'used_percent' ) . '%' ); ?></span> |
<?php if ( false !== $connection->get_usage_stat( 'credits', 'used_percent' ) ) : ?>
<span class="cloudinary-percent"> <?php esc_html_e( $connection->get_usage_stat( 'credits', 'used_percent' ) . '%' ); ?></span> |
<?php endif; ?>
</span>
<?php endif; ?>

<span class="cloudinary-stat" title="<?php esc_attr_e( 'Storage', 'cloudinary' ); ?>">
<span class="dashicons dashicons-cloud"></span> <?php esc_html_e( size_format( $connection->get_usage_stat( 'storage', 'limit' ) ) ); ?>
<span class="cloudinary-percent"> <?php esc_html_e( $connection->get_usage_stat( 'storage', 'used_percent' ) . '%' ); ?></span> |
<?php if ( false !== $connection->get_usage_stat( 'storage', 'used_percent' ) ) : ?>
<span class="cloudinary-percent"> <?php esc_html_e( $connection->get_usage_stat( 'storage', 'used_percent' ) . '%' ); ?></span> |
<?php endif; ?>
</span>
<span class="cloudinary-stat" title="<?php esc_attr_e( 'Transformations', 'cloudinary' ); ?>">
<span class="dashicons dashicons-image-filter"></span> <?php esc_html_e( number_format_i18n( $connection->get_usage_stat( 'transformations', 'limit' ) ) ); ?>
<span class="cloudinary-percent success"> <?php esc_html_e( $connection->get_usage_stat( 'transformations', 'used_percent' ) . '%' ); ?></span> |
<?php if ( false !== $connection->get_usage_stat( 'transformations', 'used_percent' ) ) : ?>
<span class="cloudinary-percent success"> <?php esc_html_e( $connection->get_usage_stat( 'transformations', 'used_percent' ) . '%' ); ?></span> |
<?php endif; ?>
</span>
<span class="cloudinary-stat" title="<?php esc_attr_e( 'Bandwidth', 'cloudinary' ); ?>">
<span class="dashicons dashicons-dashboard"></span> <?php esc_html_e( size_format( $connection->get_usage_stat( 'bandwidth', 'limit' ) ) ); ?>
<span class="cloudinary-percent success"> <?php esc_html_e( $connection->get_usage_stat( 'bandwidth', 'used_percent' ) . '%' ); ?></span>
<?php if ( false !== $connection->get_usage_stat( 'bandwidth', 'used_percent' ) ) : ?>
<span class="cloudinary-percent success"> <?php esc_html_e( $connection->get_usage_stat( 'bandwidth', 'used_percent' ) . '%' ); ?></span>
<?php endif; ?>
</span>
</div>
<hr>
Expand Down