Version Description
- Fixed: Missing Checkout fields from WooCheckout screen (thanks Laura)
- Changed: Compatibility with WooCommerce 3.4
- Fixed: Enable 24 hour time option not saving on WooCheckout screen
Download this release
Release Info
Developer | visser |
Plugin | WooCommerce Checkout Manager |
Version | 4.2.2 |
Comparing to | |
See all releases |
Code changes from version 4.2.1 to 4.2.2
- includes/admin.php +17 -7
- includes/checkout-billing.php +5 -6
- includes/checkout-shipping.php +3 -4
- includes/classes/field_filters.php +28 -30
- includes/email.php +5 -5
- includes/pickers/css/backend_css.css +0 -6
- includes/templates/admin/woocheckout-additional.php +11 -7
- includes/templates/admin/woocheckout-billing.php +12 -8
- includes/templates/admin/woocheckout-general-order-notes.php +1 -1
- includes/templates/admin/woocheckout-shipping.php +12 -8
- includes/templates/functions/add_functions.php +8 -8
- includes/templates/functions/billing_functions.php +8 -8
- includes/templates/functions/shipping_functions.php +8 -8
- includes/templates/js/billing_script_wccs.js +20 -20
- includes/templates/js/script_wccs.js +5 -4
- includes/templates/js/shipping_script_wccs.js +16 -15
- readme.txt +8 -3
- woocommerce-checkout-manager.php +1 -1
includes/admin.php
CHANGED
@@ -356,13 +356,13 @@ function wooccm_admin_woocheckout_actions() {
|
|
356 |
if( !function_exists( 'woo_get_action' ) ) {
|
357 |
function woo_get_action( $prefer_get = false ) {
|
358 |
|
359 |
-
if
|
360 |
return sanitize_text_field( $_GET['action'] );
|
361 |
|
362 |
-
if
|
363 |
return sanitize_text_field( $_POST['action'] );
|
364 |
|
365 |
-
if
|
366 |
return sanitize_text_field( $_GET['action'] );
|
367 |
|
368 |
return;
|
@@ -389,12 +389,19 @@ function wooccm_options_page() {
|
|
389 |
$upload_dir = wp_upload_dir();
|
390 |
$hidden_field_name = 'mccs_submit_hidden';
|
391 |
$hidden_wccs_reset = "my_new_field_reset";
|
|
|
|
|
392 |
$options = get_option( 'wccs_settings' );
|
|
|
393 |
$options2 = get_option( 'wccs_settings2' );
|
|
|
394 |
$options3 = get_option( 'wccs_settings3' );
|
395 |
|
396 |
// Check if the reset button has been clicked
|
397 |
-
if(
|
|
|
|
|
|
|
398 |
delete_option('wccs_settings');
|
399 |
delete_option('wccs_settings2');
|
400 |
delete_option('wccs_settings3');
|
@@ -1073,7 +1080,10 @@ function wooccm_admin_updater_notice() {
|
|
1073 |
</script>
|
1074 |
<?php
|
1075 |
|
1076 |
-
if(
|
|
|
|
|
|
|
1077 |
// @mod - We need to check this file exists
|
1078 |
?>
|
1079 |
|
@@ -1931,9 +1941,9 @@ jQuery(document).ready(function($){
|
|
1931 |
}
|
1932 |
|
1933 |
input.addEventListener("change", function (evt) {
|
1934 |
-
$("#wccm_uploader_select").block({message: null, overlayCSS: {background: "#fff url(" +
|
1935 |
|
1936 |
-
$("#wccm_uploader_select").block({message: null, overlayCSS: {background: "#fff url(" +
|
1937 |
|
1938 |
var length = '.$length.';
|
1939 |
var file_array = ' . wooccm_js_array( $file_types ) . ';
|
356 |
if( !function_exists( 'woo_get_action' ) ) {
|
357 |
function woo_get_action( $prefer_get = false ) {
|
358 |
|
359 |
+
if( isset( $_GET['action'] ) && $prefer_get )
|
360 |
return sanitize_text_field( $_GET['action'] );
|
361 |
|
362 |
+
if( isset( $_POST['action'] ) )
|
363 |
return sanitize_text_field( $_POST['action'] );
|
364 |
|
365 |
+
if( isset( $_GET['action'] ) )
|
366 |
return sanitize_text_field( $_GET['action'] );
|
367 |
|
368 |
return;
|
389 |
$upload_dir = wp_upload_dir();
|
390 |
$hidden_field_name = 'mccs_submit_hidden';
|
391 |
$hidden_wccs_reset = "my_new_field_reset";
|
392 |
+
|
393 |
+
// Additional details
|
394 |
$options = get_option( 'wccs_settings' );
|
395 |
+
// Shipping details
|
396 |
$options2 = get_option( 'wccs_settings2' );
|
397 |
+
// Billing details
|
398 |
$options3 = get_option( 'wccs_settings3' );
|
399 |
|
400 |
// Check if the reset button has been clicked
|
401 |
+
if(
|
402 |
+
isset( $_POST[ $hidden_wccs_reset ] ) &&
|
403 |
+
sanitize_text_field( $_POST[ $hidden_wccs_reset ] ) == 'Y'
|
404 |
+
) {
|
405 |
delete_option('wccs_settings');
|
406 |
delete_option('wccs_settings2');
|
407 |
delete_option('wccs_settings3');
|
1080 |
</script>
|
1081 |
<?php
|
1082 |
|
1083 |
+
if(
|
1084 |
+
isset( $_POST['click-here-wooccm'] ) &&
|
1085 |
+
sanitize_text_field( $_POST['click-here-wooccm'] ) == 'y'
|
1086 |
+
) {
|
1087 |
// @mod - We need to check this file exists
|
1088 |
?>
|
1089 |
|
1941 |
}
|
1942 |
|
1943 |
input.addEventListener("change", function (evt) {
|
1944 |
+
$("#wccm_uploader_select").block({message: null, overlayCSS: {background: "#fff url(" + woocommerce_get_script_data.plugin_url + "/assets/images/ajax-loader.gif) no-repeat center", opacity: 0.6}});
|
1945 |
|
1946 |
+
$("#wccm_uploader_select").block({message: null, overlayCSS: {background: "#fff url(" + woocommerce_get_script_data.ajax_loader_url + ") no-repeat center", opacity: 0.6}});
|
1947 |
|
1948 |
var length = '.$length.';
|
1949 |
var file_array = ' . wooccm_js_array( $file_types ) . ';
|
includes/checkout-billing.php
CHANGED
@@ -1,5 +1,5 @@
|
|
1 |
<?php
|
2 |
-
function wooccm_checkout_billing_fields( $fields ) {
|
3 |
|
4 |
$options = get_option( 'wccs_settings3' );
|
5 |
$buttons = ( isset( $options['billing_buttons'] ) ? $options['billing_buttons'] : false );
|
@@ -35,9 +35,9 @@ function wooccm_checkout_billing_fields( $fields ) {
|
|
35 |
$fields[$key]['placeholder'] = ( isset( $btn['placeholder'] ) ? $btn['placeholder'] : '' );
|
36 |
}
|
37 |
|
38 |
-
//
|
39 |
-
|
40 |
-
$fields[$key]['class'] = array( $btn['position'].' '. ( isset( $btn['conditional_tie'] ) ? $btn['conditional_tie'] : '' ) .' '. ( isset( $btn['extra_class'] ) ? $btn['extra_class'] : '' ) );
|
41 |
$fields[$key]['label'] = wooccm_wpml_string( $btn['label'] );
|
42 |
$fields[$key]['clear'] = ( isset( $btn['clear_row'] ) ? $btn['clear_row'] : '' );
|
43 |
$fields[$key]['default'] = ( isset( $btn['force_title2'] ) ? $btn['force_title2'] : '' );
|
@@ -59,9 +59,8 @@ function wooccm_checkout_billing_fields( $fields ) {
|
|
59 |
}
|
60 |
|
61 |
// Bolt on address-field for address-based fields
|
62 |
-
if( in_array( $btn['cow'], $billing ) )
|
63 |
$fields[$key]['class'][] = 'address-field';
|
64 |
-
}
|
65 |
|
66 |
// Override for State fields
|
67 |
if( $fields[$key]['type'] == 'wooccmstate' ) {
|
1 |
<?php
|
2 |
+
function wooccm_checkout_billing_fields( $fields = array() ) {
|
3 |
|
4 |
$options = get_option( 'wccs_settings3' );
|
5 |
$buttons = ( isset( $options['billing_buttons'] ) ? $options['billing_buttons'] : false );
|
35 |
$fields[$key]['placeholder'] = ( isset( $btn['placeholder'] ) ? $btn['placeholder'] : '' );
|
36 |
}
|
37 |
|
38 |
+
// Default to Position wide
|
39 |
+
$btn['position'] = ( isset( $btn['position'] ) ? $btn['position'] : 'form-row-wide' );
|
40 |
+
$fields[$key]['class'] = array( $btn['position'] . ' ' . ( isset( $btn['conditional_tie'] ) ? $btn['conditional_tie'] : '' ) .' '. ( isset( $btn['extra_class'] ) ? $btn['extra_class'] : '' ) );
|
41 |
$fields[$key]['label'] = wooccm_wpml_string( $btn['label'] );
|
42 |
$fields[$key]['clear'] = ( isset( $btn['clear_row'] ) ? $btn['clear_row'] : '' );
|
43 |
$fields[$key]['default'] = ( isset( $btn['force_title2'] ) ? $btn['force_title2'] : '' );
|
59 |
}
|
60 |
|
61 |
// Bolt on address-field for address-based fields
|
62 |
+
if( in_array( $btn['cow'], $billing ) )
|
63 |
$fields[$key]['class'][] = 'address-field';
|
|
|
64 |
|
65 |
// Override for State fields
|
66 |
if( $fields[$key]['type'] == 'wooccmstate' ) {
|
includes/checkout-shipping.php
CHANGED
@@ -37,9 +37,9 @@ function wooccm_checkout_shipping_fields( $fields = array() ) {
|
|
37 |
|
38 |
// Default to Position wide
|
39 |
$btn['position'] = ( isset( $btn['position'] ) ? $btn['position'] : 'form-row-wide' );
|
40 |
-
$fields[$key]['class'] = array( $btn['position'].' '. ( isset( $btn['conditional_tie'] ) ? $btn['conditional_tie'] : '' ) .' '. ( isset( $btn['extra_class'] ) ? $btn['extra_class'] : '' ) );
|
41 |
$fields[$key]['label'] = wooccm_wpml_string( $btn['label'] );
|
42 |
-
$fields[$key]['clear']
|
43 |
$fields[$key]['default'] = ( isset( $btn['force_title2'] ) ? $btn['force_title2'] : '' );
|
44 |
$fields[$key]['options'] = ( isset( $btn['option_array'] ) ? $btn['option_array'] : '' );
|
45 |
$fields[$key]['user_role'] = ( isset( $btn['user_role'] ) ? $btn['user_role'] : '' );
|
@@ -59,9 +59,8 @@ function wooccm_checkout_shipping_fields( $fields = array() ) {
|
|
59 |
}
|
60 |
|
61 |
// Bolt on address-field for address-based fields
|
62 |
-
if( in_array( $btn['cow'], $shipping ) )
|
63 |
$fields[$key]['class'][] = 'address-field';
|
64 |
-
}
|
65 |
|
66 |
// Remove disabled fields
|
67 |
if( !empty( $btn['disabled'] ) ) {
|
37 |
|
38 |
// Default to Position wide
|
39 |
$btn['position'] = ( isset( $btn['position'] ) ? $btn['position'] : 'form-row-wide' );
|
40 |
+
$fields[$key]['class'] = array( $btn['position'] . ' ' . ( isset( $btn['conditional_tie'] ) ? $btn['conditional_tie'] : '' ) .' '. ( isset( $btn['extra_class'] ) ? $btn['extra_class'] : '' ) );
|
41 |
$fields[$key]['label'] = wooccm_wpml_string( $btn['label'] );
|
42 |
+
$fields[$key]['clear'] = ( isset( $btn['clear_row'] ) ? $btn['clear_row'] : '' );
|
43 |
$fields[$key]['default'] = ( isset( $btn['force_title2'] ) ? $btn['force_title2'] : '' );
|
44 |
$fields[$key]['options'] = ( isset( $btn['option_array'] ) ? $btn['option_array'] : '' );
|
45 |
$fields[$key]['user_role'] = ( isset( $btn['user_role'] ) ? $btn['user_role'] : '' );
|
59 |
}
|
60 |
|
61 |
// Bolt on address-field for address-based fields
|
62 |
+
if( in_array( $btn['cow'], $shipping ) )
|
63 |
$fields[$key]['class'][] = 'address-field';
|
|
|
64 |
|
65 |
// Remove disabled fields
|
66 |
if( !empty( $btn['disabled'] ) ) {
|
includes/classes/field_filters.php
CHANGED
@@ -33,7 +33,7 @@ function wooccm_checkout_field_text_handler( $field = '', $key, $args, $value )
|
|
33 |
$required = false;
|
34 |
if( $args['wooccm_required'] ) {
|
35 |
$args['class'][] = 'validate-required';
|
36 |
-
$required = ' <
|
37 |
}
|
38 |
|
39 |
$args['maxlength'] = ( $args['maxlength'] ) ? 'maxlength="' . absint( $args['maxlength'] ) . '"' : '';
|
@@ -106,7 +106,7 @@ function wooccm_checkout_field_textarea_handler( $field = '', $key, $args, $valu
|
|
106 |
|
107 |
if( $args['wooccm_required'] ) {
|
108 |
$args['class'][] = 'validate-required';
|
109 |
-
$required = ' <
|
110 |
} else {
|
111 |
$required = '';
|
112 |
}
|
@@ -185,7 +185,7 @@ function wooccm_checkout_field_password_handler( $field = '', $key, $args, $valu
|
|
185 |
|
186 |
if( $args['wooccm_required'] ) {
|
187 |
$args['class'][] = 'validate-required';
|
188 |
-
$required = ' <
|
189 |
} else {
|
190 |
$required = '';
|
191 |
}
|
@@ -260,7 +260,7 @@ function wooccm_checkout_field_radio_handler( $field = '', $key, $args, $value )
|
|
260 |
|
261 |
if( $args['wooccm_required'] ) {
|
262 |
$args['class'][] = 'validate-required';
|
263 |
-
$required = ' <
|
264 |
} else {
|
265 |
$required = '';
|
266 |
}
|
@@ -310,7 +310,7 @@ function wooccm_checkout_field_select_handler( $field = '', $key, $args, $value
|
|
310 |
|
311 |
if( $args['wooccm_required'] ) {
|
312 |
$args['class'][] = 'validate-required';
|
313 |
-
$required = ' <
|
314 |
} else {
|
315 |
$required = '';
|
316 |
}
|
@@ -368,15 +368,16 @@ function wooccm_checkout_field_checkbox_handler( $field = '', $key, $args, $valu
|
|
368 |
|
369 |
if( $args['wooccm_required'] ) {
|
370 |
$args['class'][] = 'validate-required';
|
371 |
-
$required = ' <
|
372 |
} else {
|
373 |
$required = '';
|
374 |
}
|
375 |
|
376 |
$field = '
|
377 |
<p class="form-row ' . implode( ' ', $args['class'] ) .'" id="' . $key . '_field">
|
378 |
-
<label for="' . $key . '_checkbox" class="checkbox ' . implode( ' ', $args['label_class'] ) .'">
|
379 |
-
<input type="checkbox" id="' . $key . '_checkbox" name="' . $key . '" class="input-checkbox" value="1" />
|
|
|
380 |
</label>
|
381 |
</p>' . $after;
|
382 |
|
@@ -419,7 +420,7 @@ function wooccm_checkout_field_state_handler( $field = '', $key, $args, $value )
|
|
419 |
if( !empty( $states ) ) {
|
420 |
if( !in_array( 'validate-required', $args['class'] ) )
|
421 |
$args['class'][] = 'validate-required';
|
422 |
-
$required = ' <
|
423 |
} else {
|
424 |
$args['class'][] = 'woocommerce-validated';
|
425 |
}
|
@@ -529,17 +530,16 @@ function wooccm_checkout_field_country_handler( $field = '', $key, $args, $value
|
|
529 |
}
|
530 |
}
|
531 |
|
532 |
-
if(
|
533 |
$after = '<div class="clear"></div>';
|
534 |
-
|
535 |
$after = '';
|
536 |
-
}
|
537 |
|
538 |
$args['class'][] = 'address-field';
|
539 |
|
540 |
if( $args['wooccm_required'] ) {
|
541 |
$args['class'][] = 'validate-required';
|
542 |
-
$required = ' <
|
543 |
} else {
|
544 |
$required = '';
|
545 |
}
|
@@ -636,14 +636,14 @@ function wooccm_checkout_field_multiselect_handler( $field = '', $key, $args, $v
|
|
636 |
}
|
637 |
}
|
638 |
|
639 |
-
if
|
640 |
$after = '<div class="clear"></div>';
|
641 |
else
|
642 |
$after = '';
|
643 |
|
644 |
if( $args['wooccm_required'] ) {
|
645 |
$args['class'][] = 'validate-required';
|
646 |
-
$required = ' <
|
647 |
} else {
|
648 |
$required = '';
|
649 |
}
|
@@ -690,14 +690,14 @@ function wooccm_checkout_field_multicheckbox_handler( $field = '', $key, $args,
|
|
690 |
}
|
691 |
}
|
692 |
|
693 |
-
if(
|
694 |
$after = '<div class="clear"></div>';
|
695 |
else
|
696 |
$after = '';
|
697 |
|
698 |
if( $args['wooccm_required'] ) {
|
699 |
$args['class'][] = 'validate-required';
|
700 |
-
$required = ' <
|
701 |
} else {
|
702 |
$required = '';
|
703 |
}
|
@@ -744,14 +744,14 @@ function wooccm_checkout_field_colorpicker_handler( $field = '', $key, $args, $v
|
|
744 |
}
|
745 |
}
|
746 |
|
747 |
-
if(
|
748 |
$after = '<div class="clear"></div>';
|
749 |
else
|
750 |
$after = '';
|
751 |
|
752 |
if( $args['wooccm_required'] ) {
|
753 |
$args['class'][] = 'validate-required';
|
754 |
-
$required = ' <
|
755 |
} else {
|
756 |
$required = '';
|
757 |
}
|
@@ -790,21 +790,20 @@ function wooccm_checkout_field_datepicker_handler( $field = '', $key, $args, $va
|
|
790 |
return;
|
791 |
}
|
792 |
}
|
793 |
-
|
794 |
|
795 |
-
if(
|
796 |
$after = '<div class="clear"></div>';
|
797 |
else
|
798 |
$after = '';
|
799 |
|
800 |
if( $args['wooccm_required'] ) {
|
801 |
$args['class'][] = 'validate-required';
|
802 |
-
$required = ' <
|
803 |
} else {
|
804 |
$required = '';
|
805 |
}
|
806 |
|
807 |
-
$field = '<p class="form-row ' . implode( ' ', $args['class'] ) .'MyDate'
|
808 |
<label for="' . $key . '" class="' . implode( ' ', $args['label_class'] ) .'">' . $args['label'] . $required . '</label>
|
809 |
<input type="text" class="input-text" name="' . $key . '" id="' . $key . '" placeholder="' . $args['placeholder'] . '" value="'. $value.'" />
|
810 |
</p>' . $after;
|
@@ -833,19 +832,19 @@ function wooccm_checkout_field_timepicker_handler( $field = '', $key, $args, $va
|
|
833 |
}
|
834 |
}
|
835 |
|
836 |
-
if(
|
837 |
$after = '<div class="clear"></div>';
|
838 |
else
|
839 |
$after = '';
|
840 |
|
841 |
if( $args['wooccm_required'] ) {
|
842 |
$args['class'][] = 'validate-required';
|
843 |
-
$required = ' <
|
844 |
} else {
|
845 |
$required = '';
|
846 |
}
|
847 |
|
848 |
-
$field = '<p class="form-row ' . implode( ' ', $args['class'] ) .'MyTime'
|
849 |
<label for="' . $key . '" class="' . implode( ' ', $args['label_class'] ) .'">' . $args['label'] . $required . '</label>
|
850 |
<input type="text" class="input-text" name="' . $key . '" id="' . $key . '" placeholder="' . $args['placeholder'] . '" value="'. $value.'" />
|
851 |
</p>' . $after;
|
@@ -876,15 +875,14 @@ function wooccm_checkout_field_upload_handler( $field = '', $key, $args, $value
|
|
876 |
|
877 |
$upload_name = ( !empty($args['placeholder'] ) ? esc_attr( $args['placeholder'] ) : __( 'Upload Files', 'woocommerce-checkout-manager' ) );
|
878 |
|
879 |
-
if(
|
880 |
$after = '<div class="clear"></div>';
|
881 |
-
|
882 |
$after = '';
|
883 |
-
}
|
884 |
|
885 |
if( $args['wooccm_required'] ) {
|
886 |
$args['class'][] = 'validate-required';
|
887 |
-
$required = ' <
|
888 |
} else {
|
889 |
$required = '';
|
890 |
}
|
33 |
$required = false;
|
34 |
if( $args['wooccm_required'] ) {
|
35 |
$args['class'][] = 'validate-required';
|
36 |
+
$required = ' <span class="required">*</span>';
|
37 |
}
|
38 |
|
39 |
$args['maxlength'] = ( $args['maxlength'] ) ? 'maxlength="' . absint( $args['maxlength'] ) . '"' : '';
|
106 |
|
107 |
if( $args['wooccm_required'] ) {
|
108 |
$args['class'][] = 'validate-required';
|
109 |
+
$required = ' <span class="required">*</span>';
|
110 |
} else {
|
111 |
$required = '';
|
112 |
}
|
185 |
|
186 |
if( $args['wooccm_required'] ) {
|
187 |
$args['class'][] = 'validate-required';
|
188 |
+
$required = ' <span class="required">*</span>';
|
189 |
} else {
|
190 |
$required = '';
|
191 |
}
|
260 |
|
261 |
if( $args['wooccm_required'] ) {
|
262 |
$args['class'][] = 'validate-required';
|
263 |
+
$required = ' <span class="required">*</span>';
|
264 |
} else {
|
265 |
$required = '';
|
266 |
}
|
310 |
|
311 |
if( $args['wooccm_required'] ) {
|
312 |
$args['class'][] = 'validate-required';
|
313 |
+
$required = ' <span class="required">*</span>';
|
314 |
} else {
|
315 |
$required = '';
|
316 |
}
|
368 |
|
369 |
if( $args['wooccm_required'] ) {
|
370 |
$args['class'][] = 'validate-required';
|
371 |
+
$required = ' <span class="required">*</span>';
|
372 |
} else {
|
373 |
$required = '';
|
374 |
}
|
375 |
|
376 |
$field = '
|
377 |
<p class="form-row ' . implode( ' ', $args['class'] ) .'" id="' . $key . '_field">
|
378 |
+
<label for="' . $key . '_checkbox" class="woocommerce-form__label woocommerce-form__label-for-checkbox ' . implode( ' ', $args['label_class'] ) .'">
|
379 |
+
<input type="checkbox" id="' . $key . '_checkbox" name="' . $key . '" class="woocommerce-form__input woocommerce-form__input-checkbox input-checkbox" value="1" />
|
380 |
+
<span>' . $args['label'] . '</span>' . $required . '
|
381 |
</label>
|
382 |
</p>' . $after;
|
383 |
|
420 |
if( !empty( $states ) ) {
|
421 |
if( !in_array( 'validate-required', $args['class'] ) )
|
422 |
$args['class'][] = 'validate-required';
|
423 |
+
$required = ' <span class="required">*</span>';
|
424 |
} else {
|
425 |
$args['class'][] = 'woocommerce-validated';
|
426 |
}
|
530 |
}
|
531 |
}
|
532 |
|
533 |
+
if( !empty( $args['clear'] ) )
|
534 |
$after = '<div class="clear"></div>';
|
535 |
+
else
|
536 |
$after = '';
|
|
|
537 |
|
538 |
$args['class'][] = 'address-field';
|
539 |
|
540 |
if( $args['wooccm_required'] ) {
|
541 |
$args['class'][] = 'validate-required';
|
542 |
+
$required = ' <span class="required">*</span>';
|
543 |
} else {
|
544 |
$required = '';
|
545 |
}
|
636 |
}
|
637 |
}
|
638 |
|
639 |
+
if( !empty( $args['clear'] ) )
|
640 |
$after = '<div class="clear"></div>';
|
641 |
else
|
642 |
$after = '';
|
643 |
|
644 |
if( $args['wooccm_required'] ) {
|
645 |
$args['class'][] = 'validate-required';
|
646 |
+
$required = ' <span class="required">*</span>';
|
647 |
} else {
|
648 |
$required = '';
|
649 |
}
|
690 |
}
|
691 |
}
|
692 |
|
693 |
+
if( !empty( $args['clear'] ) )
|
694 |
$after = '<div class="clear"></div>';
|
695 |
else
|
696 |
$after = '';
|
697 |
|
698 |
if( $args['wooccm_required'] ) {
|
699 |
$args['class'][] = 'validate-required';
|
700 |
+
$required = ' <span class="required">*</span>';
|
701 |
} else {
|
702 |
$required = '';
|
703 |
}
|
744 |
}
|
745 |
}
|
746 |
|
747 |
+
if( !empty( $args['clear'] ) )
|
748 |
$after = '<div class="clear"></div>';
|
749 |
else
|
750 |
$after = '';
|
751 |
|
752 |
if( $args['wooccm_required'] ) {
|
753 |
$args['class'][] = 'validate-required';
|
754 |
+
$required = ' <span class="required">*</span>';
|
755 |
} else {
|
756 |
$required = '';
|
757 |
}
|
790 |
return;
|
791 |
}
|
792 |
}
|
|
|
793 |
|
794 |
+
if( !empty( $args['clear'] ) )
|
795 |
$after = '<div class="clear"></div>';
|
796 |
else
|
797 |
$after = '';
|
798 |
|
799 |
if( $args['wooccm_required'] ) {
|
800 |
$args['class'][] = 'validate-required';
|
801 |
+
$required = ' <span class="required">*</span>';
|
802 |
} else {
|
803 |
$required = '';
|
804 |
}
|
805 |
|
806 |
+
$field = '<p class="form-row ' . implode( ' ', $args['class'] ) . 'MyDate' . $args['cow'] . ' wccs-form-row-wide" id="' . $key . '_field">
|
807 |
<label for="' . $key . '" class="' . implode( ' ', $args['label_class'] ) .'">' . $args['label'] . $required . '</label>
|
808 |
<input type="text" class="input-text" name="' . $key . '" id="' . $key . '" placeholder="' . $args['placeholder'] . '" value="'. $value.'" />
|
809 |
</p>' . $after;
|
832 |
}
|
833 |
}
|
834 |
|
835 |
+
if( !empty( $args['clear'] ) )
|
836 |
$after = '<div class="clear"></div>';
|
837 |
else
|
838 |
$after = '';
|
839 |
|
840 |
if( $args['wooccm_required'] ) {
|
841 |
$args['class'][] = 'validate-required';
|
842 |
+
$required = ' <span class="required">*</span>';
|
843 |
} else {
|
844 |
$required = '';
|
845 |
}
|
846 |
|
847 |
+
$field = '<p class="form-row ' . implode( ' ', $args['class'] ) . 'MyTime' . $args['cow'] . ' wccs-form-row-wide" id="' . $key . '_field">
|
848 |
<label for="' . $key . '" class="' . implode( ' ', $args['label_class'] ) .'">' . $args['label'] . $required . '</label>
|
849 |
<input type="text" class="input-text" name="' . $key . '" id="' . $key . '" placeholder="' . $args['placeholder'] . '" value="'. $value.'" />
|
850 |
</p>' . $after;
|
875 |
|
876 |
$upload_name = ( !empty($args['placeholder'] ) ? esc_attr( $args['placeholder'] ) : __( 'Upload Files', 'woocommerce-checkout-manager' ) );
|
877 |
|
878 |
+
if( !empty( $args['clear'] ) )
|
879 |
$after = '<div class="clear"></div>';
|
880 |
+
else
|
881 |
$after = '';
|
|
|
882 |
|
883 |
if( $args['wooccm_required'] ) {
|
884 |
$args['class'][] = 'validate-required';
|
885 |
+
$required = ' <span class="required">*</span>';
|
886 |
} else {
|
887 |
$required = '';
|
888 |
}
|
includes/email.php
CHANGED
@@ -184,12 +184,12 @@ function wooccm_order_receipt_checkout_details( $order, $sent_to_admin, $plain_t
|
|
184 |
}
|
185 |
}
|
186 |
|
187 |
-
if
|
188 |
date_default_timezone_set( $options['checkness']['set_timezone'] );
|
189 |
}
|
190 |
-
$date = ( !empty( $options['checkness']['twenty_hour'] ) ) ? date( "G:i T (P" ).' GMT)' : date( "g:i a" );
|
191 |
$options['checkness']['time_stamp'] = ( isset( $options['checkness']['time_stamp'] ) ? $options['checkness']['time_stamp'] : false );
|
192 |
-
if
|
193 |
echo $options['checkness']['time_stamp_title'].' ' . $date . "\n";
|
194 |
}
|
195 |
if( method_exists( $order, 'get_payment_method_title' ) ) {
|
@@ -345,10 +345,10 @@ function wooccm_order_receipt_checkout_details( $order, $sent_to_admin, $plain_t
|
|
345 |
}
|
346 |
|
347 |
// @mod - We are not doing any checking for valid TimeZone
|
348 |
-
if
|
349 |
date_default_timezone_set( $options['checkness']['set_timezone'] );
|
350 |
}
|
351 |
-
$date = ( !empty($options['checkness']['twenty_hour'])) ? date("G:i T (P").' GMT)' : date("g:i a");
|
352 |
$options['checkness']['time_stamp'] = ( isset( $options['checkness']['time_stamp'] ) ? $options['checkness']['time_stamp'] : false );
|
353 |
if( $options['checkness']['time_stamp'] == true ) {
|
354 |
echo '
|
184 |
}
|
185 |
}
|
186 |
|
187 |
+
if( !empty( $options['checkness']['set_timezone'] ) ) {
|
188 |
date_default_timezone_set( $options['checkness']['set_timezone'] );
|
189 |
}
|
190 |
+
$date = ( !empty( $options['checkness']['twenty_hour'] ) ) ? date( "G:i T (P" ) .' GMT)' : date( "g:i a" );
|
191 |
$options['checkness']['time_stamp'] = ( isset( $options['checkness']['time_stamp'] ) ? $options['checkness']['time_stamp'] : false );
|
192 |
+
if( $options['checkness']['time_stamp'] == true ) {
|
193 |
echo $options['checkness']['time_stamp_title'].' ' . $date . "\n";
|
194 |
}
|
195 |
if( method_exists( $order, 'get_payment_method_title' ) ) {
|
345 |
}
|
346 |
|
347 |
// @mod - We are not doing any checking for valid TimeZone
|
348 |
+
if( !empty( $options['checkness']['set_timezone'] ) ) {
|
349 |
date_default_timezone_set( $options['checkness']['set_timezone'] );
|
350 |
}
|
351 |
+
$date = ( !empty( $options['checkness']['twenty_hour'] ) ) ? date( "G:i T (P" ) . ' GMT)' : date( "g:i a" );
|
352 |
$options['checkness']['time_stamp'] = ( isset( $options['checkness']['time_stamp'] ) ? $options['checkness']['time_stamp'] : false );
|
353 |
if( $options['checkness']['time_stamp'] == true ) {
|
354 |
echo '
|
includes/pickers/css/backend_css.css
CHANGED
@@ -159,12 +159,6 @@ input.wccs_submit_button {
|
|
159 |
margin-bottom: 10px;
|
160 |
margin-left: 15px;
|
161 |
}
|
162 |
-
/*
|
163 |
-
input#wccs_reset_submit,
|
164 |
-
input#wccs_submit_button {
|
165 |
-
margin-top:10px;
|
166 |
-
}
|
167 |
-
*/
|
168 |
.reset_form {
|
169 |
float: left;
|
170 |
}
|
159 |
margin-bottom: 10px;
|
160 |
margin-left: 15px;
|
161 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
162 |
.reset_form {
|
163 |
float: left;
|
164 |
}
|
includes/templates/admin/woocheckout-additional.php
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<thead>
|
3 |
|
4 |
<tr>
|
5 |
-
<th style="width:3%;" class="wccs-order" title="<?php esc_attr_e( 'Change the order of Checkout fields'
|
6 |
|
7 |
<?php require( WOOCCM_PATH.'includes/templates/admin/woocheckout-additional-thead.php' ); ?>
|
8 |
|
@@ -14,22 +14,26 @@
|
|
14 |
|
15 |
<?php
|
16 |
if( isset( $options['buttons'] ) ) {
|
17 |
-
|
|
|
|
|
18 |
|
|
|
19 |
if( !isset( $options['buttons'][$i] ) )
|
20 |
break;
|
|
|
21 |
?>
|
22 |
|
23 |
<tr valign="top" id="wccs-additional-id-<?php echo $i; ?>" class="wccs-row">
|
24 |
|
25 |
<td style="display:none;" class="wccs-order-hidden" >
|
26 |
-
<input type="hidden" name="wccs_settings[buttons][<?php echo $i; ?>][order]" value="<?php echo (empty( $options['buttons'][$i]['order'])) ? $i :
|
27 |
</td>
|
28 |
<td class="wccs-order" title="<?php esc_attr_e( 'Drag-and-drop this Checkout field to adjust its ordering', 'woocommerce-checkout-manager' ); ?>"><?php echo $i+1; ?></td>
|
29 |
|
30 |
<?php require( WOOCCM_PATH.'includes/templates/admin/woocheckout-additional-tbody.php' ); ?>
|
31 |
|
32 |
-
<td class="wccs-remove"><a class="wccs-remove-button" href="javascript:;" title="<?php esc_attr_e( 'Delete this Checkout field'
|
33 |
|
34 |
</tr>
|
35 |
<!-- #wccs-additional-id-<?php echo $i; ?> .wccs-row -->
|
@@ -49,11 +53,11 @@
|
|
49 |
<input type="hidden" name="wccs_settings[buttons][<?php echo $i; ?>][order]" value="<?php echo $i; ?>" />
|
50 |
</td>
|
51 |
|
52 |
-
<td class="wccs-order" title="<?php esc_attr_e( 'Drag-and-drop this Checkout field to adjust its ordering'
|
53 |
|
54 |
<?php require( WOOCCM_PATH.'includes/templates/admin/woocheckout-additional-clone.php' ); ?>
|
55 |
|
56 |
-
<td class="wccs-remove"><a class="wccs-remove-button" href="javascript:;" title="<?php esc_attr_e( 'Delete this Checkout field'
|
57 |
|
58 |
</tr>
|
59 |
<!-- #wccs-additional-id-<?php echo $i; ?> .wccs-clone -->
|
@@ -62,6 +66,6 @@
|
|
62 |
<!-- .widefat -->
|
63 |
|
64 |
<div class="wccs-table-footer additional-semi" style="display:none;">
|
65 |
-
<a href="javascript:;" id="wccs-add-button" class="button-secondary"><?php _e( '+ Add New Field'
|
66 |
</div>
|
67 |
<!-- .wccs-table-footer -->
|
2 |
<thead>
|
3 |
|
4 |
<tr>
|
5 |
+
<th style="width:3%;" class="wccs-order" title="<?php esc_attr_e( 'Change the order of Checkout fields', 'woocommerce-checkout-manager' ); ?>">#</th>
|
6 |
|
7 |
<?php require( WOOCCM_PATH.'includes/templates/admin/woocheckout-additional-thead.php' ); ?>
|
8 |
|
14 |
|
15 |
<?php
|
16 |
if( isset( $options['buttons'] ) ) {
|
17 |
+
$size = count( $options['buttons'] );
|
18 |
+
// $size = max( array_keys( $options['buttons'] ) );
|
19 |
+
for( $i = 0; $i < $size; $i++ ) {
|
20 |
|
21 |
+
/*
|
22 |
if( !isset( $options['buttons'][$i] ) )
|
23 |
break;
|
24 |
+
*/
|
25 |
?>
|
26 |
|
27 |
<tr valign="top" id="wccs-additional-id-<?php echo $i; ?>" class="wccs-row">
|
28 |
|
29 |
<td style="display:none;" class="wccs-order-hidden" >
|
30 |
+
<input type="hidden" name="wccs_settings[buttons][<?php echo $i; ?>][order]" value="<?php echo ( empty( $options['buttons'][$i]['order'] ) ) ? $i : $options['buttons'][$i]['order']; ?>" />
|
31 |
</td>
|
32 |
<td class="wccs-order" title="<?php esc_attr_e( 'Drag-and-drop this Checkout field to adjust its ordering', 'woocommerce-checkout-manager' ); ?>"><?php echo $i+1; ?></td>
|
33 |
|
34 |
<?php require( WOOCCM_PATH.'includes/templates/admin/woocheckout-additional-tbody.php' ); ?>
|
35 |
|
36 |
+
<td class="wccs-remove"><a class="wccs-remove-button" href="javascript:;" title="<?php esc_attr_e( 'Delete this Checkout field', 'woocommerce-checkout-manager' ); ?>">×</a></td>
|
37 |
|
38 |
</tr>
|
39 |
<!-- #wccs-additional-id-<?php echo $i; ?> .wccs-row -->
|
53 |
<input type="hidden" name="wccs_settings[buttons][<?php echo $i; ?>][order]" value="<?php echo $i; ?>" />
|
54 |
</td>
|
55 |
|
56 |
+
<td class="wccs-order" title="<?php esc_attr_e( 'Drag-and-drop this Checkout field to adjust its ordering', 'woocommerce-checkout-manager' ); ?>"><?php echo $i; ?></td>
|
57 |
|
58 |
<?php require( WOOCCM_PATH.'includes/templates/admin/woocheckout-additional-clone.php' ); ?>
|
59 |
|
60 |
+
<td class="wccs-remove"><a class="wccs-remove-button" href="javascript:;" title="<?php esc_attr_e( 'Delete this Checkout field', 'woocommerce-checkout-manager' ); ?>">×</a></td>
|
61 |
|
62 |
</tr>
|
63 |
<!-- #wccs-additional-id-<?php echo $i; ?> .wccs-clone -->
|
66 |
<!-- .widefat -->
|
67 |
|
68 |
<div class="wccs-table-footer additional-semi" style="display:none;">
|
69 |
+
<a href="javascript:;" id="wccs-add-button" class="button-secondary"><?php _e( '+ Add New Field', 'woocommerce-checkout-manager' ); ?></a>
|
70 |
</div>
|
71 |
<!-- .wccs-table-footer -->
|
includes/templates/admin/woocheckout-billing.php
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<thead>
|
3 |
|
4 |
<tr>
|
5 |
-
<th style="width:3%;" class="billing-wccs-order" title="<?php esc_attr_e( 'Change the order of Checkout fields'
|
6 |
|
7 |
<?php require( WOOCCM_PATH.'includes/templates/admin/woocheckout-billing-thead.php' ); ?>
|
8 |
|
@@ -27,16 +27,20 @@
|
|
27 |
'email',
|
28 |
'phone'
|
29 |
);
|
30 |
-
|
|
|
|
|
31 |
|
|
|
32 |
if( !isset( $options3['billing_buttons'][$i] ) )
|
33 |
break;
|
|
|
34 |
?>
|
35 |
|
36 |
<tr valign="top" id="wccs-billing-id-<?php echo $i; ?>" class="billing-wccs-row">
|
37 |
|
38 |
<td style="display:none;" class="billing-wccs-order-hidden" >
|
39 |
-
<input type="hidden" name="wccs_settings3[billing_buttons][<?php echo $i; ?>][order]" value="<?php echo (empty( $options3['billing_buttons'][$i]['order'])) ? $i :
|
40 |
</td>
|
41 |
<td class="billing-wccs-order" title="<?php esc_attr_e( 'Drag-and-drop this Checkout field to adjust its ordering', 'woocommerce-checkout-manager' ); ?>"><?php echo $i+1; ?></td>
|
42 |
|
@@ -44,10 +48,10 @@
|
|
44 |
|
45 |
<?php if( in_array( $options3['billing_buttons'][$i]['cow'], $billing) ) { ?>
|
46 |
<td style="text-align:center;">
|
47 |
-
<input name="wccs_settings3[billing_buttons][<?php echo $i; ?>][disabled]" type="checkbox" value="true" <?php if
|
48 |
</td>
|
49 |
<?php } else { ?>
|
50 |
-
<td class="billing-wccs-remove"><a class="billing-wccs-remove-button" href="javascript:;" title="<?php esc_attr_e( 'Delete this Checkout field'
|
51 |
<?php } ?>
|
52 |
|
53 |
</tr>
|
@@ -68,11 +72,11 @@
|
|
68 |
<input type="hidden" name="wccs_settings3[billing_buttons][<?php echo $i; ?>][order]" value="<?php echo $i; ?>" />
|
69 |
</td>
|
70 |
|
71 |
-
<td class="billing-wccs-order" title="<?php esc_attr_e( 'Drag-and-drop this Checkout field to adjust its ordering'
|
72 |
|
73 |
<?php require( WOOCCM_PATH.'includes/templates/admin/woocheckout-billing-clone.php' ); ?>
|
74 |
|
75 |
-
<td class="billing-wccs-remove"><a class="billing-wccs-remove-button" href="javascript:;" title="<?php esc_attr_e( 'Delete this Checkout field'
|
76 |
|
77 |
</tr>
|
78 |
<!-- #wccs-billing-id-<?php echo $i; ?> .billing-wccs-clone -->
|
@@ -81,6 +85,6 @@
|
|
81 |
<!-- .widefat -->
|
82 |
|
83 |
<div class="billing-wccs-table-footer billing-semi" style="display:none;">
|
84 |
-
<a href="javascript:;" id="billing-wccs-add-button" class="button-secondary"><?php _e( '+ Add New Field'
|
85 |
</div>
|
86 |
<!-- .billing-wccs-table-footer -->
|
2 |
<thead>
|
3 |
|
4 |
<tr>
|
5 |
+
<th style="width:3%;" class="billing-wccs-order" title="<?php esc_attr_e( 'Change the order of Checkout fields', 'woocommerce-checkout-manager' ); ?>">#</th>
|
6 |
|
7 |
<?php require( WOOCCM_PATH.'includes/templates/admin/woocheckout-billing-thead.php' ); ?>
|
8 |
|
27 |
'email',
|
28 |
'phone'
|
29 |
);
|
30 |
+
$size = count( $options3['billing_buttons'] );
|
31 |
+
// $size = max( array_keys( $options3['billing_buttons'] ) );
|
32 |
+
for( $i = 0; $i < $size; $i++ ) {
|
33 |
|
34 |
+
/*
|
35 |
if( !isset( $options3['billing_buttons'][$i] ) )
|
36 |
break;
|
37 |
+
*/
|
38 |
?>
|
39 |
|
40 |
<tr valign="top" id="wccs-billing-id-<?php echo $i; ?>" class="billing-wccs-row">
|
41 |
|
42 |
<td style="display:none;" class="billing-wccs-order-hidden" >
|
43 |
+
<input type="hidden" name="wccs_settings3[billing_buttons][<?php echo $i; ?>][order]" value="<?php echo ( empty( $options3['billing_buttons'][$i]['order'] ) ) ? $i : $options3['billing_buttons'][$i]['order']; ?>" />
|
44 |
</td>
|
45 |
<td class="billing-wccs-order" title="<?php esc_attr_e( 'Drag-and-drop this Checkout field to adjust its ordering', 'woocommerce-checkout-manager' ); ?>"><?php echo $i+1; ?></td>
|
46 |
|
48 |
|
49 |
<?php if( in_array( $options3['billing_buttons'][$i]['cow'], $billing) ) { ?>
|
50 |
<td style="text-align:center;">
|
51 |
+
<input name="wccs_settings3[billing_buttons][<?php echo $i; ?>][disabled]" type="checkbox" value="true" <?php if( !empty( $options3['billing_buttons'][$i]['disabled'] ) ) echo "checked='checked'"; ?> />
|
52 |
</td>
|
53 |
<?php } else { ?>
|
54 |
+
<td class="billing-wccs-remove"><a class="billing-wccs-remove-button" href="javascript:;" title="<?php esc_attr_e( 'Delete this Checkout field', 'woocommerce-checkout-manager' ); ?>">×</a></td>
|
55 |
<?php } ?>
|
56 |
|
57 |
</tr>
|
72 |
<input type="hidden" name="wccs_settings3[billing_buttons][<?php echo $i; ?>][order]" value="<?php echo $i; ?>" />
|
73 |
</td>
|
74 |
|
75 |
+
<td class="billing-wccs-order" title="<?php esc_attr_e( 'Drag-and-drop this Checkout field to adjust its ordering', 'woocommerce-checkout-manager' ); ?>"><?php echo $i; ?></td>
|
76 |
|
77 |
<?php require( WOOCCM_PATH.'includes/templates/admin/woocheckout-billing-clone.php' ); ?>
|
78 |
|
79 |
+
<td class="billing-wccs-remove"><a class="billing-wccs-remove-button" href="javascript:;" title="<?php esc_attr_e( 'Delete this Checkout field', 'woocommerce-checkout-manager' ); ?>">×</a></td>
|
80 |
|
81 |
</tr>
|
82 |
<!-- #wccs-billing-id-<?php echo $i; ?> .billing-wccs-clone -->
|
85 |
<!-- .widefat -->
|
86 |
|
87 |
<div class="billing-wccs-table-footer billing-semi" style="display:none;">
|
88 |
+
<a href="javascript:;" id="billing-wccs-add-button" class="button-secondary"><?php _e( '+ Add New Field', 'woocommerce-checkout-manager' ); ?></a>
|
89 |
</div>
|
90 |
<!-- .billing-wccs-table-footer -->
|
includes/templates/admin/woocheckout-general-order-notes.php
CHANGED
@@ -59,7 +59,7 @@
|
|
59 |
|
60 |
<div class="option">
|
61 |
<label>
|
62 |
-
<input type="checkbox" name="wccs_settings[checkness][twenty_hour]" value="true"<?php checked( !empty( $options['checkness']['twenty_hour
|
63 |
<div class="info-of"><?php _e('Enable 24 hour time.', 'woocommerce-checkout-manager'); ?></div>
|
64 |
</label>
|
65 |
</div>
|
59 |
|
60 |
<div class="option">
|
61 |
<label>
|
62 |
+
<input type="checkbox" name="wccs_settings[checkness][twenty_hour]" value="true"<?php checked( !empty( $options['checkness']['twenty_hour'] ), true ); ?> />
|
63 |
<div class="info-of"><?php _e('Enable 24 hour time.', 'woocommerce-checkout-manager'); ?></div>
|
64 |
</label>
|
65 |
</div>
|
includes/templates/admin/woocheckout-shipping.php
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
<tbody>
|
14 |
|
15 |
<?php
|
16 |
-
if( isset
|
17 |
$shipping = array(
|
18 |
'country',
|
19 |
'first_name',
|
@@ -25,27 +25,31 @@
|
|
25 |
'state',
|
26 |
'postcode'
|
27 |
);
|
28 |
-
|
|
|
|
|
29 |
|
|
|
30 |
if( !isset( $options2['shipping_buttons'][$i] ) )
|
31 |
break;
|
|
|
32 |
?>
|
33 |
|
34 |
<tr valign="top" id="wccs-shipping-id-<?php echo $i; ?>" class="shipping-wccs-row">
|
35 |
|
36 |
<td style="display:none;" class="shipping-wccs-order-hidden">
|
37 |
-
<input type="hidden" name="wccs_settings2[shipping_buttons][<?php echo $i; ?>][order]" value="<?php echo (empty( $options2['shipping_buttons'][$i]['order'])) ? $i :
|
38 |
</td>
|
39 |
<td class="shipping-wccs-order" title="<?php esc_attr_e( 'Drag-and-drop this Checkout field to adjust its ordering', 'woocommerce-checkout-manager' ); ?>"><?php echo $i+1; ?></td>
|
40 |
|
41 |
<?php require(WOOCCM_PATH.'includes/templates/admin/woocheckout-shipping-tbody.php'); ?>
|
42 |
|
43 |
-
<?php if( in_array( $options2['shipping_buttons'][$i]['cow']
|
44 |
<td style="text-align:center;">
|
45 |
-
<input name="wccs_settings2[shipping_buttons][<?php echo $i; ?>][disabled]" type="checkbox" value="true" <?php if (
|
46 |
</td>
|
47 |
<?php } else { ?>
|
48 |
-
<td class="shipping-wccs-remove"><a class="shipping-wccs-remove-button" href="javascript:;" title="<?php esc_attr_e( 'Delete this Checkout field'
|
49 |
<?php } ?>
|
50 |
|
51 |
</tr>
|
@@ -70,7 +74,7 @@
|
|
70 |
|
71 |
<?php require( WOOCCM_PATH.'includes/templates/admin/woocheckout-shipping-clone.php' ); ?>
|
72 |
|
73 |
-
<td class="shipping-wccs-remove"><a class="shipping-wccs-remove-button" href="javascript:;" title="<?php esc_attr_e( 'Delete this Checkout field'
|
74 |
|
75 |
</tr>
|
76 |
<!-- #wccs-shipping-id-<?php echo $i; ?> .shipping-wccs-clone -->
|
@@ -79,6 +83,6 @@
|
|
79 |
<!-- .widefat -->
|
80 |
|
81 |
<div class="shipping-wccs-table-footer shipping-semi" style="display:none;">
|
82 |
-
<a href="javascript:;" id="shipping-wccs-add-button" class="button-secondary"><?php _e( '+ Add New Field'
|
83 |
</div>
|
84 |
<!-- .shipping-wccs-table-footer -->
|
13 |
<tbody>
|
14 |
|
15 |
<?php
|
16 |
+
if( isset( $options2['shipping_buttons'] ) ) {
|
17 |
$shipping = array(
|
18 |
'country',
|
19 |
'first_name',
|
25 |
'state',
|
26 |
'postcode'
|
27 |
);
|
28 |
+
$size = count( $options2['shipping_buttons'] );
|
29 |
+
// $size = max( array_keys( $options2['shipping_buttons'] ) );
|
30 |
+
for( $i = 0; $i < $size; $i++ ) {
|
31 |
|
32 |
+
/*
|
33 |
if( !isset( $options2['shipping_buttons'][$i] ) )
|
34 |
break;
|
35 |
+
*/
|
36 |
?>
|
37 |
|
38 |
<tr valign="top" id="wccs-shipping-id-<?php echo $i; ?>" class="shipping-wccs-row">
|
39 |
|
40 |
<td style="display:none;" class="shipping-wccs-order-hidden">
|
41 |
+
<input type="hidden" name="wccs_settings2[shipping_buttons][<?php echo $i; ?>][order]" value="<?php echo ( empty( $options2['shipping_buttons'][$i]['order'] ) ) ? $i : $options2['shipping_buttons'][$i]['order']; ?>" />
|
42 |
</td>
|
43 |
<td class="shipping-wccs-order" title="<?php esc_attr_e( 'Drag-and-drop this Checkout field to adjust its ordering', 'woocommerce-checkout-manager' ); ?>"><?php echo $i+1; ?></td>
|
44 |
|
45 |
<?php require(WOOCCM_PATH.'includes/templates/admin/woocheckout-shipping-tbody.php'); ?>
|
46 |
|
47 |
+
<?php if( in_array( $options2['shipping_buttons'][$i]['cow'], $shipping ) ) { ?>
|
48 |
<td style="text-align:center;">
|
49 |
+
<input name="wccs_settings2[shipping_buttons][<?php echo $i; ?>][disabled]" type="checkbox" value="true" <?php if ( !empty ( $options2['shipping_buttons'][$i]['disabled'] ) ) echo "checked='checked'"; ?> />
|
50 |
</td>
|
51 |
<?php } else { ?>
|
52 |
+
<td class="shipping-wccs-remove"><a class="shipping-wccs-remove-button" href="javascript:;" title="<?php esc_attr_e( 'Delete this Checkout field', 'woocommerce-checkout-manager' ); ?>">×</a></td>
|
53 |
<?php } ?>
|
54 |
|
55 |
</tr>
|
74 |
|
75 |
<?php require( WOOCCM_PATH.'includes/templates/admin/woocheckout-shipping-clone.php' ); ?>
|
76 |
|
77 |
+
<td class="shipping-wccs-remove"><a class="shipping-wccs-remove-button" href="javascript:;" title="<?php esc_attr_e( 'Delete this Checkout field', 'woocommerce-checkout-manager' ); ?>">×</a></td>
|
78 |
|
79 |
</tr>
|
80 |
<!-- #wccs-shipping-id-<?php echo $i; ?> .shipping-wccs-clone -->
|
83 |
<!-- .widefat -->
|
84 |
|
85 |
<div class="shipping-wccs-table-footer shipping-semi" style="display:none;">
|
86 |
+
<a href="javascript:;" id="shipping-wccs-add-button" class="button-secondary"><?php _e( '+ Add New Field', 'woocommerce-checkout-manager' ); ?></a>
|
87 |
</div>
|
88 |
<!-- .shipping-wccs-table-footer -->
|
includes/templates/functions/add_functions.php
CHANGED
@@ -182,7 +182,7 @@ jQuery(document).ready(function($) {
|
|
182 |
|
183 |
jQuery('#<?php echo $btn['cow']; ?>_field input').click(function() {
|
184 |
|
185 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
186 |
|
187 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
188 |
data = {
|
@@ -211,7 +211,7 @@ jQuery(document).ready(function($) {
|
|
211 |
<?php } ?>
|
212 |
jQuery('#<?php echo $btn['cow']; ?>_field input').click(function() {
|
213 |
|
214 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
215 |
|
216 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
217 |
data = {
|
@@ -242,7 +242,7 @@ jQuery(document).ready(function($) {
|
|
242 |
<?php } ?>
|
243 |
jQuery('#<?php echo $btn['cow']; ?>_field select').change(function() {
|
244 |
|
245 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
246 |
|
247 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
248 |
data = {
|
@@ -272,7 +272,7 @@ jQuery(document).ready(function($) {
|
|
272 |
|
273 |
jQuery('#<?php echo $btn['cow']; ?>_field select').change(function() {
|
274 |
|
275 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
276 |
|
277 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
278 |
data = {
|
@@ -308,7 +308,7 @@ jQuery(document).ready(function($) {
|
|
308 |
|
309 |
jQuery('#<?php echo $btn['cow']; ?>_field #<?php echo $btn['cow']; ?>_applynow').click(function() {
|
310 |
|
311 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
312 |
|
313 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
314 |
data = {
|
@@ -416,7 +416,7 @@ jQuery(document).ready(function($){
|
|
416 |
|
417 |
<?php if( !empty( $btn2['fee_name'] ) && !empty( $btn2['add_amount'] ) ) { ?>
|
418 |
|
419 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
420 |
|
421 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
422 |
data = {
|
@@ -483,7 +483,7 @@ jQuery(document).ready(function($){
|
|
483 |
|
484 |
<?php if( !empty( $btn2['fee_name'] ) && !empty( $btn2['add_amount'] ) ) { ?>
|
485 |
|
486 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
487 |
|
488 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
489 |
data = {
|
@@ -548,7 +548,7 @@ jQuery(document).ready(function($){
|
|
548 |
|
549 |
<?php if( !empty( $btn2['fee_name'] ) && !empty( $btn2['add_amount'] ) ) { ?>
|
550 |
|
551 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
552 |
|
553 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
554 |
data = {
|
182 |
|
183 |
jQuery('#<?php echo $btn['cow']; ?>_field input').click(function() {
|
184 |
|
185 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
186 |
|
187 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
188 |
data = {
|
211 |
<?php } ?>
|
212 |
jQuery('#<?php echo $btn['cow']; ?>_field input').click(function() {
|
213 |
|
214 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
215 |
|
216 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
217 |
data = {
|
242 |
<?php } ?>
|
243 |
jQuery('#<?php echo $btn['cow']; ?>_field select').change(function() {
|
244 |
|
245 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
246 |
|
247 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
248 |
data = {
|
272 |
|
273 |
jQuery('#<?php echo $btn['cow']; ?>_field select').change(function() {
|
274 |
|
275 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
276 |
|
277 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
278 |
data = {
|
308 |
|
309 |
jQuery('#<?php echo $btn['cow']; ?>_field #<?php echo $btn['cow']; ?>_applynow').click(function() {
|
310 |
|
311 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
312 |
|
313 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
314 |
data = {
|
416 |
|
417 |
<?php if( !empty( $btn2['fee_name'] ) && !empty( $btn2['add_amount'] ) ) { ?>
|
418 |
|
419 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
420 |
|
421 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
422 |
data = {
|
483 |
|
484 |
<?php if( !empty( $btn2['fee_name'] ) && !empty( $btn2['add_amount'] ) ) { ?>
|
485 |
|
486 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
487 |
|
488 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
489 |
data = {
|
548 |
|
549 |
<?php if( !empty( $btn2['fee_name'] ) && !empty( $btn2['add_amount'] ) ) { ?>
|
550 |
|
551 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
552 |
|
553 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
554 |
data = {
|
includes/templates/functions/billing_functions.php
CHANGED
@@ -213,7 +213,7 @@ jQuery(document).ready(function($) {
|
|
213 |
|
214 |
jQuery('#billing_<?php echo $btn['cow']; ?>_field input').click(function() {
|
215 |
|
216 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
217 |
|
218 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
219 |
data = {
|
@@ -242,7 +242,7 @@ jQuery(document).ready(function($) {
|
|
242 |
<?php } ?>
|
243 |
jQuery('#billing_<?php echo $btn['cow']; ?>_field input').click(function() {
|
244 |
|
245 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
246 |
|
247 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
248 |
data = {
|
@@ -273,7 +273,7 @@ jQuery(document).ready(function($) {
|
|
273 |
<?php } ?>
|
274 |
jQuery('#billing_<?php echo $btn['cow']; ?>_field select').change(function() {
|
275 |
|
276 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
277 |
|
278 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
279 |
data = {
|
@@ -303,7 +303,7 @@ jQuery(document).ready(function($) {
|
|
303 |
|
304 |
jQuery('#billing_<?php echo $btn['cow']; ?>_field select').change(function() {
|
305 |
|
306 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
307 |
|
308 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
309 |
data = {
|
@@ -339,7 +339,7 @@ jQuery(document).ready(function($) {
|
|
339 |
|
340 |
jQuery('#billing_<?php echo $btn['cow']; ?>_field #billing_<?php echo $btn['cow']; ?>_applynow').click(function() {
|
341 |
|
342 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
343 |
|
344 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
345 |
data = {
|
@@ -447,7 +447,7 @@ jQuery(document).ready(function($){
|
|
447 |
|
448 |
<?php if( !empty( $btn2['fee_name'] ) && !empty( $btn2['add_amount'] ) ) { ?>
|
449 |
|
450 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
451 |
|
452 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
453 |
data = {
|
@@ -514,7 +514,7 @@ jQuery(document).ready(function($){
|
|
514 |
|
515 |
<?php if( !empty( $btn2['fee_name'] ) && !empty( $btn2['add_amount'] ) ) { ?>
|
516 |
|
517 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
518 |
|
519 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
520 |
data = {
|
@@ -579,7 +579,7 @@ jQuery(document).ready(function($){
|
|
579 |
|
580 |
<?php if( !empty( $btn2['fee_name'] ) && !empty( $btn2['add_amount'] ) ) { ?>
|
581 |
|
582 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
583 |
|
584 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
585 |
data = {
|
213 |
|
214 |
jQuery('#billing_<?php echo $btn['cow']; ?>_field input').click(function() {
|
215 |
|
216 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
217 |
|
218 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
219 |
data = {
|
242 |
<?php } ?>
|
243 |
jQuery('#billing_<?php echo $btn['cow']; ?>_field input').click(function() {
|
244 |
|
245 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
246 |
|
247 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
248 |
data = {
|
273 |
<?php } ?>
|
274 |
jQuery('#billing_<?php echo $btn['cow']; ?>_field select').change(function() {
|
275 |
|
276 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
277 |
|
278 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
279 |
data = {
|
303 |
|
304 |
jQuery('#billing_<?php echo $btn['cow']; ?>_field select').change(function() {
|
305 |
|
306 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
307 |
|
308 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
309 |
data = {
|
339 |
|
340 |
jQuery('#billing_<?php echo $btn['cow']; ?>_field #billing_<?php echo $btn['cow']; ?>_applynow').click(function() {
|
341 |
|
342 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
343 |
|
344 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
345 |
data = {
|
447 |
|
448 |
<?php if( !empty( $btn2['fee_name'] ) && !empty( $btn2['add_amount'] ) ) { ?>
|
449 |
|
450 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
451 |
|
452 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
453 |
data = {
|
514 |
|
515 |
<?php if( !empty( $btn2['fee_name'] ) && !empty( $btn2['add_amount'] ) ) { ?>
|
516 |
|
517 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
518 |
|
519 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
520 |
data = {
|
579 |
|
580 |
<?php if( !empty( $btn2['fee_name'] ) && !empty( $btn2['add_amount'] ) ) { ?>
|
581 |
|
582 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
583 |
|
584 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
585 |
data = {
|
includes/templates/functions/shipping_functions.php
CHANGED
@@ -216,7 +216,7 @@ jQuery(document).ready(function($) {
|
|
216 |
|
217 |
jQuery('#shipping_<?php echo $btn['cow']; ?>_field input').click(function() {
|
218 |
|
219 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
220 |
|
221 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
222 |
data = {
|
@@ -245,7 +245,7 @@ jQuery(document).ready(function($) {
|
|
245 |
<?php } ?>
|
246 |
jQuery('#shipping_<?php echo $btn['cow']; ?>_field input').click(function() {
|
247 |
|
248 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
249 |
|
250 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
251 |
data = {
|
@@ -276,7 +276,7 @@ jQuery(document).ready(function($) {
|
|
276 |
<?php } ?>
|
277 |
jQuery('#shipping_<?php echo $btn['cow']; ?>_field select').change(function() {
|
278 |
|
279 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
280 |
|
281 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
282 |
data = {
|
@@ -306,7 +306,7 @@ jQuery(document).ready(function($) {
|
|
306 |
|
307 |
jQuery('#shipping_<?php echo $btn['cow']; ?>_field select').change(function() {
|
308 |
|
309 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
310 |
|
311 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
312 |
data = {
|
@@ -342,7 +342,7 @@ jQuery(document).ready(function($) {
|
|
342 |
|
343 |
jQuery('#shipping_<?php echo $btn['cow']; ?>_field #shipping_<?php echo $btn['cow']; ?>_applynow').click(function() {
|
344 |
|
345 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
346 |
|
347 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
348 |
data = {
|
@@ -450,7 +450,7 @@ jQuery(document).ready(function($){
|
|
450 |
|
451 |
<?php if( !empty( $btn2['fee_name'] ) && !empty( $btn2['add_amount'] ) ) { ?>
|
452 |
|
453 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
454 |
|
455 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
456 |
data = {
|
@@ -517,7 +517,7 @@ jQuery(document).ready(function($){
|
|
517 |
|
518 |
<?php if( !empty( $btn2['fee_name'] ) && !empty( $btn2['add_amount'] ) ) { ?>
|
519 |
|
520 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
521 |
|
522 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
523 |
data = {
|
@@ -582,7 +582,7 @@ jQuery(document).ready(function($){
|
|
582 |
|
583 |
<?php if( !empty( $btn2['fee_name'] ) && !empty( $btn2['add_amount'] ) ) { ?>
|
584 |
|
585 |
-
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' +
|
586 |
|
587 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
588 |
data = {
|
216 |
|
217 |
jQuery('#shipping_<?php echo $btn['cow']; ?>_field input').click(function() {
|
218 |
|
219 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
220 |
|
221 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
222 |
data = {
|
245 |
<?php } ?>
|
246 |
jQuery('#shipping_<?php echo $btn['cow']; ?>_field input').click(function() {
|
247 |
|
248 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
249 |
|
250 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
251 |
data = {
|
276 |
<?php } ?>
|
277 |
jQuery('#shipping_<?php echo $btn['cow']; ?>_field select').change(function() {
|
278 |
|
279 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
280 |
|
281 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
282 |
data = {
|
306 |
|
307 |
jQuery('#shipping_<?php echo $btn['cow']; ?>_field select').change(function() {
|
308 |
|
309 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
310 |
|
311 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
312 |
data = {
|
342 |
|
343 |
jQuery('#shipping_<?php echo $btn['cow']; ?>_field #shipping_<?php echo $btn['cow']; ?>_applynow').click(function() {
|
344 |
|
345 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
346 |
|
347 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
348 |
data = {
|
450 |
|
451 |
<?php if( !empty( $btn2['fee_name'] ) && !empty( $btn2['add_amount'] ) ) { ?>
|
452 |
|
453 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
454 |
|
455 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
456 |
data = {
|
517 |
|
518 |
<?php if( !empty( $btn2['fee_name'] ) && !empty( $btn2['add_amount'] ) ) { ?>
|
519 |
|
520 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
521 |
|
522 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
523 |
data = {
|
582 |
|
583 |
<?php if( !empty( $btn2['fee_name'] ) && !empty( $btn2['add_amount'] ) ) { ?>
|
584 |
|
585 |
+
$( 'form.checkout' ).block({ message: null, overlayCSS: { background: '#fff url(' + woocommerce_get_script_data.ajax_loader_url + ') no-repeat center', backgroundSize: '16px 16px', opacity: 0.6 } });
|
586 |
|
587 |
var ajaxurl = '<?php echo admin_url('/admin-ajax.php'); ?>';
|
588 |
data = {
|
includes/templates/js/billing_script_wccs.js
CHANGED
@@ -7,29 +7,30 @@ jQuery(document).ready( function() {
|
|
7 |
|
8 |
// Update Order Numbers
|
9 |
function billing_update_order_numbers(div) {
|
10 |
-
count = parseInt(jQuery('.billing-wccs-table').children('tbody').children('tr.billing-wccs-row').length);
|
11 |
|
|
|
12 |
div.children('tbody').children('tr.billing-wccs-row').each(function(i) {
|
13 |
|
14 |
-
|
15 |
-
|
16 |
-
for
|
17 |
-
|
18 |
-
|
19 |
-
|
20 |
-
|
21 |
-
|
22 |
-
|
23 |
-
|
24 |
-
|
25 |
-
});
|
26 |
-
|
27 |
}
|
|
|
28 |
});
|
|
|
29 |
}
|
30 |
|
31 |
// Make Sortable
|
32 |
function billing_make_sortable(div){
|
|
|
33 |
var billing_fixHelper = function(e, ui) {
|
34 |
ui.children().each(function() {
|
35 |
jQuery(this).width(jQuery(this).width());
|
@@ -55,7 +56,7 @@ jQuery(document).ready( function() {
|
|
55 |
// Add button
|
56 |
jQuery('#billing-wccs-add-button').live('click', function(){
|
57 |
|
58 |
-
var billingdiv = jQuery('.billing-wccs-table'),
|
59 |
billing_row_count = billingdiv.children('tbody').children('tr.billing-wccs-row').length,
|
60 |
billing_new_field = billingdiv.children('tbody').children('tr.billing-wccs-clone').clone(false); // Create and add the new field
|
61 |
|
@@ -68,23 +69,21 @@ jQuery(document).ready( function() {
|
|
68 |
jQuery(this).attr('name', billing_name);
|
69 |
});
|
70 |
|
71 |
-
|
72 |
billing_new_field.find('[value]').each(function(){
|
73 |
var billing_count = parseInt(billing_row_count);
|
74 |
var billing_name = jQuery(this).attr('value').replace('999', billing_count + 1);
|
75 |
jQuery(this).attr('value', billing_name);
|
76 |
});
|
77 |
-
|
78 |
-
|
79 |
|
80 |
// Add row
|
81 |
-
billingdiv.children('tbody').append(billing_new_field);
|
82 |
billing_update_order_numbers(billingdiv);
|
83 |
|
84 |
// There is now 1 more row
|
85 |
billing_row_count ++;
|
86 |
|
87 |
-
return false;
|
|
|
88 |
});
|
89 |
|
90 |
// Remove button
|
@@ -103,4 +102,5 @@ jQuery(document).ready( function() {
|
|
103 |
}
|
104 |
|
105 |
});
|
|
|
106 |
});
|
7 |
|
8 |
// Update Order Numbers
|
9 |
function billing_update_order_numbers(div) {
|
|
|
10 |
|
11 |
+
count = parseInt(jQuery('.billing-wccs-table').children('tbody').children('tr.billing-wccs-row').length);
|
12 |
div.children('tbody').children('tr.billing-wccs-row').each(function(i) {
|
13 |
|
14 |
+
jQuery(this).children('td.billing-wccs-order').html(i+1);
|
15 |
+
|
16 |
+
for( var x = 0; x < count; x++ ) {
|
17 |
+
jQuery(this).children('td.more_toggler1,td.billing-wccs-order-hidden').find('[name]').each(function(){
|
18 |
+
var billing_name = jQuery(this).attr('name').replace('['+x+']','[' + i + ']');
|
19 |
+
jQuery(this).attr('name', billing_name);
|
20 |
+
});
|
21 |
+
jQuery(this).children('td.billing-wccs-order-hidden').find('[value]').each(function(){
|
22 |
+
var billing_name = jQuery(this).attr('value').replace(jQuery(this).val(), i+1);
|
23 |
+
jQuery(this).attr('value', billing_name);
|
24 |
+
});
|
|
|
|
|
25 |
}
|
26 |
+
|
27 |
});
|
28 |
+
|
29 |
}
|
30 |
|
31 |
// Make Sortable
|
32 |
function billing_make_sortable(div){
|
33 |
+
|
34 |
var billing_fixHelper = function(e, ui) {
|
35 |
ui.children().each(function() {
|
36 |
jQuery(this).width(jQuery(this).width());
|
56 |
// Add button
|
57 |
jQuery('#billing-wccs-add-button').live('click', function(){
|
58 |
|
59 |
+
var billingdiv = jQuery('.billing-wccs-table'),
|
60 |
billing_row_count = billingdiv.children('tbody').children('tr.billing-wccs-row').length,
|
61 |
billing_new_field = billingdiv.children('tbody').children('tr.billing-wccs-clone').clone(false); // Create and add the new field
|
62 |
|
69 |
jQuery(this).attr('name', billing_name);
|
70 |
});
|
71 |
|
|
|
72 |
billing_new_field.find('[value]').each(function(){
|
73 |
var billing_count = parseInt(billing_row_count);
|
74 |
var billing_name = jQuery(this).attr('value').replace('999', billing_count + 1);
|
75 |
jQuery(this).attr('value', billing_name);
|
76 |
});
|
|
|
|
|
77 |
|
78 |
// Add row
|
79 |
+
billingdiv.children('tbody').append(billing_new_field);
|
80 |
billing_update_order_numbers(billingdiv);
|
81 |
|
82 |
// There is now 1 more row
|
83 |
billing_row_count ++;
|
84 |
|
85 |
+
return false;
|
86 |
+
|
87 |
});
|
88 |
|
89 |
// Remove button
|
102 |
}
|
103 |
|
104 |
});
|
105 |
+
|
106 |
});
|
includes/templates/js/script_wccs.js
CHANGED
@@ -220,20 +220,21 @@ jQuery(document).ready( function() {
|
|
220 |
function update_order_numbers(div) {
|
221 |
|
222 |
count = parseInt(jQuery('.wccs-table').children('tbody').children('tr.wccs-row').length);
|
223 |
-
|
224 |
div.children('tbody').children('tr.wccs-row').each(function(i) {
|
|
|
225 |
jQuery(this).children('td.wccs-order').html(i+1);
|
226 |
-
|
|
|
227 |
jQuery(this).children('td.more_toggler1,td.wccs-order-hidden').find('[name]').each(function(){
|
228 |
var name = jQuery(this).attr('name').replace('['+x+']','[' + i + ']');
|
229 |
jQuery(this).attr('name', name);
|
230 |
});
|
231 |
-
|
232 |
jQuery(this).children('td.wccs-order-hidden').find('[value]').each(function(){
|
233 |
var name = jQuery(this).attr('value').replace(jQuery(this).val(), i+1);
|
234 |
jQuery(this).attr('value', name);
|
235 |
-
});
|
236 |
}
|
|
|
237 |
});
|
238 |
|
239 |
}
|
220 |
function update_order_numbers(div) {
|
221 |
|
222 |
count = parseInt(jQuery('.wccs-table').children('tbody').children('tr.wccs-row').length);
|
|
|
223 |
div.children('tbody').children('tr.wccs-row').each(function(i) {
|
224 |
+
|
225 |
jQuery(this).children('td.wccs-order').html(i+1);
|
226 |
+
|
227 |
+
for( var x = 0; x < count; x++ ) {
|
228 |
jQuery(this).children('td.more_toggler1,td.wccs-order-hidden').find('[name]').each(function(){
|
229 |
var name = jQuery(this).attr('name').replace('['+x+']','[' + i + ']');
|
230 |
jQuery(this).attr('name', name);
|
231 |
});
|
|
|
232 |
jQuery(this).children('td.wccs-order-hidden').find('[value]').each(function(){
|
233 |
var name = jQuery(this).attr('value').replace(jQuery(this).val(), i+1);
|
234 |
jQuery(this).attr('value', name);
|
235 |
+
});
|
236 |
}
|
237 |
+
|
238 |
});
|
239 |
|
240 |
}
|
includes/templates/js/shipping_script_wccs.js
CHANGED
@@ -7,29 +7,30 @@ jQuery(document).ready( function() {
|
|
7 |
|
8 |
// Update Order Numbers
|
9 |
function shipping_update_order_numbers(div) {
|
10 |
-
count = parseInt(jQuery('.shipping-wccs-table').children('tbody').children('tr.shipping-wccs-row').length);
|
11 |
|
|
|
12 |
div.children('tbody').children('tr.shipping-wccs-row').each(function(i) {
|
13 |
|
14 |
jQuery(this).children('td.shipping-wccs-order').html(i+1);
|
15 |
|
16 |
-
for
|
17 |
-
|
18 |
-
|
19 |
-
|
20 |
-
|
21 |
-
|
22 |
-
|
23 |
-
|
24 |
-
|
25 |
-
});
|
26 |
-
|
27 |
}
|
|
|
28 |
});
|
|
|
29 |
}
|
30 |
|
31 |
// Make Sortable
|
32 |
function shipping_make_sortable(div){
|
|
|
33 |
var shipping_fixHelper = function(e, ui) {
|
34 |
ui.children().each(function() {
|
35 |
jQuery(this).width(jQuery(this).width());
|
@@ -68,13 +69,11 @@ jQuery(document).ready( function() {
|
|
68 |
jQuery(this).attr('name', shipping_name);
|
69 |
});
|
70 |
|
71 |
-
|
72 |
shipping_new_field.find('[value]').each(function(){
|
73 |
var shipping_count = parseInt(shipping_row_count);
|
74 |
var shipping_name = jQuery(this).attr('value').replace('999', shipping_count + 1);
|
75 |
jQuery(this).attr('value', shipping_name);
|
76 |
});
|
77 |
-
|
78 |
|
79 |
// Add row
|
80 |
shippingdiv.children('tbody').append(shipping_new_field);
|
@@ -83,7 +82,8 @@ jQuery(document).ready( function() {
|
|
83 |
// There is now 1 more row
|
84 |
shipping_row_count ++;
|
85 |
|
86 |
-
return false;
|
|
|
87 |
});
|
88 |
|
89 |
// Remove button
|
@@ -102,4 +102,5 @@ jQuery(document).ready( function() {
|
|
102 |
}
|
103 |
|
104 |
});
|
|
|
105 |
});
|
7 |
|
8 |
// Update Order Numbers
|
9 |
function shipping_update_order_numbers(div) {
|
|
|
10 |
|
11 |
+
count = parseInt(jQuery('.shipping-wccs-table').children('tbody').children('tr.shipping-wccs-row').length);
|
12 |
div.children('tbody').children('tr.shipping-wccs-row').each(function(i) {
|
13 |
|
14 |
jQuery(this).children('td.shipping-wccs-order').html(i+1);
|
15 |
|
16 |
+
for( var x = 0; x < count; x++ ) {
|
17 |
+
jQuery(this).children('td.more_toggler1,td.shipping-wccs-order-hidden').find('[name]').each(function(){
|
18 |
+
var shipping_name = jQuery(this).attr('name').replace('['+x+']','[' + i + ']');
|
19 |
+
jQuery(this).attr('name', shipping_name);
|
20 |
+
});
|
21 |
+
jQuery(this).children('td.shipping-wccs-order-hidden').find('[value]').each(function(){
|
22 |
+
var shipping_name = jQuery(this).attr('value').replace(jQuery(this).val(), i+1);
|
23 |
+
jQuery(this).attr('value', shipping_name);
|
24 |
+
});
|
|
|
|
|
25 |
}
|
26 |
+
|
27 |
});
|
28 |
+
|
29 |
}
|
30 |
|
31 |
// Make Sortable
|
32 |
function shipping_make_sortable(div){
|
33 |
+
|
34 |
var shipping_fixHelper = function(e, ui) {
|
35 |
ui.children().each(function() {
|
36 |
jQuery(this).width(jQuery(this).width());
|
69 |
jQuery(this).attr('name', shipping_name);
|
70 |
});
|
71 |
|
|
|
72 |
shipping_new_field.find('[value]').each(function(){
|
73 |
var shipping_count = parseInt(shipping_row_count);
|
74 |
var shipping_name = jQuery(this).attr('value').replace('999', shipping_count + 1);
|
75 |
jQuery(this).attr('value', shipping_name);
|
76 |
});
|
|
|
77 |
|
78 |
// Add row
|
79 |
shippingdiv.children('tbody').append(shipping_new_field);
|
82 |
// There is now 1 more row
|
83 |
shipping_row_count ++;
|
84 |
|
85 |
+
return false;
|
86 |
+
|
87 |
});
|
88 |
|
89 |
// Remove button
|
102 |
}
|
103 |
|
104 |
});
|
105 |
+
|
106 |
});
|
readme.txt
CHANGED
@@ -2,10 +2,10 @@
|
|
2 |
|
3 |
Contributors: visser, visser.labs, Emark
|
4 |
Donate link: https://www.visser.com.au/donations/
|
5 |
-
Tags: woocommerce,
|
6 |
Requires at least: 3.0
|
7 |
-
Tested up to: 4.9.
|
8 |
-
Stable tag: 4.2.
|
9 |
License: GPLv2 or later
|
10 |
|
11 |
Manages WooCommerce Checkout, the advanced way.
|
@@ -135,6 +135,11 @@ Example:
|
|
135 |
|
136 |
== Changelog ==
|
137 |
|
|
|
|
|
|
|
|
|
|
|
138 |
= 4.2.1 =
|
139 |
* Fixed: PHP warning on Checkout screen (thanks @chefpanda123)
|
140 |
|
2 |
|
3 |
Contributors: visser, visser.labs, Emark
|
4 |
Donate link: https://www.visser.com.au/donations/
|
5 |
+
Tags: woocommerce, field manager, checkout editor, checkout field, shipping field, billing field, order field, additional field
|
6 |
Requires at least: 3.0
|
7 |
+
Tested up to: 4.9.6
|
8 |
+
Stable tag: 4.2.2
|
9 |
License: GPLv2 or later
|
10 |
|
11 |
Manages WooCommerce Checkout, the advanced way.
|
135 |
|
136 |
== Changelog ==
|
137 |
|
138 |
+
= 4.2.2 =
|
139 |
+
* Fixed: Missing Checkout fields from WooCheckout screen (thanks Laura)
|
140 |
+
* Changed: Compatibility with WooCommerce 3.4
|
141 |
+
* Fixed: Enable 24 hour time option not saving on WooCheckout screen
|
142 |
+
|
143 |
= 4.2.1 =
|
144 |
* Fixed: PHP warning on Checkout screen (thanks @chefpanda123)
|
145 |
|
woocommerce-checkout-manager.php
CHANGED
@@ -3,7 +3,7 @@
|
|
3 |
Plugin Name: WooCommerce Checkout Manager
|
4 |
Plugin URI: https://wordpress.org/plugins/woocommerce-checkout-manager/
|
5 |
Description: Manages WooCommerce Checkout, the advanced way.
|
6 |
-
Version: 4.2.
|
7 |
Author: Visser Labs
|
8 |
Author URI: http://www.visser.com.au
|
9 |
Contributors: visser, Emark
|
3 |
Plugin Name: WooCommerce Checkout Manager
|
4 |
Plugin URI: https://wordpress.org/plugins/woocommerce-checkout-manager/
|
5 |
Description: Manages WooCommerce Checkout, the advanced way.
|
6 |
+
Version: 4.2.2
|
7 |
Author: Visser Labs
|
8 |
Author URI: http://www.visser.com.au
|
9 |
Contributors: visser, Emark
|