Replace more badges URLs

Author: aristath

classes/admin/class-enqueue.php

@@ -312,7 +312,7 @@ private function get_badge_urls() {
 		$monthly_badge = \progress_planner()->get_badges()->get_badge( Monthly::get_badge_id_from_date( new \DateTime() ) );
 
 		if ( $monthly_badge ) {
-			$badge_urls['month'] = \progress_planner()->get_remote_server_root_url() . '/wp-json/progress-planner-saas/v1/badge-svg/?badge_id=' . $monthly_badge->get_id();
+			$badge_urls['month'] = \progress_planner()->get_remote_server_root_url() . '/wp-json/progress-planner-saas/v1/badge-svg/?badge_id=' . $monthly_badge->get_id() . '&branding_id=' . (int) \progress_planner()->get_ui__branding()->get_branding_id();
 		}
 
 		// Get the content and maintenance badge URLs.
@@ -321,12 +321,12 @@ private function get_badge_urls() {
 			foreach ( $set_badges as $badge ) {
 				$progress = $badge->get_progress();
 				if ( $progress['progress'] > 100 ) {
-					$badge_urls[ $context ] = \progress_planner()->get_remote_server_root_url() . '/wp-json/progress-planner-saas/v1/badge-svg/?badge_id=' . $badge->get_id();
+					$badge_urls[ $context ] = \progress_planner()->get_remote_server_root_url() . '/wp-json/progress-planner-saas/v1/badge-svg/?badge_id=' . $badge->get_id() . '&branding_id=' . (int) \progress_planner()->get_ui__branding()->get_branding_id();
 				}
 			}
 			if ( ! isset( $badge_urls[ $context ] ) ) {
 				// Fallback to the first badge in the set if no badge is completed.
-				$badge_urls[ $context ] = \progress_planner()->get_remote_server_root_url() . '/wp-json/progress-planner-saas/v1/badge-svg/?badge_id=' . $set_badges[0]->get_id();
+				$badge_urls[ $context ] = \progress_planner()->get_remote_server_root_url() . '/wp-json/progress-planner-saas/v1/badge-svg/?badge_id=' . $set_badges[0]->get_id() . '&branding_id=' . (int) \progress_planner()->get_ui__branding()->get_branding_id();
 			}
 		}
 

views/popovers/parts/upgrade-tasks.php

@@ -102,12 +102,12 @@
 			<span class="prpl-onboarding-tasks-montly-badge">
 				<span class="prpl-onboarding-tasks-montly-badge-image">
 					<img
-						src="<?php echo \esc_url( \progress_planner()->get_remote_server_root_url() . '/wp-json/progress-planner-saas/v1/badge-svg/?badge_id=' . \esc_attr( $prpl_badge->get_id() ) ); ?>"
+						src="<?php echo \esc_url( \progress_planner()->get_remote_server_root_url() . '/wp-json/progress-planner-saas/v1/badge-svg/?badge_id=' . \esc_attr( $prpl_badge->get_id() ) . '&branding_id=' . (int) \progress_planner()->get_ui__branding()->get_branding_id() ); ?>"
 						alt="<?php \esc_attr_e( 'Badge', 'progress-planner' ); ?>"
 						onerror="this.onerror=null;this.src='<?php echo \esc_url( \progress_planner()->get_placeholder_svg() ); ?>';"
 					/>
 				</span>
-				<?php \esc_html_e( 'These tasks contribute to your monthly badge—every check completed brings you closer!', 'progress-planner' ); ?>
+				<?php \esc_html_e( 'These tasks contribute to your monthly badge. Every check completed brings you closer!', 'progress-planner' ); ?>
 			</span>
 			<span class="prpl-onboarding-tasks-total-points">0pt</span>
 		</div>