From 2261c102a9e1c3b0f852152ac2746329a4276b6e Mon Sep 17 00:00:00 2001 From: nikitasinelnikov Date: Fri, 23 Aug 2019 22:47:04 +0300 Subject: [PATCH] - move billing & shipping fields code to UM: Woocommerce extension; --- includes/admin/core/class-admin-builder.php | 4 ++-- includes/core/class-fields.php | 14 +++----------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/includes/admin/core/class-admin-builder.php b/includes/admin/core/class-admin-builder.php index d715f481..e4306493 100644 --- a/includes/admin/core/class-admin-builder.php +++ b/includes/admin/core/class-admin-builder.php @@ -54,8 +54,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) { $validate = $field_attr['validate']; foreach ( $validate as $post_input => $arr ) { - // 'billing_country' and 'shipping_country' - if( $post_input === '_options' && isset( $array[ 'post' ][ '_metakey' ] ) && in_array( $array[ 'post' ][ '_metakey' ], array( 'billing_country', 'shipping_country' ) ) ) { + $skip = apply_filters( 'um_admin_builder_skip_field_validation', false, $post_input, $array ); + if ( $skip ) { continue; } diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php index 12bcadde..b3c6d17c 100644 --- a/includes/core/class-fields.php +++ b/includes/core/class-fields.php @@ -2737,19 +2737,11 @@ if ( ! class_exists( 'um\core\Fields' ) ) { } // 'country' - if( $key === 'country' && empty( $options ) ) { + if ( $key === 'country' && empty( $options ) ) { $options = UM()->builtin()->get( 'countries' ); } - // 'billing_country' and 'shipping_country' - if( in_array( $key, array( 'billing_country', 'shipping_country' ) ) ) { - $countries = UM()->builtin()->get( 'countries' ); - if( empty( $options ) || !is_array( $options ) ) { - $options = $countries; - } else { - $options = array_intersect_key( $countries, array_flip( $options ) ); - } - } + $options = apply_filters( 'um_selectbox_options', $options, $key ); if ( isset( $options ) ) { /** @@ -2812,7 +2804,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) { * [{"var":"$options_pair","type":"null","desc":"Enable pairs"}, * {"var":"$data","type":"array","desc":"Field Data"}] */ - $options_pair = apply_filters( "um_select_options_pair", null, $data ); + $options_pair = apply_filters( 'um_select_options_pair', null, $data ); // switch options pair for custom options from a callback function if ( ! empty( $data['custom_dropdown_options_source'] ) ) {