Skip to content

Commit

Permalink
v4.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@Shivamddeveloper
Shivamddeveloper committed Apr 26, 2023
1 parent a2a7bba commit b193d72
Show file tree
Hide file tree
Showing 15 changed files with 105 additions and 65 deletions.
2 changes: 1 addition & 1 deletion admin/css/woo-refund-and-exchange-lite-admin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ select {
letter-spacing: 0.3px;
color: #2196f3;
flex: 0 0 100%;
max-width: calc(100% - 200px);
max-width: calc(100% - 250px);
}

.wps-form-group {
Expand Down
2 changes: 1 addition & 1 deletion admin/css/woo-refund-and-exchange-lite-admin.min.css
View file

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions admin/image/YouTube_32px.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions admin/partials/woo-refund-and-exchange-lite-admin-dashboard.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
<h1 class="wps-header-title"><?php echo esc_html( 'RETURN REFUND AND EXCHANGE FOR WOOCOMMERCE' ); ?></h1>
<a href="https://docs.wpswings.com/woocommerce-refund-and-exchange-lite/?utm_source=wpswings-rma-doc&utm_medium=rma-org-backend&utm_campaign=rma-doc/" target="_blank" class="wps-link"><?php esc_html_e( 'Documentation', 'woo-refund-and-exchange-lite' ); ?></a>
<span>|</span>
<a href="https://youtu.be/QyfzruqwnSM" target="_blank" class="wps-link"><?php esc_html_e( 'Video', 'woo-refund-and-exchange-lite' ); ?></a>
<span>|</span>
<a href="https://wpswings.com/submit-query/?utm_source=wpswings-rma-support&utm_medium=rma-org-backend&utm_campaign=support/" target="_blank" class="wps-link"><?php esc_html_e( 'Support', 'woo-refund-and-exchange-lite' ); ?></a>
</div>
</header>
Expand Down
20 changes: 10 additions & 10 deletions common/class-woo-refund-and-exchange-lite-common.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,16 +439,16 @@ public function wps_rma_standard_save_settings_filter() {
check_ajax_referer( 'ajax-nonce', 'nonce' );
unset( $_POST['action'] );
unset( $_POST['nonce'] );
$checked_refund = isset( $_POST['checkedRefund'] ) ? sanitize_text_field( wp_unslash( $_POST['checkedRefund'] ) ) : false;
$checked_order_msg = isset( $_POST['checkedOrderMsg'] ) ? sanitize_text_field( wp_unslash( $_POST['checkedOrderMsg'] ) ) : false;
$checked_order_msg_email = isset( $_POST['checkedOrderMsgEmail'] ) ? sanitize_text_field( wp_unslash( $_POST['checkedOrderMsgEmail'] ) ) : false;
$checked_exchange = isset( $_POST['checkedExchange'] ) ? sanitize_text_field( wp_unslash( $_POST['checkedExchange'] ) ) : false;
$checked_cancel = isset( $_POST['checkedCancel'] ) ? sanitize_text_field( wp_unslash( $_POST['checkedCancel'] ) ) : false;
$checked_cancel_prod = isset( $_POST['checkedCancelProd'] ) ? sanitize_text_field( wp_unslash( $_POST['checkedCancelProd'] ) ) : false;
$checked_wallet = isset( $_POST['checkedWallet'] ) ? sanitize_text_field( wp_unslash( $_POST['checkedWallet'] ) ) : false;
$checked_cod = isset( $_POST['checkedCOD'] ) ? sanitize_text_field( wp_unslash( $_POST['checkedCOD'] ) ) : false;
$checked_conset = isset( $_POST['consetCheck'] ) ? sanitize_text_field( wp_unslash( $_POST['consetCheck'] ) ) : false;
$checked_reset_license = isset( $_POST['checkedResetLicense'] ) ? sanitize_text_field( wp_unslash( $_POST['checkedResetLicense'] ) ) : false;
$checked_refund = isset( $_POST['checkedRefund'] ) ? 'true' === sanitize_text_field( wp_unslash( $_POST['checkedRefund'] ) ) : false;
$checked_order_msg = isset( $_POST['checkedOrderMsg'] ) ? 'true' === sanitize_text_field( wp_unslash( $_POST['checkedOrderMsg'] ) ) : false;
$checked_order_msg_email = isset( $_POST['checkedOrderMsgEmail'] ) ? 'true' === sanitize_text_field( wp_unslash( $_POST['checkedOrderMsgEmail'] ) ) : false;
$checked_exchange = isset( $_POST['checkedExchange'] ) ? 'true' === sanitize_text_field( wp_unslash( $_POST['checkedExchange'] ) ) : false;
$checked_cancel = isset( $_POST['checkedCancel'] ) ? 'true' === sanitize_text_field( wp_unslash( $_POST['checkedCancel'] ) ) : false;
$checked_cancel_prod = isset( $_POST['checkedCancelProd'] ) ? 'true' === sanitize_text_field( wp_unslash( $_POST['checkedCancelProd'] ) ) : false;
$checked_wallet = isset( $_POST['checkedWallet'] ) ? 'true' === sanitize_text_field( wp_unslash( $_POST['checkedWallet'] ) ) : false;
$checked_cod = isset( $_POST['checkedCOD'] ) ? 'true' === sanitize_text_field( wp_unslash( $_POST['checkedCOD'] ) ) : false;
$checked_conset = isset( $_POST['consetCheck'] ) ? 'true' === sanitize_text_field( wp_unslash( $_POST['consetCheck'] ) ) : false;
$checked_reset_license = isset( $_POST['checkedResetLicense'] ) ? 'true' === sanitize_text_field( wp_unslash( $_POST['checkedResetLicense'] ) ) : false;
$license_code = isset( $_POST['licenseCode'] ) ? sanitize_text_field( wp_unslash( $_POST['licenseCode'] ) ) : '';
if ( $checked_refund ) {
update_option( 'wps_rma_refund_enable', 'on' );
Expand Down
14 changes: 9 additions & 5 deletions common/partials/email_template/woo-refund-and-exchange-lite-refund-request-email.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@
$message = apply_filters( 'wps_rma_add_shipping_fee_tr', $message );
$message .= '</tbody>
</table>
</div>
<div class="Customer-detail">
<h4>' . esc_html__( 'Customer details', 'woo-refund-and-exchange-lite' ) . '</h4>
</div>';
$customer_details =
'<div class="Customer-detail"><h4>' . esc_html__( 'Customer details', 'woo-refund-and-exchange-lite' ) . '</h4>
<ul>
<li><p class="info">
<span class="bold">' . esc_html__( 'Email', 'woo-refund-and-exchange-lite' ) . ': </span>' . $order_obj->get_billing_email() . '
Expand All @@ -109,8 +109,12 @@
<h4>' . esc_html__( 'Billing Address', 'woo-refund-and-exchange-lite' ) . '</h4>
' . $order_obj->get_formatted_billing_address() . '
</div>
</div>
</div>';
</div>';
if ( apply_filters( 'wps_rma_visible_customer_details', true ) ) {
$message .= $customer_details;
}
$message = apply_filters( 'wps_rma_do_something_after_customer_details_email', $message, $order_id );
$message .= '</div>';
$attachment = array();
$to = get_option( 'woocommerce_email_from_address', get_option( 'admin_email' ) );
$admin_email = WC()->mailer()->emails['wps_rma_refund_request_email'];
Expand Down
4 changes: 2 additions & 2 deletions includes/woo-refund-and-exchange-lite-common-functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ function wps_rma_show_buttons( $func, $order ) {
}
}
}
$order_date = date_i18n( wc_date_format(), strtotime( $order->get_date_created() ) );
$today_date = date_i18n( wc_date_format() );
$order_date = date_i18n( 'y-m-d', strtotime( $order->get_date_created() ) );
$today_date = date_i18n( 'y-m-d' );
$order_date = apply_filters( 'wps_order_status_start_date', strtotime( $order_date ), $order );
$today_date = strtotime( $today_date );
$days = $today_date - $order_date;
Expand Down
Binary file modified languages/woo-refund-and-exchange-lite-en_US.mo
View file
Binary file not shown.
27 changes: 16 additions & 11 deletions languages/woo-refund-and-exchange-lite-en_US.po
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
msgid ""
msgstr ""
"Project-Id-Version: Return Refund and Exchange for WooCommerce 4.1.1\n"
"POT-Creation-Date: 2023-03-16 09:49+0530\n"
"PO-Revision-Date: 2023-03-16 09:51+0530\n"
"Last-Translator: \n"
"Project-Id-Version: Return Refund and Exchange for WooCommerce 4.1.2\n"
"POT-Creation-Date: 2023-04-25 19:30+0530\n"
"PO-Revision-Date: 2023-04-25 19:30+0530\n"
"Language-Team: WP Swings\n"
"Language: en_US\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 3.2.2\n"
"X-Generator: Poedit 2.3\n"
"X-Poedit-Basepath: ..\n"
"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-KeywordsList: __;_e;_n;_x;_ex;_nx;esc_attr__;esc_attr_e;esc_attr_x;"
"esc_html;esc_html__;esc_html_e;esc_html_x;_n_noop;_nx_noop;"
"translate_nooped_plural\n"
"Last-Translator: \n"
"Language: en_US\n"
"X-Poedit-SearchPath-0: .\n"
"X-Poedit-SearchPath-1: .\n"
"X-Poedit-SearchPathExcluded-0: build\n"
Expand Down Expand Up @@ -308,6 +308,11 @@ msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-admin-dashboard.php:54
#: woocommerce-refund-and-exchange-lite.php:192
msgid "Video"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-admin-dashboard.php:56
#: woocommerce-refund-and-exchange-lite.php:193
msgid "Support"
msgstr ""

Expand Down Expand Up @@ -1236,7 +1241,7 @@ msgstr ""
msgid "Submit Request"
msgstr ""

#: public/partials/wps-rma-refund-request-form.php:425
#: public/partials/wps-rma-refund-request-form.php:428
msgid "Refund Request Can't make on this order"
msgstr ""

Expand All @@ -1257,19 +1262,19 @@ msgstr ""
msgid "Demo"
msgstr ""

#: woocommerce-refund-and-exchange-lite.php:193
#: woocommerce-refund-and-exchange-lite.php:194
msgid "Services"
msgstr ""

#: woocommerce-refund-and-exchange-lite.php:212
#: woocommerce-refund-and-exchange-lite.php:213
msgid "GO PRO"
msgstr ""

#: woocommerce-refund-and-exchange-lite.php:214
#: woocommerce-refund-and-exchange-lite.php:215
msgid "Settings"
msgstr ""

#: woocommerce-refund-and-exchange-lite.php:245
#: woocommerce-refund-and-exchange-lite.php:246
msgid ""
"Woocommerce is not activated, Please activate Woocommerce first to install "
"WooCommerce Refund and Exchange Lite."
Expand Down
Empty file modified languages/woo-refund-and-exchange-lite.mo
100644 → 100755
View file
Empty file.
21 changes: 13 additions & 8 deletions languages/woo-refund-and-exchange-lite.pot
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Return Refund and Exchange for WooCommerce 4.1.1\n"
"POT-Creation-Date: 2023-03-16 09:49+0530\n"
"Project-Id-Version: Return Refund and Exchange for WooCommerce 4.1.2\n"
"POT-Creation-Date: 2023-04-25 19:30+0530\n"
"PO-Revision-Date: 2022-07-05 13:57+0530\n"
"Last-Translator: \n"
"Language-Team: WP Swings\n"
Expand All @@ -11,7 +11,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 3.2.2\n"
"X-Generator: Poedit 2.3\n"
"X-Poedit-Basepath: ..\n"
"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-KeywordsList: __;_e;_n;_x;_ex;_nx;esc_attr__;esc_attr_e;esc_attr_x;"
Expand Down Expand Up @@ -309,6 +309,11 @@ msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-admin-dashboard.php:54
#: woocommerce-refund-and-exchange-lite.php:192
msgid "Video"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-admin-dashboard.php:56
#: woocommerce-refund-and-exchange-lite.php:193
msgid "Support"
msgstr ""

Expand Down Expand Up @@ -1237,7 +1242,7 @@ msgstr ""
msgid "Submit Request"
msgstr ""

#: public/partials/wps-rma-refund-request-form.php:425
#: public/partials/wps-rma-refund-request-form.php:428
msgid "Refund Request Can't make on this order"
msgstr ""

Expand All @@ -1258,19 +1263,19 @@ msgstr ""
msgid "Demo"
msgstr ""

#: woocommerce-refund-and-exchange-lite.php:193
#: woocommerce-refund-and-exchange-lite.php:194
msgid "Services"
msgstr ""

#: woocommerce-refund-and-exchange-lite.php:212
#: woocommerce-refund-and-exchange-lite.php:213
msgid "GO PRO"
msgstr ""

#: woocommerce-refund-and-exchange-lite.php:214
#: woocommerce-refund-and-exchange-lite.php:215
msgid "Settings"
msgstr ""

#: woocommerce-refund-and-exchange-lite.php:245
#: woocommerce-refund-and-exchange-lite.php:246
msgid ""
"Woocommerce is not activated, Please activate Woocommerce first to install "
"WooCommerce Refund and Exchange Lite."
Expand Down
14 changes: 6 additions & 8 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion public/partials/wps-rma-refund-request-form.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,10 @@
</div>
<div class="wps_rma_customer_detail">
<?php
wc_get_template( 'order/order-details-customer.php', array( 'order' => $order_obj ) );
if ( apply_filters( 'wps_rma_visible_customer_details', true ) ) {
wc_get_template( 'order/order-details-customer.php', array( 'order' => $order_obj ) );
}
do_action( 'wps_rma_do_something_after_customer_details', $order_id );
?>
</div>
</div>
Expand Down
24 changes: 14 additions & 10 deletions readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ Contributors: wpswings
Donate link: https://wpswings.com/
Tags: return, rma plugin, product return system, woocommerce, warranty
Requires at least: 5.5.0
Tested up to: 6.1.1
Tested up to: 6.2.0
WC requires at least: 5.5.0
WC tested up to: 7.5.0
Stable tag: 4.1.1
WC tested up to: 7.6.0
Stable tag: 4.1.2
Requires PHP: 7.2 or Higher
License: GPLv3 or later
License URI: http://www.gnu.org/licenses/gpl-3.0.html
Expand Down Expand Up @@ -107,8 +107,10 @@ Visit [**Return Refund and Exchange For WooCommerce Documentation**](https://doc

== TAKE ADVANTAGE OF EXCLUSIVE FEATURES OF WOOCOMMERCE RMA PLUGIN ==

[**RMA Return Refund & Exchange For WooCommerce Pro**](https://wpswings.com/product/rma-return-refund-exchange-for-woocommerce-pro/?utm_source=wpswings-rma-pro&utm_medium=rma-org-page&utm_campaign=premium-plugin)
>[**RMA Return Refund & Exchange For WooCommerce Pro**](https://wpswings.com/product/rma-return-refund-exchange-for-woocommerce-pro/?utm_source=wpswings-rma-pro&utm_medium=rma-org-page&utm_campaign=premium-plugin)

**See what No 44 Store is saying about the WooCommerce RMA Pro Plugin:**
>“Great product for Managing and Dealing with Exchange/Refund Requests.” [**See WooCommerce Refund & Exchange Pro Plugin Case Study**](https://wpswings.com/case-studies/no44store/?utm_source=wpswings-rma-casestudy&utm_medium=rma-org-page&utm_campaign=no44-casestudy)
== DOCUMENTATION OF PREMIUM VERSION ==

[**RMA Return Refund and Exchange for WooCommerce Pro Documentation**](https://docs.wpswings.com/rma-return-refund-exchange-for-woocommerce-pro/?utm_source=wpswings-rma-doc&utm_medium=rma-org-page&utm_campaign=rma-pro-doc)
Expand Down Expand Up @@ -219,7 +221,11 @@ Please visit [**WP Swings Knowledge Base**](https://support.wpswings.com/wordpre

== Changelog ==

= 4.1.1 - Released on 16 March 2023 =
= 4.1.2 - Released on 26 April 2023 =
* New: Compatibility with the Latest WC (6.2.0) and WP (7.6.0)
* Fix: Plugin Stability

= 4.1.1 - Released on 17 March 2023 =
* New: Compatibility with the Latest WC (6.1.1) and WP (7.5.0)
* Fix: RMA Policies for Tax Handling
* Fix: Price on Refund Form based on the Coupon Functionality
Expand Down Expand Up @@ -364,10 +370,8 @@ Please visit [**WP Swings Knowledge Base**](https://support.wpswings.com/wordpre

== Upgrade Notice ==

= 4.1.1 - Released on 16 March 2023 =
* New: Compatibility with the Latest WC (6.1.1) and WP (7.5.0)
* Fix: RMA Policies for Tax Handling
* Fix: Price on Refund Form based on the Coupon Functionality

= 4.1.2 - Released on 26 April 2023 =
* New: Compatibility with the Latest WC (6.2.0) and WP (7.6.0)
* Fix: Plugin Stability


Loading

0 comments on commit b193d72

Please sign in to comment.