fix: global admin notice is not working

getdokan · Nov 25, 2024 · bde68e9 · bde68e9
1 parent d1e755b
commit bde68e9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/includes/REST/AdminNoticeController.php b/includes/REST/AdminNoticeController.php
@@ -80,7 +80,7 @@ function ( $notice ) {
         );
 
         // Filter notices by scope
-        $filtered_notices = self::filter_notices_by_scope( $notices, $notice_scope );
+        $filtered_notices = $this->filter_notices_by_scope( $notices, $notice_scope );
 
         return rest_ensure_response( $filtered_notices );
     }
@@ -99,12 +99,14 @@ public function get_promo_notices() {
     /**
      * Filter notices by allowed types
      *
+     * @since DOKAN_SINCE
+     *
      * @param array $notices
      * @param string $allowed_scope
      *
      * @return array
      */
-    private static function filter_notices_by_scope( array $notices, string $allowed_scope = '' ): array {
+    private function filter_notices_by_scope( array $notices, string $allowed_scope = '' ): array {
         if ( empty( $allowed_scope ) ) {
             return $notices;
         }

diff --git a/includes/Upgrade/AdminNotice.php b/includes/Upgrade/AdminNotice.php
@@ -39,6 +39,7 @@ public static function show_notice( $notices ) {
             'title'             => __( 'Dokan Data Update Required', 'dokan-lite' ),
             'description'       => __( 'We need to update your install to the latest version', 'dokan-lite' ),
             'priority'          => 1,
+            'scope'             => 'global',
             'actions'           => [
                 [
                     'type'            => 'primary',

diff --git a/src/admin/components/AdminNotice.vue b/src/admin/components/AdminNotice.vue
@@ -94,6 +94,9 @@ export default {
                     xhr.setRequestHeader( 'X-WP-Nonce', dokan_promo.rest.nonce );
                 },
             } ).done( response => {
+                if ( ! Array.isArray( response ) ){
+                    response = Object.entries( response ).map( ( [ id, data ] ) => ( { id, ...data } ) );
+                }
                 this.notices = response.filter( notice => notice.description || notice.title );
                 this.startAutoSlide();
             });