Skip to content

Commit

Permalink
Update Version Prepare 1.4.5
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielRiera committed Jun 5, 2024
1 parent 7e568f1 commit 44494de
Show file tree
Hide file tree
Showing 15 changed files with 659 additions and 399 deletions.
21 changes: 18 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ Contributors: DanielRiera
Donate link: https://www.paypal.com/donate/?hosted_button_id=EZ67DG78KMXWQ
Tags: estimated delivery, delivery woocommerce, shipping date
Requires at least: 4.3
Tested up to: 6.5.3
Tested up to: 6.5.4
Requires PHP: 5.0
Stable tag: 1.4.3
Licence: GPLv2 or later
Stable tag: 1.4.5
License: GPLv3
License URI: https://www.gnu.org/licenses/gpl-3.0.html

Show estimated / guaranteed delivery, simple and easy

== Description ==
Expand Down Expand Up @@ -43,11 +45,24 @@ Do you need more options or report a issue?

== FAQ ==

= Report Issues =
If you need support open a new ticket on [Github](https://github.com/DanielRiera/estimated-delivery-woocommerce/issues)

= FontAwesome =
The plugin can add Fontawesome Library if is need

= Icon config =




== Changelog ==

= 1.4.5 =
* Add Icon support.
* Add library Fontawesome 6.5.2 if is need.
* Fix Import CSV product Overwrite.

= 1.4.3 =
* Fix error with dates, the date show is only today.

Expand Down
17 changes: 11 additions & 6 deletions estimated-delivery-woocommerce.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,23 @@
* Short Description: Show estimated / guaranteed delivery, simple and easy
* Author: Daniel Riera
* Author URI: https://danielriera.net
* Version: 1.4.3
* Version: 1.4.5
* Text Domain: estimated-delivery-for-woocommerce
* Domain Path: /languages
* WC requires at least: 3.0
* WC tested up to: 8.8.3
* Required WP: 5.0
* Tested WP: 6.3.2
* Licence: GPLv2 or later
* Tested WP: 6.5.4
* License: GPLv3
* License URI: https://www.gnu.org/licenses/gpl-3.0.html
*/
if(!defined('ABSPATH')) { exit; }

define('EDW_PATH', dirname(__FILE__).'/');
define('EDW_POSITION_SHOW', get_option('_edw_position', 'woocommerce_after_add_to_cart_button'));
define('EDW_USE_JS', get_option('_edw_cache', '0'));
define('EDW_Fontawesome', get_option('_edw_fontawesome', '0'));
define('EDW_Version', '1.4.3');
define('EDW_Version', '1.4.5');

require_once EDW_PATH . 'class.api.php';

Expand Down Expand Up @@ -379,9 +380,9 @@ function edw_show_message($productParam = false, $separed = false){
}

if($productActive == '1') {
$mode = get_post_meta($product_id,'_edw_mode', true);
$mode = get_post_meta($product_id,'_edw_mode', true) || '1';
}else{
$mode = get_option('_edw_mode');
$mode = get_option('_edw_mode', '1');
}


Expand Down Expand Up @@ -454,6 +455,10 @@ function edw_show_message($productParam = false, $separed = false){
}
}

//Prevent default
$maxDays = intval($maxDays);
$disabledDays = $disabledDays ?: [];

$today = wp_date('Y-m-d');
$minDate = $this->edw_get_working_day_date($disabledDays, $days, $today);
if($minDate) {
Expand Down
Binary file modified languages/estimated-delivery-for-woocommerce-es_ES.mo
Binary file not shown.
Loading

0 comments on commit 44494de

Please sign in to comment.