| @@ -109,8 +109,175 @@ | ||
| 109 | 109 | return $fields; |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | /** |
| 113 | + * Label a settings group for its tab. | |
| 114 | + * | |
| 115 | + * The label is the group's `heading` field, which is also what the panel | |
| 116 | + * shows, so a tab and its panel can never disagree. An add-on that adds a | |
| 117 | + * group without a heading still gets a usable tab rather than a blank one: | |
| 118 | + * `live_qr_settings` reads as "Live Qr Settings", which is wrong-ish but | |
| 119 | + * findable, and the fix is for that add-on to add a heading. | |
| 120 | + * | |
| 121 | + * `main` is the exception. It is what a field with no `group` falls back to, | |
| 122 | + * so it holds whatever nobody placed rather than anything named "Main". No | |
| 123 | + * field ships in it — this plugin has no settings that are merely general — | |
| 124 | + * and it only becomes a tab when something lands there uninvited. | |
| 125 | + * | |
| 126 | + * @param string $group_id Group key. | |
| 127 | + * @param array $group Group data: `fields`, `priority`. | |
| 128 | + * @return string Unescaped label. | |
| 129 | + */ | |
| 130 | + public static function group_label( $group_id, array $group ) { | |
| 131 | + foreach ( $group['fields'] ?? array() as $field ) { | |
| 132 | + if ( 'heading' === ( $field['type'] ?? '' ) && ! empty( $field['field_data']['title'] ) ) { | |
| 133 | + return $field['field_data']['title']; | |
| 134 | + } | |
| 135 | + } | |
| 136 | + | |
| 137 | + if ( 'main' === $group_id ) { | |
| 138 | + return __( 'General', 'subscription' ); | |
| 139 | + } | |
| 140 | + | |
| 141 | + return ucwords( str_replace( array( '_', '-' ), ' ', (string) $group_id ) ); | |
| 142 | + } | |
| 143 | + | |
| 144 | + /** | |
| 145 | + * Whether every field in a group is locked behind Pro. | |
| 146 | + * | |
| 147 | + * Drives the "Pro" marker on the tab, so the whole panel does not have to be | |
| 148 | + * opened to find out that none of it can be changed yet. | |
| 149 | + * | |
| 150 | + * @param array $group Group data. | |
| 151 | + * @return bool | |
| 152 | + */ | |
| 153 | + public static function group_is_pro_locked( array $group ) { | |
| 154 | + $has_field = false; | |
| 155 | + | |
| 156 | + foreach ( $group['fields'] ?? array() as $field ) { | |
| 157 | + if ( 'heading' === ( $field['type'] ?? '' ) ) { | |
| 158 | + continue; | |
| 159 | + } | |
| 160 | + $has_field = true; | |
| 161 | + if ( empty( $field['field_data']['pro_locked'] ) ) { | |
| 162 | + return false; | |
| 163 | + } | |
| 164 | + } | |
| 165 | + | |
| 166 | + return $has_field; | |
| 167 | + } | |
| 168 | + | |
| 169 | + /** | |
| 170 | + * The settings sections, in display order. | |
| 171 | + * | |
| 172 | + * One level, named for the job a merchant came to do rather than for the | |
| 173 | + * plugin's internals. Each section is one rail item and one panel; the | |
| 174 | + * groups inside it stack, so nothing is ever two clicks deep. | |
| 175 | + * | |
| 176 | + * There is deliberately no "All settings" entry. It duplicated every panel | |
| 177 | + * on one page, which made the rail beside it look like decoration and gave | |
| 178 | + * every setting two addresses. | |
| 179 | + * | |
| 180 | + * @return array<string,string> Section key => label. | |
| 181 | + */ | |
| 182 | + public static function categories() { | |
| 183 | + return array( | |
| 184 | + 'renewals' => __( 'Renewals', 'subscription' ), | |
| 185 | + 'payments' => __( 'Payments', 'subscription' ), | |
| 186 | + 'switching' => __( 'Switching & Upgrades', 'subscription' ), | |
| 187 | + 'customers' => __( 'Customers', 'subscription' ), | |
| 188 | + 'advanced' => __( 'Advanced', 'subscription' ), | |
| 189 | + ); | |
| 190 | + } | |
| 191 | + | |
| 192 | + /** | |
| 193 | + * Which section a settings group belongs to. | |
| 194 | + * | |
| 195 | + * Groups are merged rather than mapped one-to-one: a section holding a | |
| 196 | + * single option is a wasted click, so `health_queue` sits with the other | |
| 197 | + * plumbing in Advanced, and everything the customer meets — the role they | |
| 198 | + * are given, checking out as a guest, what their subscription's quick view | |
| 199 | + * shows — is in Customers. | |
| 200 | + * | |
| 201 | + * Unmapped groups, including any an add-on registers without knowing | |
| 202 | + * sections exist, fall into `advanced`, so a new group is always reachable. | |
| 203 | + * | |
| 204 | + * @param string $group_id Group key. | |
| 205 | + * @return string Section key. | |
| 206 | + */ | |
| 207 | + public static function group_category( $group_id ) { | |
| 208 | + $map = array( | |
| 209 | + 'renewals' => 'renewals', | |
| 210 | + 'license_settings' => 'renewals', | |
| 211 | + 'stock_management' => 'renewals', | |
| 212 | + 'payment_gateways' => 'payments', | |
| 213 | + 'payment_failure' => 'payments', | |
| 214 | + 'grace_period' => 'payments', | |
| 215 | + 'switching' => 'switching', | |
| 216 | + 'role_based_settings' => 'customers', | |
| 217 | + 'guest_checkout' => 'customers', | |
| 218 | + 'live_qr_settings' => 'customers', | |
| 219 | + 'api_settings' => 'advanced', | |
| 220 | + 'health_queue' => 'advanced', | |
| 221 | + ); | |
| 222 | + | |
| 223 | + return $map[ $group_id ] ?? 'advanced'; | |
| 224 | + } | |
| 225 | + | |
| 226 | + /** | |
| 227 | + * Group keys bucketed by section, each list in the order the groups already | |
| 228 | + * sort in. | |
| 229 | + * | |
| 230 | + * Empty sections are dropped. Most of them are filled by Pro, and free | |
| 231 | + * alone would otherwise show rail items that open onto nothing. | |
| 232 | + * | |
| 233 | + * @param array $settings_fields Grouped, sorted settings fields. | |
| 234 | + * @return array<string,string[]> Section key => ordered group keys. | |
| 235 | + */ | |
| 236 | + public static function category_groups( array $settings_fields ) { | |
| 237 | + $out = array(); | |
| 238 | + foreach ( array_keys( self::categories() ) as $cat ) { | |
| 239 | + $out[ $cat ] = array(); | |
| 240 | + } | |
| 241 | + | |
| 242 | + foreach ( array_keys( $settings_fields ) as $group_id ) { | |
| 243 | + $cat = self::group_category( $group_id ); | |
| 244 | + $out[ $cat ][] = $group_id; | |
| 245 | + } | |
| 246 | + | |
| 247 | + return array_filter( | |
| 248 | + $out, | |
| 249 | + function ( $group_ids ) { | |
| 250 | + return ! empty( $group_ids ); | |
| 251 | + } | |
| 252 | + ); | |
| 253 | + } | |
| 254 | + | |
| 255 | + /** | |
| 256 | + * Whether every group in a section is locked behind Pro. | |
| 257 | + * | |
| 258 | + * Drives the "Pro" marker on the rail item, so a section none of which can | |
| 259 | + * be changed yet says so before it is opened. | |
| 260 | + * | |
| 261 | + * @param string[] $group_ids Group keys in the section. | |
| 262 | + * @param array $settings_fields Grouped settings fields. | |
| 263 | + * @return bool | |
| 264 | + */ | |
| 265 | + public static function category_is_pro_locked( array $group_ids, array $settings_fields ) { | |
| 266 | + if ( empty( $group_ids ) ) { | |
| 267 | + return false; | |
| 268 | + } | |
| 269 | + | |
| 270 | + foreach ( $group_ids as $group_id ) { | |
| 271 | + if ( ! self::group_is_pro_locked( $settings_fields[ $group_id ] ?? array() ) ) { | |
| 272 | + return false; | |
| 273 | + } | |
| 274 | + } | |
| 275 | + | |
| 276 | + return true; | |
| 277 | + } | |
| 278 | + | |
| 279 | + /** | |
| 113 | 280 | * Render specified settings field. |
| 114 | 281 | * |
| 115 | 282 | * @param string $field Field type. |
| 116 | 283 | * @param array $args Field arguments. |
| @@ -133,8 +300,10 @@ | ||
| 133 | 300 | case 'multi_select': |
| 134 | 301 | return self::render_multiselect_field( $args, $should_print ); |
| 135 | 302 | case 'join': |
| 136 | 303 | return self::render_joined_field( $args, $should_print ); |
| 304 | + case 'editlist': | |
| 305 | + return self::render_editlist_field( $args, $should_print ); | |
| 137 | 306 | case 'input': |
| 138 | 307 | default: |
| 139 | 308 | return self::render_input_field( $args, $should_print ); |
| 140 | 309 | } |
| @@ -139,9 +308,18 @@ | ||
| 139 | 308 | return self::render_input_field( $args, $should_print ); |
| 140 | 309 | } |
| 141 | 310 | } |
| 142 | 311 | |
| 312 | + /** | |
| 313 | + * Pro badge markup, shown beside settings that require WPSubscription Pro. | |
| 314 | + * | |
| 315 | + * @return string Pre-escaped badge HTML. | |
| 316 | + */ | |
| 317 | + public static function pro_badge_html() { | |
| 318 | + return '<span class="subscrpt-pro-badge" title="' . esc_attr__( 'WPSubscription Pro required', 'subscription' ) . '">' . esc_html__( 'Pro', 'subscription' ) . '</span>'; | |
| 319 | + } | |
| 143 | 320 | |
| 321 | + | |
| 144 | 322 | /** |
| 145 | 323 | * Text Element HTML. |
| 146 | 324 | * |
| 147 | 325 | * @param array $args Same as 'render_text_field'. |
| @@ -152,15 +330,13 @@ | ||
| 152 | 330 | $value = $args['value'] ?? ''; |
| 153 | 331 | $placeholder = $args['placeholder'] ?? ''; |
| 154 | 332 | $type = $args['type'] ?? 'text'; |
| 155 | 333 | |
| 156 | - $join_class = $join_item ? 'join-item mx-0!' : ''; | |
| 157 | - | |
| 158 | 334 | $disabled_attr = isset( $args['disabled'] ) && $args['disabled'] ? 'disabled' : ''; |
| 159 | 335 | |
| 160 | - $style_attr = 'outline-offset: 0.5px !important; outline-color: #e5e7eb !important;'; | |
| 336 | + $style_attr = ''; | |
| 161 | 337 | if ( isset( $args['style'] ) ) { |
| 162 | - $style_attr .= ' ' . $args['style']; | |
| 338 | + $style_attr = $args['style']; | |
| 163 | 339 | } |
| 164 | 340 | |
| 165 | 341 | $other_attrs_html = ''; |
| 166 | 342 | foreach ( ( $args['attributes'] ?? [] ) as $attr_key => $attr_value ) { |
| @@ -168,13 +344,16 @@ | ||
| 168 | 344 | } |
| 169 | 345 | |
| 170 | 346 | ob_start(); |
| 171 | 347 | ?> |
| 172 | - <input | |
| 348 | + <input | |
| 173 | 349 | id="<?php echo esc_attr( $id ); ?>" |
| 174 | 350 | name="<?php echo esc_attr( $id ); ?>" |
| 175 | - class="input! min-w-80! max-w-full! <?php echo esc_attr( $join_class ); ?>" | |
| 176 | - style="<?php echo esc_attr( $style_attr ); ?>" | |
| 351 | + class="wpsubs-input" | |
| 352 | + <?php | |
| 353 | + if ( $style_attr ) : | |
| 354 | + ?> | |
| 355 | + style="<?php echo esc_attr( $style_attr ); ?>"<?php endif; ?> | |
| 177 | 356 | type="<?php echo esc_attr( $type ); ?>" |
| 178 | 357 | placeholder="<?php echo esc_attr( $placeholder ); ?>" |
| 179 | 358 | value="<?php echo esc_attr( $value ); ?>" |
| 180 | 359 | <?php echo esc_attr( $disabled_attr ); ?> |
| @@ -190,88 +369,56 @@ | ||
| 190 | 369 | * @param array $args Same as 'render_select_field'. |
| 191 | 370 | * @param bool $join_item Whether to return element for 'join' container or not. |
| 192 | 371 | */ |
| 193 | 372 | public static function select_element( $args = [], $join_item = false ) { |
| 194 | - $id = $args['id']; | |
| 195 | - $value = $args['value'] ?? ''; | |
| 373 | + $id = $args['id']; | |
| 196 | 374 | |
| 197 | - $join_class = $join_item ? 'join-item mx-0!' : ''; | |
| 198 | - $wc_enhanced_class = isset( $args['enhanced'] ) && $args['enhanced']; | |
| 375 | + // Enhanced / multiselect → wpsubs-tag-select (pill input with filter). | |
| 376 | + if ( isset( $args['enhanced'] ) && $args['enhanced'] ) { | |
| 377 | + $multiple = isset( $args['attributes']['multiple'] ) && $args['attributes']['multiple']; | |
| 378 | + $adv_options = array(); | |
| 379 | + foreach ( ( $args['options'] ?? [] ) as $opt_value => $opt_label ) { | |
| 380 | + $adv_options[] = array( | |
| 381 | + 'value' => (string) $opt_value, | |
| 382 | + 'label' => $opt_label, | |
| 383 | + ); | |
| 384 | + } | |
| 199 | 385 | |
| 200 | - $basic_classes = 'select! min-w-80! max-w-full!'; | |
| 201 | - | |
| 202 | - // WC Select2 style (multiselect). | |
| 203 | - if ( $wc_enhanced_class ) { | |
| 204 | - // Enqueue WooCommerce enhanced select script & styles. | |
| 205 | - wp_enqueue_style( 'woocommerce_admin_styles' ); | |
| 206 | - wp_enqueue_script( 'wc-enhanced-select' ); | |
| 207 | - | |
| 208 | - // Update basic classes for wc-enhanced-select. | |
| 209 | - $basic_classes = 'min-w-80! max-w-full! wc-enhanced-select'; | |
| 386 | + ob_start(); | |
| 387 | + wpsubs_render_tag_select( | |
| 388 | + array( | |
| 389 | + 'name' => $id, | |
| 390 | + 'value' => $args['selected'] ?? ( $multiple ? array() : '' ), | |
| 391 | + 'options' => $adv_options, | |
| 392 | + 'multiple' => $multiple, | |
| 393 | + ) | |
| 394 | + ); | |
| 395 | + return ob_get_clean(); | |
| 210 | 396 | } |
| 211 | 397 | |
| 212 | - // Need to prefix name with [] for multiple select. | |
| 213 | - $name_prefix = ''; | |
| 214 | - if ( isset( $args['attributes']['multiple'] ) && $args['attributes']['multiple'] ) { | |
| 215 | - $name_prefix = '[]'; | |
| 216 | - } | |
| 217 | - | |
| 218 | - $style_attr = 'outline-offset: 0.5px !important; outline-color: #e5e7eb !important;'; | |
| 219 | - if ( isset( $args['style'] ) ) { | |
| 220 | - $style_attr .= ' ' . $args['style']; | |
| 221 | - } | |
| 222 | - | |
| 223 | - $other_attrs_html = ''; | |
| 224 | - foreach ( ( $args['attributes'] ?? [] ) as $attr_key => $attr_value ) { | |
| 225 | - $other_attrs_html .= sprintf( ' %s="%s" ', esc_attr( $attr_key ), esc_attr( $attr_value ) ); | |
| 226 | - } | |
| 227 | - | |
| 228 | - $options_html = ''; | |
| 229 | - foreach ( ( $args['options'] ?? [] ) as $value => $label ) { | |
| 230 | - $selected = false; | |
| 231 | - if ( isset( $args['selected'] ) ) { | |
| 232 | - if ( is_array( $args['selected'] ) ) { | |
| 233 | - $selected = in_array( $value, $args['selected'], true ); | |
| 234 | - } else { | |
| 235 | - $selected = $args['selected'] === $value; | |
| 236 | - } | |
| 237 | - } | |
| 238 | - | |
| 239 | - $disabled = false; | |
| 240 | - if ( isset( $args['disabled'] ) ) { | |
| 241 | - if ( is_array( $args['disabled'] ) ) { | |
| 242 | - $disabled = in_array( $value, $args['disabled'], true ); | |
| 243 | - } else { | |
| 244 | - $disabled = $args['disabled'] === $value; | |
| 245 | - } | |
| 246 | - } | |
| 247 | - | |
| 248 | - $options_tmp_html = sprintf( | |
| 249 | - '<option value="%s" %s %s>%s</option>', | |
| 250 | - esc_attr( $value ), | |
| 251 | - $selected ? 'selected' : '', | |
| 252 | - $disabled ? 'disabled' : '', | |
| 253 | - esc_html( $label ), | |
| 398 | + // Regular select → wpsubs-adv-select (button-based custom dropdown). | |
| 399 | + $selected = (string) ( $args['selected'] ?? '' ); | |
| 400 | + $adv_options = array(); | |
| 401 | + foreach ( ( $args['options'] ?? [] ) as $opt_value => $opt_label ) { | |
| 402 | + $adv_options[] = array( | |
| 403 | + 'value' => (string) $opt_value, | |
| 404 | + 'label' => $opt_label, | |
| 405 | + 'disabled' => isset( $args['disabled'] ) && ( is_array( $args['disabled'] ) | |
| 406 | + ? in_array( $opt_value, $args['disabled'], true ) | |
| 407 | + : $args['disabled'] === $opt_value ), | |
| 254 | 408 | ); |
| 255 | - $options_html .= $options_tmp_html; | |
| 256 | 409 | } |
| 257 | 410 | |
| 258 | 411 | ob_start(); |
| 259 | - ?> | |
| 260 | - <select | |
| 261 | - id="<?php echo esc_attr( $id ); ?>" | |
| 262 | - name="<?php echo esc_attr( $id . $name_prefix ); ?>" | |
| 263 | - class="<?php echo esc_attr( $basic_classes . ' ' . $join_class ); ?>" | |
| 264 | - style="<?php echo esc_attr( $style_attr ); ?>" | |
| 265 | - <?php echo wp_kses_post( $other_attrs_html ); ?> | |
| 266 | - > | |
| 267 | - <?php | |
| 268 | - // Output intentionally not escaped as options are already escaped during generation & re-escaping breaks the HTML structure. | |
| 269 | - // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 270 | - echo $options_html; | |
| 271 | - ?> | |
| 272 | - </select> | |
| 273 | - <?php | |
| 412 | + wpsubs_render_adv_select( | |
| 413 | + array( | |
| 414 | + 'name' => $id, | |
| 415 | + 'value' => $selected, | |
| 416 | + 'options' => $adv_options, | |
| 417 | + 'align' => 'left', | |
| 418 | + 'class' => $args['class'] ?? '', | |
| 419 | + ) | |
| 420 | + ); | |
| 274 | 421 | return ob_get_clean(); |
| 275 | 422 | } |
| 276 | 423 | |
| 277 | 424 | /** |
| @@ -289,17 +436,14 @@ | ||
| 289 | 436 | $description = $args['description'] ?? ''; |
| 290 | 437 | |
| 291 | 438 | ob_start(); |
| 292 | 439 | ?> |
| 293 | - <div class="my-4 first-of-type:mt-0"> | |
| 294 | - <h2 class="m-0!"><?php echo esc_html( $title ); ?></h2> | |
| 295 | - | |
| 296 | - <?php if ( ! empty( $description ) ) : ?> | |
| 297 | - <p class="mb-0! mt-2! ml-0.5! text-[13px]! text-gray-500!"> | |
| 298 | - <?php echo wp_kses_post( $description ); ?> | |
| 299 | - </p> | |
| 300 | - <?php endif; ?> | |
| 301 | - </div> | |
| 440 | + <div class="wpsubs-settings-heading"> | |
| 441 | + <h3 class="wpsubs-settings-heading__title"><?php echo esc_html( $title ); ?></h3> | |
| 442 | + <?php if ( ! empty( $description ) ) : ?> | |
| 443 | + <p class="wpsubs-settings-heading__desc"><?php echo wp_kses_post( $description ); ?></p> | |
| 444 | + <?php endif; ?> | |
| 445 | + </div> | |
| 302 | 446 | <?php |
| 303 | 447 | $html_content = ob_get_clean(); |
| 304 | 448 | |
| 305 | 449 | // Output not escaped intentionally. Breaks the HTML structure when escaped. |
| @@ -337,25 +481,29 @@ | ||
| 337 | 481 | $text_el_html = self::inp_element( $args ); |
| 338 | 482 | |
| 339 | 483 | ob_start(); |
| 340 | 484 | ?> |
| 341 | - <div class="grid grid-cols-6 gap-4"> | |
| 342 | - <span class="font-semibold text-sm mt-0.5"><?php echo esc_html( $title ); ?></span> | |
| 343 | - | |
| 344 | - <div class="col-span-5"> | |
| 345 | - <?php | |
| 346 | - // Output intentionally not escaped as element is already escaped during generation & re-escaping breaks the HTML structure. | |
| 347 | - // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 348 | - echo $text_el_html; | |
| 349 | - ?> | |
| 350 | - <br/> | |
| 351 | - <?php if ( ! empty( $description ) ) : ?> | |
| 352 | - <p class="mb-0! mt-2! ml-0.5! text-[13px]! text-gray-500!"> | |
| 353 | - <?php echo wp_kses_post( $description ); ?> | |
| 354 | - </p> | |
| 355 | - <?php endif; ?> | |
| 356 | - </div> | |
| 485 | + <div class="wpsubs-settings-field<?php echo ! empty( $args['pro_locked'] ) ? ' wpsubs-settings-field--locked' : ''; ?>"> | |
| 486 | + <div class="wpsubs-settings-field__label"> | |
| 487 | + <?php | |
| 488 | + if ( ! empty( $args['pro_locked'] ) ) { | |
| 489 | + // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Pre-escaped badge markup. | |
| 490 | + echo self::pro_badge_html(); | |
| 491 | + } | |
| 492 | + ?> | |
| 493 | + <?php echo esc_html( $title ); ?> | |
| 357 | 494 | </div> |
| 495 | + <div class="wpsubs-settings-field__control"> | |
| 496 | + <?php | |
| 497 | + // Output intentionally not escaped as element is already escaped during generation & re-escaping breaks the HTML structure. | |
| 498 | + // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 499 | + echo $text_el_html; | |
| 500 | + ?> | |
| 501 | + <?php if ( ! empty( $description ) ) : ?> | |
| 502 | + <p class="wpsubs-settings-field__hint"><?php echo wp_kses_post( $description ); ?></p> | |
| 503 | + <?php endif; ?> | |
| 504 | + </div> | |
| 505 | + </div> | |
| 358 | 506 | <?php |
| 359 | 507 | $html_content = ob_get_clean(); |
| 360 | 508 | |
| 361 | 509 | // Output not escaped intentionally. Breaks the HTML structure when escaped. |
| @@ -395,9 +543,9 @@ | ||
| 395 | 543 | |
| 396 | 544 | $description_html = ''; |
| 397 | 545 | if ( ! empty( $description ) ) { |
| 398 | 546 | $description_html = sprintf( |
| 399 | - '<p class="mb-0! mt-2! ml-0.5! text-[13px]! text-gray-500!">%s</p>', | |
| 547 | + '<p class="wpsubs-settings-field__hint">%s</p>', | |
| 400 | 548 | wp_kses_post( $description ) |
| 401 | 549 | ); |
| 402 | 550 | } |
| 403 | 551 | |
| @@ -415,37 +563,42 @@ | ||
| 415 | 563 | $disabled_attr = isset( $args['disabled'] ) && (bool) $args['disabled'] ? 'disabled' : ''; |
| 416 | 564 | |
| 417 | 565 | ob_start(); |
| 418 | 566 | ?> |
| 419 | - <div class="grid grid-cols-6 gap-4"> | |
| 420 | - <span class="font-semibold text-sm mt-0.5"><?php echo esc_html( $title ); ?></span> | |
| 421 | - | |
| 422 | - <div class="col-span-5"> | |
| 423 | - <label for="<?php echo esc_attr( $id ); ?>"> | |
| 424 | - <input | |
| 425 | - id="<?php echo esc_attr( $id ); ?>" | |
| 426 | - name="<?php echo esc_attr( $id ); ?>" | |
| 427 | - class="wp-subscription-toggle" | |
| 428 | - style="<?php echo esc_attr( $style_attr ); ?>" | |
| 429 | - type="checkbox" | |
| 430 | - value="<?php echo esc_attr( $value ); ?>" | |
| 431 | - <?php echo esc_attr( $checked_attr ); ?> | |
| 432 | - <?php echo esc_attr( $disabled_attr ); ?> | |
| 433 | - <?php | |
| 434 | - // Output intentionally not escaped as element is already escaped during generation & re-escaping breaks the HTML structure. | |
| 435 | - // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 436 | - echo $other_attrs_html; | |
| 437 | - ?> | |
| 438 | - /> | |
| 439 | - <span class="wp-subscription-toggle-ui" aria-hidden="true"></span> | |
| 440 | - | |
| 441 | - <span class="ml-2 text-sm align-middle"><?php echo esc_html( $label ); ?></span> | |
| 442 | - </label> | |
| 443 | - | |
| 444 | - <br/> | |
| 445 | - <?php echo wp_kses_post( $description_html ); ?> | |
| 446 | - </div> | |
| 567 | + <div class="wpsubs-settings-field<?php echo ! empty( $args['pro_locked'] ) ? ' wpsubs-settings-field--locked' : ''; ?>"> | |
| 568 | + <div class="wpsubs-settings-field__label"> | |
| 569 | + <?php | |
| 570 | + if ( ! empty( $args['pro_locked'] ) ) { | |
| 571 | + // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Pre-escaped badge markup. | |
| 572 | + echo self::pro_badge_html(); | |
| 573 | + } | |
| 574 | + ?> | |
| 575 | + <?php echo esc_html( $title ); ?> | |
| 447 | 576 | </div> |
| 577 | + <div class="wpsubs-settings-field__control"> | |
| 578 | + <label class="wpsubs-settings-toggle-label" for="<?php echo esc_attr( $id ); ?>"> | |
| 579 | + <input | |
| 580 | + id="<?php echo esc_attr( $id ); ?>" | |
| 581 | + name="<?php echo esc_attr( $id ); ?>" | |
| 582 | + class="wpsubs-toggle" | |
| 583 | + type="checkbox" | |
| 584 | + value="<?php echo esc_attr( $value ); ?>" | |
| 585 | + <?php echo esc_attr( $checked_attr ); ?> | |
| 586 | + <?php echo esc_attr( $disabled_attr ); ?> | |
| 587 | + <?php | |
| 588 | + // Output intentionally not escaped as element is already escaped during generation & re-escaping breaks the HTML structure. | |
| 589 | + // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 590 | + echo $other_attrs_html; | |
| 591 | + ?> | |
| 592 | + /> | |
| 593 | + <span class="wpsubs-toggle-ui" aria-hidden="true"></span> | |
| 594 | + <?php if ( ! empty( $label ) ) : ?> | |
| 595 | + <span class="wpsubs-settings-toggle-label__text"><?php echo esc_html( $label ); ?></span> | |
| 596 | + <?php endif; ?> | |
| 597 | + </label> | |
| 598 | + <?php echo wp_kses_post( $description_html ); ?> | |
| 599 | + </div> | |
| 600 | + </div> | |
| 448 | 601 | <?php |
| 449 | 602 | $html_content = ob_get_clean(); |
| 450 | 603 | |
| 451 | 604 | // Output not escaped intentionally. Breaks the HTML structure when escaped. |
| @@ -483,25 +636,29 @@ | ||
| 483 | 636 | $select_el_html = self::select_element( $args ); |
| 484 | 637 | |
| 485 | 638 | ob_start(); |
| 486 | 639 | ?> |
| 487 | - <div class="grid grid-cols-6 gap-4"> | |
| 488 | - <span class="font-semibold text-sm mt-0.5"><?php echo esc_html( $title ); ?></span> | |
| 489 | - | |
| 490 | - <div class="col-span-5"> | |
| 491 | - <?php | |
| 492 | - // Output intentionally not escaped as element is already escaped during generation & re-escaping breaks the HTML structure. | |
| 493 | - // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 494 | - echo $select_el_html; | |
| 495 | - ?> | |
| 496 | - <br/> | |
| 497 | - <?php if ( ! empty( $description ) ) : ?> | |
| 498 | - <p class="mb-0! mt-2! ml-0.5! text-[13px]! text-gray-500!"> | |
| 499 | - <?php echo wp_kses_post( $description ); ?> | |
| 500 | - </p> | |
| 501 | - <?php endif; ?> | |
| 502 | - </div> | |
| 640 | + <div class="wpsubs-settings-field<?php echo ! empty( $args['pro_locked'] ) ? ' wpsubs-settings-field--locked' : ''; ?>"> | |
| 641 | + <div class="wpsubs-settings-field__label"> | |
| 642 | + <?php | |
| 643 | + if ( ! empty( $args['pro_locked'] ) ) { | |
| 644 | + // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Pre-escaped badge markup. | |
| 645 | + echo self::pro_badge_html(); | |
| 646 | + } | |
| 647 | + ?> | |
| 648 | + <?php echo esc_html( $title ); ?> | |
| 503 | 649 | </div> |
| 650 | + <div class="wpsubs-settings-field__control"> | |
| 651 | + <?php | |
| 652 | + // Output intentionally not escaped as element is already escaped during generation & re-escaping breaks the HTML structure. | |
| 653 | + // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 654 | + echo $select_el_html; | |
| 655 | + ?> | |
| 656 | + <?php if ( ! empty( $description ) ) : ?> | |
| 657 | + <p class="wpsubs-settings-field__hint"><?php echo wp_kses_post( $description ); ?></p> | |
| 658 | + <?php endif; ?> | |
| 659 | + </div> | |
| 660 | + </div> | |
| 504 | 661 | <?php |
| 505 | 662 | $html_content = ob_get_clean(); |
| 506 | 663 | |
| 507 | 664 | // Output not escaped intentionally. Breaks the HTML structure when escaped. |
| @@ -545,33 +702,145 @@ | ||
| 545 | 702 | public static function render_joined_field( $args = [], $should_print = true ) { |
| 546 | 703 | $title = $args['title'] ?? ''; |
| 547 | 704 | $description = $args['description'] ?? ''; |
| 548 | 705 | |
| 549 | - $vertical_class = ( $args['vertical'] ?? false ) ? 'join-vertical' : ''; | |
| 706 | + $vertical_style = ( $args['vertical'] ?? false ) ? 'flex-direction:column;' : ''; | |
| 550 | 707 | |
| 551 | 708 | ob_start(); |
| 552 | 709 | ?> |
| 553 | - <div class="grid grid-cols-6 gap-4"> | |
| 554 | - <span class="font-semibold text-sm mt-0.5"><?php echo esc_html( $title ); ?></span> | |
| 710 | + <div class="wpsubs-settings-field<?php echo ! empty( $args['pro_locked'] ) ? ' wpsubs-settings-field--locked' : ''; ?>"> | |
| 711 | + <div class="wpsubs-settings-field__label"> | |
| 712 | + <?php | |
| 713 | + if ( ! empty( $args['pro_locked'] ) ) { | |
| 714 | + // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Pre-escaped badge markup. | |
| 715 | + echo self::pro_badge_html(); | |
| 716 | + } | |
| 717 | + ?> | |
| 718 | + <?php echo esc_html( $title ); ?> | |
| 719 | + </div> | |
| 720 | + <div class="wpsubs-settings-field__control"> | |
| 721 | + <div class="wpsubs-input-group" | |
| 722 | + <?php | |
| 723 | + if ( $vertical_style ) : | |
| 724 | + ?> | |
| 725 | + style="<?php echo esc_attr( $vertical_style ); ?>"<?php endif; ?>> | |
| 726 | + <?php | |
| 727 | + foreach ( ( $args['elements'] ?? [] ) as $element_html ) { | |
| 728 | + // Output intentionally not escaped as element is already escaped during generation & re-escaping breaks the HTML structure. | |
| 729 | + // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 730 | + echo $element_html; | |
| 731 | + } | |
| 732 | + ?> | |
| 733 | + </div> | |
| 734 | + <?php if ( ! empty( $description ) ) : ?> | |
| 735 | + <p class="wpsubs-settings-field__hint"><?php echo wp_kses_post( $description ); ?></p> | |
| 736 | + <?php endif; ?> | |
| 737 | + </div> | |
| 738 | + </div> | |
| 739 | + <?php | |
| 740 | + $html_content = ob_get_clean(); | |
| 555 | 741 | |
| 556 | - <div class="col-span-5"> | |
| 557 | - <div class="join <?php echo esc_attr( $vertical_class ); ?>"> | |
| 742 | + // Output not escaped intentionally. Breaks the HTML structure when escaped. | |
| 743 | + // All form elements inside $html_content are pre-escaped during generation (esc_attr, esc_html). | |
| 744 | + // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 745 | + return $should_print ? print( $html_content ) : $html_content; | |
| 746 | + } | |
| 747 | + | |
| 748 | + /** | |
| 749 | + * Render an editable, reorderable list field (the `wpsubs-editlist` component). | |
| 750 | + * | |
| 751 | + * Generic and reusable: a sortable list of text items with per-row remove/move | |
| 752 | + * controls and an inline input + add button. The ordered list is serialized as | |
| 753 | + * JSON (`[{ key, label }]`) into a hidden input so it submits with the form; | |
| 754 | + * behaviour is wired by `WPSubsEditList` (admin-components/editlist.js). All user-facing | |
| 755 | + * strings are overridable so the field carries no feature-specific text. | |
| 756 | + * | |
| 757 | + * When `modal` is true the list lives inside a `wpsubs-modal` (via the | |
| 758 | + * `WPSubsModal` component) and the settings row only shows a trigger button with | |
| 759 | + * a live item count. | |
| 760 | + * | |
| 761 | + * - Args: | |
| 762 | + * - id (string) - Field ID / option key. | |
| 763 | + * - title (string) | |
| 764 | + * - description (string) | |
| 765 | + * - value (array) - Ordered list of { key, label } entries. | |
| 766 | + * - add_placeholder (string) - Inline input placeholder. | |
| 767 | + * - add_label (string) - Add button accessible label. | |
| 768 | + * - empty_text (string) - Message shown when the list is empty. | |
| 769 | + * - modal (bool) - Present the list inside a modal (default false). | |
| 770 | + * - button_label (string) - Modal trigger button text (modal mode). | |
| 771 | + * - modal_title (string) - Modal header title (modal mode; defaults to title). | |
| 772 | + * - pro_locked (bool) | |
| 773 | + * | |
| 774 | + * @param array $args Field arguments. | |
| 775 | + * @param bool $should_print Whether to print the field or return as HTML string. | |
| 776 | + */ | |
| 777 | + public static function render_editlist_field( $args = [], $should_print = true ) { | |
| 778 | + $id = $args['id'] ?? ''; | |
| 779 | + $title = $args['title'] ?? ''; | |
| 780 | + $description = $args['description'] ?? ''; | |
| 781 | + $items = is_array( $args['value'] ?? null ) ? $args['value'] : []; | |
| 782 | + $locked = ! empty( $args['pro_locked'] ); | |
| 783 | + $modal = ! empty( $args['modal'] ); | |
| 784 | + | |
| 785 | + $add_placeholder = $args['add_placeholder'] ?? __( 'Add an item…', 'subscription' ); | |
| 786 | + $add_label = $args['add_label'] ?? __( 'Add item', 'subscription' ); | |
| 787 | + $empty_text = $args['empty_text'] ?? __( 'No items yet. Add one below.', 'subscription' ); | |
| 788 | + $button_label = $args['button_label'] ?? __( 'Manage list', 'subscription' ); | |
| 789 | + $modal_title = $args['modal_title'] ?? ( '' !== $title ? $title : __( 'Edit list', 'subscription' ) ); | |
| 790 | + | |
| 791 | + if ( empty( $id ) ) { | |
| 792 | + $field_hint = empty( $title ) ? 'Error' : $title; | |
| 793 | + $no_id_msg = '<p><strong>' . $field_hint . ':</strong> ' . __( 'Field ID is required.', 'subscription' ) . '</p>'; | |
| 794 | + return $should_print ? print wp_kses_post( $no_id_msg ) : $no_id_msg; | |
| 795 | + } | |
| 796 | + | |
| 797 | + $body = self::editlist_body_html( $items, $add_placeholder, $add_label, $empty_text, $locked ); | |
| 798 | + | |
| 799 | + ob_start(); | |
| 800 | + ?> | |
| 801 | + <div class="wpsubs-settings-field<?php echo $locked ? ' wpsubs-settings-field--locked' : ''; ?>"> | |
| 802 | + <div class="wpsubs-settings-field__label"> | |
| 803 | + <?php | |
| 804 | + if ( $locked ) { | |
| 805 | + // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Pre-escaped badge markup. | |
| 806 | + echo self::pro_badge_html(); | |
| 807 | + } | |
| 808 | + ?> | |
| 809 | + <?php echo esc_html( $title ); ?> | |
| 810 | + </div> | |
| 811 | + <div class="wpsubs-settings-field__control"> | |
| 812 | + <div class="wpsubs-editlist<?php echo $locked ? ' wpsubs-editlist--locked' : ''; ?>"> | |
| 813 | + <input type="hidden" id="<?php echo esc_attr( $id ); ?>" name="<?php echo esc_attr( $id ); ?>" value="<?php echo esc_attr( wp_json_encode( array_values( $items ) ) ); ?>" /> | |
| 814 | + <?php if ( $modal ) : ?> | |
| 815 | + <button type="button" class="wpsubs-btn wpsubs-btn--outline wpsubs-editlist__trigger" data-wpsubs-modal-open="<?php echo esc_attr( $id . '_modal' ); ?>"<?php echo $locked ? ' disabled' : ''; ?>> | |
| 816 | + <?php echo esc_html( $button_label ); ?> | |
| 817 | + <span class="wpsubs-editlist__count"><?php echo esc_html( (string) count( $items ) ); ?></span> | |
| 818 | + </button> | |
| 558 | 819 | <?php |
| 559 | - foreach ( ( $args['elements'] ?? [] ) as $element_html ) { | |
| 560 | - // Output intentionally not escaped as element is already escaped during generation & re-escaping breaks the HTML structure. | |
| 561 | - // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 562 | - echo $element_html; | |
| 563 | - } | |
| 820 | + wpsubs_render_modal( | |
| 821 | + [ | |
| 822 | + 'id' => $id . '_modal', | |
| 823 | + 'title' => $modal_title, | |
| 824 | + 'body' => $body, | |
| 825 | + 'class' => 'wpsubs-modal--editlist', | |
| 826 | + 'footer' => '<button type="button" class="wpsubs-btn wpsubs-btn--primary" data-wpsubs-modal-close>' . esc_html__( 'Done', 'subscription' ) . '</button>', | |
| 827 | + ] | |
| 828 | + ); | |
| 564 | 829 | ?> |
| 565 | - </div> | |
| 566 | - <br/> | |
| 567 | - <?php if ( ! empty( $description ) ) : ?> | |
| 568 | - <p class="mb-0! mt-2! ml-0.5! text-[13px]! text-gray-500!"> | |
| 569 | - <?php echo wp_kses_post( $description ); ?> | |
| 570 | - </p> | |
| 830 | + <?php else : ?> | |
| 831 | + <?php | |
| 832 | + // Body markup is pre-escaped during generation. | |
| 833 | + // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 834 | + echo $body; | |
| 835 | + ?> | |
| 571 | 836 | <?php endif; ?> |
| 572 | 837 | </div> |
| 838 | + <?php if ( ! empty( $description ) ) : ?> | |
| 839 | + <p class="wpsubs-settings-field__hint"><?php echo wp_kses_post( $description ); ?></p> | |
| 840 | + <?php endif; ?> | |
| 573 | 841 | </div> |
| 842 | + </div> | |
| 574 | 843 | <?php |
| 575 | 844 | $html_content = ob_get_clean(); |
| 576 | 845 | |
| 577 | 846 | // Output not escaped intentionally. Breaks the HTML structure when escaped. |
| @@ -577,6 +846,52 @@ | ||
| 577 | 846 | // Output not escaped intentionally. Breaks the HTML structure when escaped. |
| 578 | 847 | // All form elements inside $html_content are pre-escaped during generation (esc_attr, esc_html). |
| 579 | 848 | // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped |
| 580 | 849 | return $should_print ? print( $html_content ) : $html_content; |
| 850 | + } | |
| 851 | + | |
| 852 | + /** | |
| 853 | + * Build the inner markup of an edit list (items + empty message + add row). | |
| 854 | + * | |
| 855 | + * Shared by inline and modal presentations of {@see self::render_editlist_field}. | |
| 856 | + * | |
| 857 | + * @param array $items Ordered list of { key, label } entries. | |
| 858 | + * @param string $add_placeholder Inline input placeholder. | |
| 859 | + * @param string $add_label Add button accessible label. | |
| 860 | + * @param string $empty_text Message shown when the list is empty. | |
| 861 | + * @param bool $locked Whether the controls are disabled. | |
| 862 | + * @return string Pre-escaped HTML. | |
| 863 | + */ | |
| 864 | + private static function editlist_body_html( array $items, $add_placeholder, $add_label, $empty_text, $locked ) { | |
| 865 | + ob_start(); | |
| 866 | + ?> | |
| 867 | + <ul class="wpsubs-editlist__items"> | |
| 868 | + <?php foreach ( $items as $item ) : ?> | |
| 869 | + <?php | |
| 870 | + $item_key = isset( $item['key'] ) ? (string) $item['key'] : ''; | |
| 871 | + $item_label = isset( $item['label'] ) ? (string) $item['label'] : ''; | |
| 872 | + if ( '' === $item_label ) { | |
| 873 | + continue; | |
| 874 | + } | |
| 875 | + ?> | |
| 876 | + <li class="wpsubs-editlist__item" data-key="<?php echo esc_attr( $item_key ); ?>"> | |
| 877 | + <span class="wpsubs-editlist__handle" aria-hidden="true">⋮⋮</span> | |
| 878 | + <span class="wpsubs-editlist__label"><?php echo esc_html( $item_label ); ?></span> | |
| 879 | + <span class="wpsubs-editlist__actions"> | |
| 880 | + <button type="button" class="wpsubs-editlist__btn" data-editlist-up aria-label="<?php esc_attr_e( 'Move up', 'subscription' ); ?>"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="18 15 12 9 6 15"/></svg></button> | |
| 881 | + <button type="button" class="wpsubs-editlist__btn" data-editlist-down aria-label="<?php esc_attr_e( 'Move down', 'subscription' ); ?>"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="6 9 12 15 18 9"/></svg></button> | |
| 882 | + <button type="button" class="wpsubs-editlist__btn wpsubs-editlist__btn--danger" data-editlist-remove aria-label="<?php esc_attr_e( 'Remove', 'subscription' ); ?>"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M3 6h18"/><path d="M19 6l-1 14a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2L5 6"/><path d="M8 6V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/></svg></button> | |
| 883 | + </span> | |
| 884 | + </li> | |
| 885 | + <?php endforeach; ?> | |
| 886 | + </ul> | |
| 887 | + <p class="wpsubs-editlist__empty"<?php echo empty( $items ) ? '' : ' hidden'; ?>><?php echo esc_html( $empty_text ); ?></p> | |
| 888 | + <div class="wpsubs-editlist__add"> | |
| 889 | + <input type="text" class="wpsubs-input wpsubs-editlist__input" placeholder="<?php echo esc_attr( $add_placeholder ); ?>"<?php echo $locked ? ' disabled' : ''; ?> /> | |
| 890 | + <button type="button" class="wpsubs-editlist__add-btn" data-editlist-add aria-label="<?php echo esc_attr( $add_label ); ?>"<?php echo $locked ? ' disabled' : ''; ?>> | |
| 891 | + <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M20 6 9 17l-5-5"/></svg> | |
| 892 | + </button> | |
| 893 | + </div> | |
| 894 | + <?php | |
| 895 | + return ob_get_clean(); | |
| 581 | 896 | } |
| 582 | 897 | } |
