Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: stripping html tags from order text #301

Merged
merged 3 commits into from
May 16, 2024
Merged

fix: stripping html tags from order text #301

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c857e4
fix: stripping html tags from order text
GrigoreMihai May 15, 2024
9bbd1a4
removed error logs
GrigoreMihai May 15, 2024
832d10a
chore: using the field data on validation
GrigoreMihai May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 27 additions & 19 deletions inc/woocommerce.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,17 +230,25 @@ function ppom_check_validation( $product_id, $post_data, $passed = true ) {

$passed = apply_filters( 'ppom_before_fields_validation', $passed, $field, $post_data, $product_id );

if ( empty( $field['data_name'] ) || empty( $field['required'] )
&& ( empty( $field['min_checked'] ) && empty( $field['max_checked'] ) )
) {
if ( empty( $field['data_name'] ) ) {
continue;
}

$data_name = sanitize_key( $field['data_name'] );

if ( ! empty($ppom_posted_fields[$data_name]) && $ppom_posted_fields[$data_name] !== strip_tags( $ppom_posted_fields[$data_name] ) ) {
$passed = false;
}

if ( empty( $field['required'] ) && ( empty( $field['min_checked'] ) && empty( $field['max_checked'] ) )
) {
continue;
}


$title = isset( $field['title'] ) ? $field['title'] : '';
$type = isset( $field['type'] ) ? $field['type'] : '';


// var_dump($data_name, ppom_is_field_hidden_by_condition($data_name));
// Check if field is required by hidden by condition
if ( ppom_is_field_hidden_by_condition( $data_name ) ) {
Expand All @@ -257,7 +265,7 @@ function ppom_check_validation( $product_id, $post_data, $passed = true ) {
$error_message = stripslashes( $error_message );
ppom_wc_add_notice( $error_message );
$passed = false;
}
}
}

// ppom_pa($post_data); exit;
Expand Down Expand Up @@ -341,7 +349,7 @@ function ppom_woocommerce_update_cart_fees( $cart_items, $values ) {
if ( $option['apply'] == 'quantities' ) {
$ppom_total_quantities += $option['quantity'];
$ppom_item_order_qty = $ppom_total_quantities;
}
}
}
}

Expand Down Expand Up @@ -444,7 +452,7 @@ function ppom_woocommerce_update_cart_fees( $cart_items, $values ) {
$new_weight = $wc_product->get_weight() + $option_weight;
$wc_product->set_weight( $new_weight );
}
}
}
}
}

Expand Down Expand Up @@ -637,7 +645,7 @@ function ppom_woocommerce_add_item_meta( $item_meta, $cart_item ) {
}


// If no value
// If no value
if ( ! $display ) {
continue;
}
Expand Down Expand Up @@ -666,7 +674,7 @@ function ppom_woocommerce_add_item_meta( $item_meta, $cart_item ) {
'hidden' => $hidden,
'display' => $display,
);
}
}
}

return $item_meta;
Expand Down Expand Up @@ -712,7 +720,7 @@ function ppom_woocommerce_alter_price( $price, $product ) {

$options = $meta['options'];
$ranges = ppom_convert_options_to_key_val( $options, $meta, $product );
// ppom_pa($ranges);
// ppom_pa($ranges);

if ( isset( $meta['discount'] ) && $meta['discount'] == 'on' ) {

Expand Down Expand Up @@ -742,24 +750,24 @@ function ppom_woocommerce_alter_price( $price, $product ) {
}
}
}
}
}
}

return apply_filters( 'ppom_loop_matrix_price', $price, $from_pice, $to_price );
}

/*
function ppom_hide_variation_price_html($show, $parent, $variation) {

$product_id = $parent->get_id();
$ppom = new PPOM_Meta( $product_id );

if( $ppom->is_exists && $ppom->price_display != 'hide' ) {
$show = false;
}

return $show;

}*/

// Set default quantity for price matrix
Expand Down Expand Up @@ -1389,9 +1397,9 @@ function ppom_woocommerce_rename_files( $order_id, $posted_data, $order ) {
function ppom_wc_order_again_compatibility( $cart_item_data, $item, $order ) {
$ppom_data = $item->get_meta('_ppom_fields');

if( is_array($ppom_data) && array_key_exists( 'fields', $ppom_data ) ) {
$cart_item_data['ppom'] = $ppom_data;
}
if( is_array($ppom_data) && array_key_exists( 'fields', $ppom_data ) ) {
$cart_item_data['ppom'] = $ppom_data;
}

return $cart_item_data;
}
}
Loading