Skip to content

Commit

Permalink
Resolved the conflict with release branch
Browse files Browse the repository at this point in the history
  • Loading branch information
creedally-dev committed Feb 6, 2023
2 parents 751a8b0 + 60425cb commit c60be67
Show file tree
Hide file tree
Showing 46 changed files with 12,224 additions and 10,719 deletions.
60 changes: 58 additions & 2 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Contributors: angelleye
Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=T962XWAC2HHZN
Tags: woocommerce, offers, negotiation
Requires at least: 5.5
Tested up to: 5.7.2
Stable tag: 2.3.5
Tested up to: 6.1.1
Stable tag: 2.3.22
License: GPLv3
License URI: http://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -118,6 +118,62 @@ Automatic updates should work great for you. As always, though, we recommend ba

== Changelog ==

= 2.3.22 - 01.09.2023 =
* Fix - Resolves issue with Offer notes field.([OFW-273](https://github.com/angelleye/offers-for-woocommerce/pull/499))

= 2.3.21 - 12.21.2022 =
* Fix - Resolves conflict with Yoast SEO.([OFW-266](https://github.com/angelleye/offers-for-woocommerce/pull/497))

= 2.3.20 - 11.16.2022 =
* Feature - Adds expiration countdown to My Account - Offers page. ([OFW-265](https://github.com/angelleye/offers-for-woocommerce/pull/498))

= 2.3.19 - 11.15.2022 =
* Feature - Adds options for sending email drip reminders based on merchant configuration. ([OFW-269](https://github.com/angelleye/offers-for-woocommerce/pull/496))

= 2.3.18 - 07.01.2022 =
* Tweak - Remove PayPal Lib. ([OFW-248](https://github.com/angelleye/offers-for-woocommerce/pull/487))

= 2.3.17 - 05.19.2022 =
* Tweak - Display offer button for empty product price. ([OFW-263](https://github.com/angelleye/offers-for-woocommerce/pull/495))
* Fix - Resolves a PHP notice. ([OFW-256](https://github.com/angelleye/offers-for-woocommerce/pull/494))


= 2.3.16 - 03.07.2022 =
* Feature - Adds Advanced Dynamic Pricing for WooCommerce (Pro) Compatibility. ([OFW-252](https://github.com/angelleye/offers-for-woocommerce/pull/493))

= 2.3.15 - 03.04.2022 =
* Fix - Resolves display_post_states filter issue. ([OFW-254](https://github.com/angelleye/offers-for-woocommerce/pull/492))

= 2.3.14 - 01.10.2022 =
* Tweak - Resolves PHP fatal error when WC plugin is not active. ([OFW-244](https://github.com/angelleye/offers-for-woocommerce/pull/486))

= 2.3.13 - 12.31.2021 =
* Feature - Adds WooCommerce Dynamic Pricing & Discounts Compatibility. ([OFW-195](https://github.com/angelleye/offers-for-woocommerce/pull/485))

= 2.3.12 - 11.24.2021 =
* Feature - Adds hooks and Adjustment Text and Menu Related Changes. ([OFW-242](https://github.com/angelleye/offers-for-woocommerce/pull/484))

= 2.3.11 - 18.10.2021 =
* Feature - Adds Google reCAPTCHA V3 Integration.
* Tweak - OFW button only display for simple and variable product. ([OFW-238](https://github.com/angelleye/offers-for-woocommerce/pull/482))
* Fix - Resolves Subtotal Incorrect issue for Accepted Offer Email Notice. ([OFW-195](https://github.com/angelleye/offers-for-woocommerce/pull/483))

= 2.3.10 - 08.30.2021 =
* Fix - Resolves a PHP notice. ([OFW-235](https://github.com/angelleye/offers-for-woocommerce/pull/480))

= 2.3.9 - 08.27.2021 =
* Fix - Resolves Woo Extra Product Options Compatibility issue. ([OFW-181](https://github.com/angelleye/offers-for-woocommerce/pull/479))

= 2.3.8 - 08.23.2021 =
* Tweak - Update Plugin version.

= 2.3.7 - 08.23.2021 =
* Feature - Additional hooks added in plugin. ([OFW-159](https://github.com/angelleye/offers-for-woocommerce/pull/477))

= 2.3.6 - 08.12.2021 =
* Feature - Additional hooks added in plugin. ([OFW-232](https://github.com/angelleye/offers-for-woocommerce/pull/470))
* Fix - property ‘post_type’ of no-object ([OFW-233](https://github.com/angelleye/offers-for-woocommerce/pull/471))

= 2.3.5 - 06.14.2021 =
* Fix - Auctions for WooCommerce Compatibility compatibility. ([OFW-216](https://github.com/angelleye/offers-for-woocommerce/pull/469))

Expand Down
1 change: 1 addition & 0 deletions admin/assets/css/jquery.datetimepicker.min.css

Large diffs are not rendered by default.

82 changes: 82 additions & 0 deletions admin/assets/css/offers-for-woocommerce-admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,86 @@
#angelleye_offer_for_woocommerce_extra_option thead tr th {
color: #32373c !important;
background: #f8f8f8;
}
.toggler-switch{
position: relative;
display: inline-block;
width: 60px;
height: 34px;
}
.toggler-switch input {
opacity: 0;
width: 0;
height: 0;
}
.er-toggler {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: #ccc;
-webkit-transition: .4s;
transition: .4s;
border-radius: 34px;
}
.er-toggler:before {
position: absolute;
content: "";
height: 26px;
width: 26px;
left: 4px;
bottom: 4px;
background-color: white;
-webkit-transition: .4s;
transition: .4s;
}
.toggler-switch input:checked + .er-toggler {
background-color: #2196F3;
}
input:focus + .er-toggler {
box-shadow: 0 0 1px #2196F3;
}
#ofw_email_reminders_options_form .er-toggler:before {
border-radius: 50%;
}
input:checked + .er-toggler:before {
-webkit-transform: translateX(26px);
-ms-transform: translateX(26px);
transform: translateX(26px);
}
#ofw_email_reminders_options_form .select2-search__field,#ofw_template_name, #ofw_email_subject{
width:100%;
}
.select2-container{
z-index: 1;
}
ul.select2-results__options{
background-color: white;
padding:10px;
border-radius: 2px;
}
li.select2-selection__choice{
background-color: white;
border-radius: 10px;
margin: 5px 10px;
}
#ofw_email_reminders_options_form select.wc-product-search.select2-hidden-accessible.enhanced{
display: none;
}
#ofw_send_test_email{
width: 100%;
margin: 0 0 5px 0;
}
.add-new-template{
margin:5px!important;
}
#ofw_email_reminders_options_form .btn-cont {
display: flex;
flex-direction: row;
margin: 10px 0;
}
.form-field .required-warning {
color: red;
}
50 changes: 49 additions & 1 deletion admin/assets/js/admin-settings-scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,55 @@
}
});
$( "#angelleye-settings-ul-checkboxes-sortable" ).disableSelection();

$('#ofw_enable_recaptcha').change(function(){
if ($(this).is(':checked')) {
$('#ofw_recaptcha_version').show();
$('#ofw_recaptcha_version').closest('tr').show();
if ($('#ofw_recaptcha_version').val() === 'v3') {
$('#ofw_recaptcha_site_key').hide();
$('#ofw_recaptcha_site_key').closest('tr').hide();
$('#ofw_recaptcha_secret_key').hide();
$('#ofw_recaptcha_secret_key').closest('tr').hide();
$('#ofw_recaptcha_site_key_v3').show();
$('#ofw_recaptcha_site_key_v3').closest('tr').show();
$('#ofw_recaptcha_secret_key_v3').show();
$('#ofw_recaptcha_secret_key_v3').closest('tr').show();
} else {
$('#ofw_recaptcha_site_key').show();
$('#ofw_recaptcha_site_key').closest('tr').show();
$('#ofw_recaptcha_secret_key').show();
$('#ofw_recaptcha_secret_key').closest('tr').show();
$('#ofw_recaptcha_site_key_v3').hide();
$('#ofw_recaptcha_site_key_v3').closest('tr').hide();
$('#ofw_recaptcha_secret_key_v3').hide();
$('#ofw_recaptcha_secret_key_v3').closest('tr').hide();
}
} else {
$('.angelleye_g_captch').hide();
$('.angelleye_g_captch').closest('tr').hide();
}
}).change();
$('#ofw_recaptcha_version').change(function () {
if ($(this).val() === 'v3') {
$('#ofw_recaptcha_site_key').hide();
$('#ofw_recaptcha_site_key').closest('tr').hide();
$('#ofw_recaptcha_secret_key').hide();
$('#ofw_recaptcha_secret_key').closest('tr').hide();
$('#ofw_recaptcha_site_key_v3').show();
$('#ofw_recaptcha_site_key_v3').closest('tr').show();
$('#ofw_recaptcha_secret_key_v3').show();
$('#ofw_recaptcha_secret_key_v3').closest('tr').show();
} else {
$('#ofw_recaptcha_site_key').show();
$('#ofw_recaptcha_site_key').closest('tr').show();
$('#ofw_recaptcha_secret_key').show();
$('#ofw_recaptcha_secret_key').closest('tr').show();
$('#ofw_recaptcha_site_key_v3').hide();
$('#ofw_recaptcha_site_key_v3').closest('tr').hide();
$('#ofw_recaptcha_secret_key_v3').hide();
$('#ofw_recaptcha_secret_key_v3').closest('tr').hide();
}
}).change();
});
});

Expand Down
68 changes: 68 additions & 0 deletions admin/assets/js/admin-settings-test-email-scripts.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
jQuery(document).ready(function($){

$('#ofw_preview_email').click(function (){

let email_body = '';
$('#mail_response_msg').html("");
if (
jQuery( '#wp-ofw_email_body-wrap' ).hasClass( 'tmce-active' )
) {
email_body = tinyMCE.get( 'ofw_email_body' ).getContent();
} else {
email_body = jQuery( '#ofw_email_body' ).val();
}

const email_subject = $( '#ofw_email_subject' ).val();
const email_send_to = $( '#ofw_send_test_email' ).val();
const wp_nonce = $( '#email_reminder_nonce' ).val();

const data = {
email_subject,
email_body,
email_send_to,
action: 'ofw_er_preview_email_send',
security: wp_nonce,
};
jQuery.ajax({
url: ajaxurl,
type: 'POST',
data: data,
}).done(function (data) {
if (data.status) {
$('#mail_response_msg').html( messagehtml(data.message, true) );
}
});


});

$('#ofw_template_name').keyup(function (){
var textval = $('#ofw_template_name').val();
if( textval !== undefined && textval !== "" ){
$('#ofw_template_name').val(textval.replace(/[^a-zA-Z0-9 ]/g, ""));
}
});
$('#ofw_email_frequency_unit').change(function (){
switch ($('#ofw_email_frequency_unit').val()){
case 'day':
$('#ofw_email_frequency').attr("max" , 364);
$('#ofw_email_frequency').attr("min" , 1);
break;
case 'minute':
$('#ofw_email_frequency').attr("max",59);
$('#ofw_email_frequency').attr("min",1);
break;
case 'hour':
$('#ofw_email_frequency').attr("max",23);
$('#ofw_email_frequency').attr("min",1);
break;
}
})
});

function messagehtml( message, success = true ){
if( success ){
var message = '<div id="message" class="updated notice is-dismissible"><p>'+ message +'</p></div>';
}
return message;
}
26 changes: 20 additions & 6 deletions admin/assets/js/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,20 @@
*/

var currentDate = new Date();
$('.datepicker').datepicker({
minDate: currentDate
$('.datepicker').datetimepicker({
minDate: currentDate,
format: 'M d, Y H:i'
});

$('#meta-box-offers-submit').click(function(){
var theDate = new Date(Date.parse($('.datepicker').datepicker('getDate')));
$('#meta-box-offers-submit').click(function(){
var theDate = new Date(Date.parse($('.datepicker').datetimepicker('getValue')));
if (theDate == 'Invalid Date')
{
$("#offer_expiration_date_hidden").val('');
}
else{
var dateFormatted = $.datepicker.formatDate('yy-mm-dd', theDate);
$("#offer_expiration_date_hidden").val(dateFormatted);
var dateFormatted = customDateFormat(theDate);
$("#offer_expiration_date_hidden").val(dateFormatted);
}
});

Expand Down Expand Up @@ -301,3 +302,16 @@
});
}(jQuery));

function customDateFormat( dateobj = new Date() ){

var year = dateobj.getFullYear();
var month = ("0" + (dateobj.getMonth() + 1)).slice(-2);
var date = ("0" + dateobj.getDate()).slice(-2);
var hours = ("0" + dateobj.getHours()).slice(-2);
var minutes = ("0" + dateobj.getMinutes()).slice(-2);

var full_date = year + '-' + month + '-' + date + ' ' + hours + ':' + minutes;

return full_date;

}
1 change: 1 addition & 0 deletions admin/assets/js/jquery.datetimepicker.full.min.js

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions admin/assets/js/offers-for-woocommerce-admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@ jQuery(function ($) {
notify_wordpress(jQuery(this).data("msg"));
});

jQuery("#enable_binding_offer_authorization").change(function () {
if (jQuery(this).is(':checked')) {
jQuery('#enable_make_offer_payment_authorization').closest('tr').show();
} else{
jQuery('#enable_make_offer_payment_authorization').closest('tr').hide();
}
}).change();
});

function notify_wordpress(message) {
Expand Down
Loading

0 comments on commit c60be67

Please sign in to comment.