Merge pull request #139 from wpswings/v4.4.3

V4.4.3
wpswings · Oct 25, 2024 · d3c8fb0 · d3c8fb0
2 parents 2e34ae9 + f6ae474
commit d3c8fb0
Show file tree

Hide file tree

Showing 21 changed files with 23,052 additions and 13,365 deletions.
diff --git a/admin/js/woo-refund-and-exchange-lite-admin.js b/admin/js/woo-refund-and-exchange-lite-admin.js
@@ -20,9 +20,7 @@ jQuery(document).ready(function() {
         },
     });
 });
-
-jQuery(document).ready(function() {
-	$ = jQuery;
+jQuery(function($){
 
 	const MDCText = mdc.textField.MDCTextField;
 	const textField = [].map.call(

diff --git a/admin/js/woo-refund-and-exchange-lite-admin.min.js b/admin/js/woo-refund-and-exchange-lite-admin.min.js
diff --git a/admin/partials/woo-refund-and-exchange-lite-return-meta.php b/admin/partials/woo-refund-and-exchange-lite-return-meta.php
@@ -103,7 +103,7 @@
 					$wps_wrna_all_product_checked = wps_rma_get_meta_data( $order_id, 'wps_wrna_all_product_checked', true );
 					if ( ( empty( $pro_active ) && 'on' == $wps_rma_allow_refund_shipping_charge ) || ( 1 == $wps_wrna_all_product_checked && 'on' == $wps_rma_allow_refund_shipping_charge ) ) {
 
-						$total = round( $total ) + $order_shipping_price;
+						$total = $total + $order_shipping_price;
 
 
 					}

diff --git a/assets/src/back-end/js/woo-refund-and-exchange-lite-admin.js b/assets/src/back-end/js/woo-refund-and-exchange-lite-admin.js
@@ -1,6 +1,4 @@
-
-jQuery(document).ready(function() {
-	$ = jQuery;
+jQuery(function($){
 
 	const MDCText = mdc.textField.MDCTextField;
 	const textField = [].map.call(

diff --git a/assets/src/common/js/woo-refund-and-exchange-lite-common.js b/assets/src/common/js/woo-refund-and-exchange-lite-common.js
@@ -1,5 +1,4 @@
-jQuery( document ).on( 'ready', function(){
-	$ = jQuery;
+jQuery(function($){
 	//Refund request submit
 	$('.wps_rma_return_notification').hide();
 	$( '#wps_rma_return_request_form' ).on('submit',function(e){

diff --git a/assets/src/front-end/js/woo-refund-and-exchange-lite-public.js b/assets/src/front-end/js/woo-refund-and-exchange-lite-public.js
@@ -1,6 +1,4 @@
-
-jQuery( document ).on( 'ready', function(){
-	$ = jQuery;
+jQuery(function($){
 	// Show refund subject field if other option is selected.
 	var wps_rma_return_request_subject = $( '#wps_rma_return_request_subject' ).val();
 	if (wps_rma_return_request_subject == null || wps_rma_return_request_subject == '') {

diff --git a/common/js/woo-refund-and-exchange-lite-common.js b/common/js/woo-refund-and-exchange-lite-common.js
@@ -1,5 +1,4 @@
-jQuery( document ).on( 'ready', function(){
-	$ = jQuery;
+jQuery(function($){
 	//Refund request submit
 	$('.wps_rma_return_notification').hide();
 	$( '#wps_rma_return_request_form' ).on('submit',function(e){

diff --git a/common/js/woo-refund-and-exchange-lite-common.min.js b/common/js/woo-refund-and-exchange-lite-common.min.js
diff --git a/includes/woo-refund-and-exchange-lite-common-functions.php b/includes/woo-refund-and-exchange-lite-common-functions.php
@@ -191,6 +191,10 @@ function wps_rma_lite_send_order_msg_callback( $order_id, $msg, $sender, $to ) {
 			do_action( 'wps_rma_do_something_on_view_order_message', $order_id, $msg, $sender, $to );
 
 			if ( ! $restrict_mail ) {
+				$order = wc_get_order( $order_id );
+				$lang  = $order->get_meta( 'wpml_language' );
+				do_action( 'wpml_switch_language', $lang );
+
 				$customer_email = WC()->mailer()->emails['wps_rma_order_messages_email'];
 				$email_status   = $customer_email->trigger( $msg, $attachment, $to, $order_id );
 			}

diff --git a/languages/woo-refund-and-exchange-lite-en_US.mo b/languages/woo-refund-and-exchange-lite-en_US.mo