| @@ -32,9 +32,10 @@ | ||
| 32 | 32 | if ( $block_name === 'Formidable' ) { |
| 33 | 33 | $block_name = 'Formidable Forms'; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | - $modal_addon = self::get_modal_addon_info(); | |
| 36 | + $modal_addon = self::get_addon_info( 185013 ); | |
| 37 | + $charts_addon = self::get_addon_info( 28248560 ); | |
| 37 | 38 | |
| 38 | 39 | $script_vars = array( |
| 39 | 40 | 'forms' => self::get_forms_options(), |
| 40 | 41 | 'icon' => $icon, |
| @@ -41,11 +42,16 @@ | ||
| 41 | 42 | 'name' => $block_name, |
| 42 | 43 | 'link' => FrmAppHelper::admin_upgrade_link( 'block' ), |
| 43 | 44 | 'url' => FrmAppHelper::plugin_url(), |
| 44 | 45 | 'modalAddon' => array( |
| 45 | - 'link' => FrmAppHelper::admin_upgrade_link( 'addons', $modal_addon['link'] ), | |
| 46 | + 'link' => FrmAppHelper::admin_upgrade_link( 'block', $modal_addon['link'] ), | |
| 46 | 47 | 'hasAccess' => ! empty( $modal_addon['url'] ), |
| 47 | 48 | ), |
| 49 | + 'chartsAddon' => array( | |
| 50 | + 'link' => FrmAppHelper::admin_upgrade_link( 'block', $charts_addon['link'] ), | |
| 51 | + 'hasAccess' => ! empty( $charts_addon['url'] ), | |
| 52 | + 'installed' => class_exists( 'FrmChartsAppController' ), | |
| 53 | + ), | |
| 48 | 54 | ); |
| 49 | 55 | |
| 50 | 56 | wp_localize_script( 'formidable-form-selector', 'formidable_form_selector', $script_vars ); |
| 51 | 57 | if ( function_exists( 'wp_set_script_translations' ) ) { |
| @@ -60,18 +66,18 @@ | ||
| 60 | 66 | ); |
| 61 | 67 | } |
| 62 | 68 | |
| 63 | 69 | /** |
| 64 | - * Gets the modal addon info. | |
| 70 | + * Gets addon info. | |
| 65 | 71 | * |
| 66 | - * @since 6.3.2 | |
| 72 | + * @since 6.8 | |
| 67 | 73 | * |
| 74 | + * @param int $addon_id Addon ID. | |
| 68 | 75 | * @return array|false |
| 69 | 76 | */ |
| 70 | - private static function get_modal_addon_info() { | |
| 71 | - $api = new FrmFormApi(); | |
| 72 | - $addons = $api->get_api_info(); | |
| 73 | - $addon_id = 185013; | |
| 77 | + private static function get_addon_info( $addon_id ) { | |
| 78 | + $api = new FrmFormApi(); | |
| 79 | + $addons = $api->get_api_info(); | |
| 74 | 80 | |
| 75 | 81 | if ( ! is_array( $addons ) || ! array_key_exists( $addon_id, $addons ) ) { |
| 76 | 82 | return false; |
| 77 | 83 | } |
| @@ -103,15 +109,15 @@ | ||
| 103 | 109 | |
| 104 | 110 | /** |
| 105 | 111 | * Returns an array for a form with name as label and id as value |
| 106 | 112 | * |
| 107 | - * @param $form | |
| 113 | + * @param object $form | |
| 108 | 114 | * |
| 109 | 115 | * @return array |
| 110 | 116 | */ |
| 111 | 117 | private static function set_form_options( $form ) { |
| 112 | 118 | return array( |
| 113 | - 'label' => $form->name, | |
| 119 | + 'label' => FrmFormsHelper::edit_form_link_label( $form ), | |
| 114 | 120 | 'value' => $form->id, |
| 115 | 121 | ); |
| 116 | 122 | } |
| 117 | 123 | |