From 8013aeaa5b52b018f611b044f395c4906ffefb00 Mon Sep 17 00:00:00 2001 From: Dennis Nissle Date: Fri, 14 Apr 2017 14:28:05 +0200 Subject: [PATCH] 1.8.9 Settings Update --- assets/css/woocommerce-gzd-activation.css | 5 ++- assets/css/woocommerce-gzd-activation.min.css | 2 +- assets/js/add-to-cart-variation.js | 1 + .../class-wc-gzd-settings-germanized.php | 2 +- includes/class-wc-gzd-install.php | 3 +- .../updates/woocommerce-gzd-update-1.8.9.php | 36 +++++++++++++++++++ readme.txt | 12 ++++++- 7 files changed, 56 insertions(+), 5 deletions(-) create mode 100644 includes/updates/woocommerce-gzd-update-1.8.9.php diff --git a/assets/css/woocommerce-gzd-activation.css b/assets/css/woocommerce-gzd-activation.css index 2876512b1..c33df8f68 100644 --- a/assets/css/woocommerce-gzd-activation.css +++ b/assets/css/woocommerce-gzd-activation.css @@ -121,6 +121,9 @@ p.wc-gzd-actions a.button-primary:hover, .woocommerce-gzd-message .button-primar .woocommerce-gzd-message a.wc-gzd-skip { opacity: .7; } -.woocommerce-gzd-message { +div.woocommerce-gzd-message { border-left: 4px solid #bb2525 !important; +} +div.woocommerce-gzd-message p { + max-width: 100% !important; } \ No newline at end of file diff --git a/assets/css/woocommerce-gzd-activation.min.css b/assets/css/woocommerce-gzd-activation.min.css index 7aed74c36..95096d33e 100644 --- a/assets/css/woocommerce-gzd-activation.min.css +++ b/assets/css/woocommerce-gzd-activation.min.css @@ -1 +1 @@ -.vendipro-buttons a,.vendipro-buttons p,.wc-gzd-fb,.wc-gzd-fb iframe,.wc-gzd-twitter{display:inline-block}.wc-gzd-fb iframe{position:relative;top:5px}.wc-gzd-news .wc-feature>div{float:left;margin-right:0}.wc-gzd-news .three-col>div{width:31%;padding-right:3%}.wc-gzd-news .two-col>div{width:47.5%;padding-right:5%}.wc-gzd-news .wc-feature>div.last-feature{padding-right:0}.wc-gzd-logo{display:inline-block!important;text-indent:-9999px;width:298px;vertical-align:top;margin-top:2rem;height:89px;background:url(../images/wc-germanized.svg) no-repeat;background-size:298px auto}.about-text,.dashboard_page_wc-gzd-about .vendipro .left,.vendipro-buttons a,.vendipro-buttons p,.wc-gzd-fb,.wc-gzd-fb iframe,.wc-gzd-twitter{display:inline-block}.about-text{padding:0;max-width:50%;width:50%;margin:2rem 0 0 5%}.wc-gzd-twitter iframe{width:130px!important}.dashboard_page_wc-gzd-about h1{width:100%;margin-right:0}.dashboard_page_wc-gzd-about h3 .wc-gzd-pro{font-size:.7em;margin-left:1em}.dashboard_page_wc-gzd-about .wc-vendipro-features{margin-top:0;border:none;padding-bottom:15px}.dashboard_page_wc-gzd-about .wc-vendipro-features div h4{margin-top:.5em;font-size:1.1em;line-height:1.1em}.vendipro-buttons p{font-size:.8em;padding-top:3px;margin:0 0 0 5px}.dashboard_page_wc-gzd-about .changelog{margin-top:3em;border-top:1px solid #CCC;padding-top:0}.dashboard_page_wc-gzd-about .feature-section{border:none}.dashboard_page_wc-gzd-about .vendipro .left{width:40%;padding-right:2em;vertical-align:top}.dashboard_page_wc-gzd-about .vendipro .right{display:inline-block;vertical-align:top;width:50%}.dashboard_page_wc-gzd-about .vendipro .right p:first-child{margin-top:5px}.dashboard_page_wc-gzd-about .vendipro .left img{width:100%;border:1px solid #CCC;border-radius:3px}.woocommerce-gzd-message .button-primary,p.wc-gzd-actions a.button-primary{background-color:#262626!important;border:1px solid #000!important;text-shadow:none!important}.woocommerce-gzd-message .button-primary:hover,p.wc-gzd-actions a.button-primary:hover{background-color:#363636!important;border:1px solid #000!important;text-shadow:none!important}.woocommerce-gzd-message .form-table tr td,.woocommerce-gzd-message .form-table tr th{padding:.7rem 0;margin:0}.woocommerce-gzd-message a.wc-gzd-skip{opacity:.7}.woocommerce-gzd-message{border-left:4px solid #bb2525!important} \ No newline at end of file +.vendipro-buttons a,.vendipro-buttons p,.wc-gzd-fb,.wc-gzd-fb iframe,.wc-gzd-twitter{display:inline-block}div.woocommerce-gzd-message{border-left:4px solid #bb2525!important}div.woocommerce-gzd-message p{max-width:100%!important}.wc-gzd-fb iframe{position:relative;top:5px}.wc-gzd-news .wc-feature>div{float:left;margin-right:0}.wc-gzd-news .three-col>div{width:31%;padding-right:3%}.wc-gzd-news .two-col>div{width:47.5%;padding-right:5%}.wc-gzd-news .wc-feature>div.last-feature{padding-right:0}.wc-gzd-logo{display:inline-block!important;text-indent:-9999px;width:298px;vertical-align:top;margin-top:2rem;height:89px;background:url(../images/wc-germanized.svg) no-repeat;background-size:298px auto}.about-text,.dashboard_page_wc-gzd-about .vendipro .left,.vendipro-buttons a,.vendipro-buttons p,.wc-gzd-fb,.wc-gzd-fb iframe,.wc-gzd-twitter{display:inline-block}.about-text{padding:0;max-width:50%;width:50%;margin:2rem 0 0 5%}.wc-gzd-twitter iframe{width:130px!important}.dashboard_page_wc-gzd-about h1{width:100%;margin-right:0}.dashboard_page_wc-gzd-about h3 .wc-gzd-pro{font-size:.7em;margin-left:1em}.dashboard_page_wc-gzd-about .wc-vendipro-features{margin-top:0;border:none;padding-bottom:15px}.dashboard_page_wc-gzd-about .wc-vendipro-features div h4{margin-top:.5em;font-size:1.1em;line-height:1.1em}.vendipro-buttons p{font-size:.8em;padding-top:3px;margin:0 0 0 5px}.dashboard_page_wc-gzd-about .changelog{margin-top:3em;border-top:1px solid #CCC;padding-top:0}.dashboard_page_wc-gzd-about .feature-section{border:none}.dashboard_page_wc-gzd-about .vendipro .left{width:40%;padding-right:2em;vertical-align:top}.dashboard_page_wc-gzd-about .vendipro .right{display:inline-block;vertical-align:top;width:50%}.dashboard_page_wc-gzd-about .vendipro .right p:first-child{margin-top:5px}.dashboard_page_wc-gzd-about .vendipro .left img{width:100%;border:1px solid #CCC;border-radius:3px}.woocommerce-gzd-message .button-primary,p.wc-gzd-actions a.button-primary{background-color:#262626!important;border:1px solid #000!important;text-shadow:none!important}.woocommerce-gzd-message .button-primary:hover,p.wc-gzd-actions a.button-primary:hover{background-color:#363636!important;border:1px solid #000!important;text-shadow:none!important}.woocommerce-gzd-message .form-table tr td,.woocommerce-gzd-message .form-table tr th{padding:.7rem 0;margin:0}.woocommerce-gzd-message a.wc-gzd-skip{opacity:.7}.woocommerce-gzd-message{border-left:4px solid #bb2525!important} \ No newline at end of file diff --git a/assets/js/add-to-cart-variation.js b/assets/js/add-to-cart-variation.js index cf84b8ebb..862c5379b 100644 --- a/assets/js/add-to-cart-variation.js +++ b/assets/js/add-to-cart-variation.js @@ -27,6 +27,7 @@ if ( $wrapper.find('.org_product_units').length > 0 ) { $wrapper.find('.product-units:first' ).html( $wrapper.find('.org_product_units').html() ).removeClass('variation_modified').show(); } + $('.org_product_info').remove(); $('.variation_modified').remove(); }; diff --git a/includes/admin/settings/class-wc-gzd-settings-germanized.php b/includes/admin/settings/class-wc-gzd-settings-germanized.php index 3a45084cf..dee4909cf 100644 --- a/includes/admin/settings/class-wc-gzd-settings-germanized.php +++ b/includes/admin/settings/class-wc-gzd-settings-germanized.php @@ -1162,7 +1162,7 @@ public function get_display_settings() { 'desc' => __( 'Select shipping methods which are applicable for the Opt-In Checkbox.', 'woocommerce-germanized' ), 'desc_tip' => true, 'id' => 'woocommerce_gzd_checkout_legal_parcel_delivery_checkbox_methods', - 'default' => array( 'downloadable' ), + 'default' => array(), 'class' => 'chosen_select', 'options' => $shipping_methods_options, 'type' => 'multiselect', diff --git a/includes/class-wc-gzd-install.php b/includes/class-wc-gzd-install.php index 95fa10e4b..e165da7ff 100644 --- a/includes/class-wc-gzd-install.php +++ b/includes/class-wc-gzd-install.php @@ -21,7 +21,8 @@ class WC_GZD_Install { '1.5.0' => 'updates/woocommerce-gzd-update-1.5.0.php', '1.6.0' => 'updates/woocommerce-gzd-update-1.6.0.php', '1.6.3' => 'updates/woocommerce-gzd-update-1.6.3.php', - '1.8.0' => 'updates/woocommerce-gzd-update-1.8.0.php' + '1.8.0' => 'updates/woocommerce-gzd-update-1.8.0.php', + '1.8.9' => 'updates/woocommerce-gzd-update-1.8.9.php' ); /** diff --git a/includes/updates/woocommerce-gzd-update-1.8.9.php b/includes/updates/woocommerce-gzd-update-1.8.9.php new file mode 100644 index 000000000..bf6a9a3d0 --- /dev/null +++ b/includes/updates/woocommerce-gzd-update-1.8.9.php @@ -0,0 +1,36 @@ +get_shipping_method_instances_options(); + $new_options = array(); + + if ( ! empty( $parcel_settings ) ) { + foreach ( (array) $parcel_settings as $method ) { + + if ( 'downloadable' === $method ) { + continue; + } + + foreach ( $shipping_methods_options as $key => $option ) { + $key_method = explode( ':', $key ); + + if ( isset( $key_method[0] ) && $key_method[0] == $method ) { + array_push( $new_options, $key ); + } + } + } + } + + update_option( 'woocommerce_gzd_checkout_legal_parcel_delivery_checkbox_methods', $new_options ); + +} + +?> \ No newline at end of file diff --git a/readme.txt b/readme.txt index 0b160aec1..c8b98d550 100644 --- a/readme.txt +++ b/readme.txt @@ -3,7 +3,7 @@ Contributors: vendidero Tags: woocommerce, german market, german, germany, deutsch, deutschland, de, de_DE, shop, commerce, e-commerce, ecommerce, woothemes, sepa, invoice Requires at least: 3.8 Tested up to: 4.7 -Stable tag: 1.8.8 +Stable tag: 1.8.9 License: GPLv3 License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -167,6 +167,16 @@ Bug reports may be filed via our [GitHub repository](https://github.com/vendider == Changelog == += 1.8.9 = +* Feature - Allow DHL parcel shop delivery for certain shipping rates only +* Improvement - woocommerce_gzd_add_to_cart_variation_params filter to adjust wrapper name +* Improvement - better shipping rate choosing options (choose instances instead of methods) for parcel delivery checkbox +* Fix - Double Opt In WooCommerce 3.0 +* Fix - Use get_rate_code for order item totals +* Fix - WooCommerce 3.0 stock reducing +* Fix - Order Item Meta CRUD - better product instance check +* Fix - Disable Paid for Order Email for direct debit and invoice gateway + = 1.8.8 = * Feature - Better product data saving * Feature - Allow setting a custom Small Business notice text