From 46feb9211aeb3dd8826c6c5f4f93228d351e06a3 Mon Sep 17 00:00:00 2001
From: priyanka-cedcoss <priyankarajput@cedcoss.com>
Date: Thu, 17 Dec 2020 17:47:10 +0530
Subject: [PATCH] issue and lang file

---
 .../mwb-rnx-lite-order-msg-history-meta.php   |   4 +-
 .../woo-refund-and-exchange-lite-en_US.mo     | Bin 605 -> 532 bytes
 .../woo-refund-and-exchange-lite-en_US.po     | 453 ++++++++++++++++--
 .../woo-refund-and-exchange-lite-en_US.pot    | 453 ++++++++++++++++--
 .../partials/mwb-rnx-lite-view-order-msg.php  |   4 +-
 readme.txt                                    |  23 +-
 6 files changed, 847 insertions(+), 90 deletions(-)

diff --git a/admin/partials/mwb-rnx-lite-order-msg-history-meta.php b/admin/partials/mwb-rnx-lite-order-msg-history-meta.php
index b88743a..5cea305 100644
--- a/admin/partials/mwb-rnx-lite-order-msg-history-meta.php
+++ b/admin/partials/mwb-rnx-lite-order-msg-history-meta.php
@@ -31,7 +31,7 @@
 			<h4 class="mwb-order-heading">
 				<?php esc_html_e( 'Message History', 'woo-refund-and-exchange-lite' ); ?>
 			<a href="" class="mwb_wrma_reload_messages">
-				<img src="<?php echo esc_url( get_home_url() ) . '/wp-content/plugins/woo-refund-and-exchange-lite/public/images/reload-icon.png'; ?>" class="reload-icon">
+				<img src="<?php echo esc_url( MWB_REFUND_N_EXCHANGE_LITE_URL ) . '/public/images/reload-icon.png'; ?>" class="reload-icon">
 			</a>
 			</h4>
 		</div>
@@ -61,7 +61,7 @@
 											?>
 											<div class="mwb_order_msg_single_attachment">
 												<a target="_blank" href="<?php echo esc_url( get_home_url() ) . '/wp-content/attachment/' . esc_html( $order_id ) . '-' . esc_html( $fval['name'] ); ?>">
-													<img class="mwb_order_msg_attachment_thumbnail" src="<?php echo $is_image ? esc_url( get_home_url() ) . '/wp-content/attachment/' . esc_html( $order_id ) . '-' . esc_html( $fval['name'] ) : esc_url( get_home_url() ) . '/wp-content/plugins/woo-refund-and-exchange-lite/admin/images/attachment.png'; ?>">
+													<img class="mwb_order_msg_attachment_thumbnail" src="<?php echo $is_image ? esc_url( get_home_url() ) . '/wp-content/attachment/' . esc_html( $order_id ) . '-' . esc_html( $fval['name'] ) : esc_url( MWB_REFUND_N_EXCHANGE_LITE_URL ) . '/admin/images/attachment.png'; ?>">
 													<span class="mwb_order_msg_attachment_file_name"><?php echo esc_html( $fval['name'] ); ?></span>
 												</a>
 											</div>
diff --git a/languages/woo-refund-and-exchange-lite-en_US.mo b/languages/woo-refund-and-exchange-lite-en_US.mo
index d725a01b7d27c1e99e80b87f6ed7a5da63c6dcbd..01a16a93d476b53fc944b7a61d664dd9d8ee3709 100644
GIT binary patch
delta 150
zcmcc1GKIzA{qFtm_wQ9!1{2C~paNy-KxqpgtpvoDP(GZRXlbXRV611LXTlZWuN#zF
zmRX#cpQr1RSdwa`U}RuqplfKPYiO=uXl`XZapu{{+ZbD9Q@J8^1M*W-GD~!WQxl7l
RGXfGzGIR~B6!f^1xc~!0C}aQt

delta 224
zcmX}iJ&wXK5QgEfq)NFpMFf;goB#y`2~p4!Ee)-e48&5ft$6r302e^O6}SyYfV1q-
z<kdX-nz{RLfBO0LA0F3Y9oA=UHelZ-toP%2Q{L}S({(ZL2H6V!@Ti<J8kUkU4TteC
zh9rSx6eg2&e0{#MC=$&XOQMo{Yeh+g$(^Y8Qk*R0MiXihwmR&TcH(3V)VMw90wlw8
nUP`?~s1)JNwJyDxv$fK+4K|P&EEK^SWu2Fqq!QvZi~{c;D2+Mk

diff --git a/languages/woo-refund-and-exchange-lite-en_US.po b/languages/woo-refund-and-exchange-lite-en_US.po
index a8fa7e6..fcb2ebc 100644
--- a/languages/woo-refund-and-exchange-lite-en_US.po
+++ b/languages/woo-refund-and-exchange-lite-en_US.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Return Refund and Exchange for Woocommerce\n"
-"POT-Creation-Date: 2020-11-13 18:43+0530\n"
-"PO-Revision-Date: 2020-11-13 18:43+0530\n"
+"Project-Id-Version: Return Refund and Exchange for Woocommerce 3.0.4\n"
+"POT-Creation-Date: 2020-12-17 17:28+0530\n"
+"PO-Revision-Date: 2020-12-17 17:28+0530\n"
 "Last-Translator: \n"
 "Language-Team: MakeWebBetter\n"
 "Language: en_US\n"
@@ -10,11 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.0.6\n"
-"X-Poedit-Basepath: ../../../../opt/lampp/htdocs/rma/wp-content/plugins/woo-"
-"refund-and-exchange-lite\n"
+"X-Poedit-Basepath: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-KeywordsList: __;_e;esc_html;esc_html__;esc_html_;sprintf\n"
+"X-Poedit-KeywordsList: _e;__;esc_html;esc_html__;esc_html_e\n"
 "X-Poedit-SearchPath-0: .\n"
 
 #: admin/class-woocommerce_refund_and_exchange_lite-admin.php:109
@@ -34,6 +33,7 @@ msgid "Refund Requested"
 msgstr ""
 
 #: admin/class-woocommerce_refund_and_exchange_lite-admin.php:197
+#: admin/partials/mwb-rnx-lite-notification.php:295
 msgid "Refund Approved"
 msgstr ""
 
@@ -47,16 +47,20 @@ msgstr ""
 
 #: admin/class-woocommerce_refund_and_exchange_lite-admin.php:380
 #: public/class-woocommerce_refund_and_exchange_lite-public.php:541
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:775
+#: public/partials/mwb-rnx-lite-refund-request-form.php:162
 msgid "Product"
 msgstr ""
 
 #: admin/class-woocommerce_refund_and_exchange_lite-admin.php:381
 #: public/class-woocommerce_refund_and_exchange_lite-public.php:542
+#: public/partials/mwb-rnx-lite-refund-request-form.php:163
 msgid "Quantity"
 msgstr ""
 
 #: admin/class-woocommerce_refund_and_exchange_lite-admin.php:382
 #: public/class-woocommerce_refund_and_exchange_lite-public.php:543
+#: public/partials/mwb-rnx-lite-refund-request-form.php:246
 msgid "Price"
 msgstr ""
 
@@ -107,6 +111,292 @@ msgid ""
 "Product Stock is not updated as manage stock setting of product is disable."
 msgstr ""
 
+#: admin/partials/mwb-rnx-lite-notification.php:37
+#: admin/partials/mwb-rnx-lite-notification.php:65
+msgid "Settings saved."
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:39
+#: admin/partials/mwb-rnx-lite-notification.php:67
+msgid "Dismiss this notices."
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:83
+msgid "Notification Setting"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:85
+msgid "Basic"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:86
+#: admin/settings/class-woocommerce_refund_and_exchange_lite-settings.php:290
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:207
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:717
+msgid "Refund"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:88
+msgid "Exchange"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:89
+msgid "Return Ship Label"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:91
+msgid "GO TO SETTING"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:100
+msgid "Mail Setting"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:107
+msgid "From Name"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:122
+msgid "From Email"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:137
+msgid "Mail Header"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:158
+msgid "Mail Footer"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:180
+msgid "Predefined Refund Reason"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:203
+msgid "ADD MORE"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:211
+msgid "Save changes"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:222
+msgid "Merchant Setting"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:229
+msgid "Merchant Refund Request Subject"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:244
+msgid "Short-Codes "
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:246
+msgid ""
+"These are some shortcodes that you can use in EMAIL MESSESGES. It will be "
+"changed with its dynamic values."
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:248
+msgid "Note :"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:248
+msgid "Use"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:248
+msgid "for Order Number"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:248
+msgid "for home page url and"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:248
+msgid "for user name."
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:254
+msgid "Refund Request"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:260
+msgid "Refund Request Subject"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:271
+msgid "Recieved Refund Request Message"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:301
+msgid "Approved Refund Request Subject"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:312
+msgid "Approved Refund Request Message"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:336
+msgid "Refund Cancel"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:342
+msgid "Cancelled Refund Request Subject"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:354
+msgid "Cancelled Refund Request Message"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:379
+msgid "Save Settings"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-order-msg-history-meta.php:27
+#: public/partials/mwb-rnx-lite-view-order-msg.php:67
+msgid "Messages Refreshed Succesfully."
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-order-msg-history-meta.php:32
+#: public/partials/mwb-rnx-lite-view-order-msg.php:70
+msgid "Message History"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-order-msg-history-meta.php:56
+#: public/partials/mwb-rnx-lite-view-order-msg.php:92
+msgid "Message attachments:"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-order-msg-history-meta.php:84
+#: public/partials/mwb-rnx-lite-view-order-msg.php:48
+msgid "Add a message"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-order-msg-history-meta.php:85
+msgid "Write a message you want to sent to the Customer."
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-order-msg-history-meta.php:87
+#: public/partials/mwb-rnx-lite-view-order-msg.php:52
+msgid "Attach files "
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-order-msg-history-meta.php:92
+#: public/partials/mwb-rnx-lite-view-order-msg.php:60
+msgid "Send"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-pro-purchase-template.php:41
+msgid ""
+"Connect With Us and Explore More About Return Refund and Exchange for "
+"Woocommerce"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-pro-purchase-template.php:42
+msgid ""
+"Refund and Exchange plugin for WooCommerce gives your customers an easy and "
+"simple Refund Management system stuffed with organized Exchange, and Cancel "
+"features with a dedicated and streamlined mailing system."
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-pro-purchase-template.php:60
+msgid ""
+"Please Purchase Our Premium version for this feature and also for some more "
+"exciting feature."
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-pro-purchase-template.php:62
+msgid "Get it now"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:38
+msgid "Following product refund request made on"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:44
+msgid "Item"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:45
+msgid "Name"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:46
+msgid "Cost"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:47
+msgid "Qty"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:48
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:776
+#: public/partials/mwb-rnx-lite-refund-request-form.php:164
+msgid "Total"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:99
+msgid "SKU:"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:102
+msgid "Variation ID:"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:106
+msgid "No longer exists"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:130
+msgid "Total Amount"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:149
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:831
+msgid "Refund Amount"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:151
+#: emails/class-wc-rma-messages-email.php:147
+msgid "Subject"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:152
+msgid "Reason"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:159
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:168
+msgid "Attachment"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:206
+msgid "Following product refund request is approved on"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:221
+msgid "When Product Bacck in stock then for stock management click on "
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:229
+msgid "Following product refund request is cancelled on"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:241
+msgid "No request from customer"
+msgstr ""
+
+#: admin/partials/mwb_rnx_lite_refund_rules.php:5
+#: admin/settings/class-woocommerce_refund_and_exchange_lite-settings.php:215
+msgid "Enable"
+msgstr ""
+
+#: admin/partials/mwb_rnx_lite_refund_rules.php:13
+msgid "Custom Rules "
+msgstr ""
+
 #: admin/settings/class-woocommerce_refund_and_exchange_lite-settings.php:16
 msgid "Refund Requested Products"
 msgstr ""
@@ -163,10 +453,6 @@ msgstr ""
 msgid "Refund Products Setting"
 msgstr ""
 
-#: admin/settings/class-woocommerce_refund_and_exchange_lite-settings.php:215
-msgid "Enable"
-msgstr ""
-
 #: admin/settings/class-woocommerce_refund_and_exchange_lite-settings.php:216
 msgid "Enable Refund Request"
 msgstr ""
@@ -248,12 +534,6 @@ msgstr ""
 msgid "Refund Button Text"
 msgstr ""
 
-#: admin/settings/class-woocommerce_refund_and_exchange_lite-settings.php:290
-#: public/class-woocommerce_refund_and_exchange_lite-public.php:207
-#: public/class-woocommerce_refund_and_exchange_lite-public.php:717
-msgid "Refund"
-msgstr ""
-
 #: admin/settings/class-woocommerce_refund_and_exchange_lite-settings.php:291
 msgid "Change Refund button text on frontend"
 msgstr ""
@@ -293,36 +573,32 @@ msgstr ""
 msgid "Change View Order Messages Button text on frontend"
 msgstr ""
 
-#: emails/class-wc-rma-messages-email.php:98
-msgid "Your {site_title} order message from {message_date}"
+#: emails/class-wc-rma-messages-email.php:101
+msgid "Your {site_title} order {order_id} message from {message_date}"
 msgstr ""
 
-#: emails/class-wc-rma-messages-email.php:105
+#: emails/class-wc-rma-messages-email.php:108
 msgid "Thank you"
 msgstr ""
 
-#: emails/class-wc-rma-messages-email.php:135
+#: emails/class-wc-rma-messages-email.php:138
 #, php-format
 msgid "Available placeholders: %s"
 msgstr ""
 
-#: emails/class-wc-rma-messages-email.php:144
-msgid "Subject"
-msgstr ""
-
-#: emails/class-wc-rma-messages-email.php:152
+#: emails/class-wc-rma-messages-email.php:155
 msgid "Heading"
 msgstr ""
 
-#: emails/class-wc-rma-messages-email.php:166
+#: emails/class-wc-rma-messages-email.php:169
 msgid "Plain text"
 msgstr ""
 
-#: emails/class-wc-rma-messages-email.php:167
+#: emails/class-wc-rma-messages-email.php:170
 msgid "HTML"
 msgstr ""
 
-#: emails/class-wc-rma-messages-email.php:168
+#: emails/class-wc-rma-messages-email.php:171
 msgid "Multipart"
 msgstr ""
 
@@ -346,6 +622,29 @@ msgstr ""
 msgid "Select Any One Option..."
 msgstr ""
 
+#: includes/extra-templates/makewebbetter-deactivation-template-display.php:37
+msgid "May we have a little info about why you are deactivating?"
+msgstr ""
+
+#: includes/extra-templates/makewebbetter-deactivation-template-display.php:47
+msgid "Skip and Deactivate Now"
+msgstr ""
+
+#: includes/extra-templates/makewebbetter-onboarding-template-display.php:40
+msgid "Welcome to MakeWebBetter"
+msgstr ""
+
+#: includes/extra-templates/makewebbetter-onboarding-template-display.php:41
+msgid ""
+"We love making new friends! Subscribe below and we promise to keep you up-to-"
+"date with our latest new plugins, updates, awesome deals and a few special "
+"offers."
+msgstr ""
+
+#: includes/extra-templates/makewebbetter-onboarding-template-display.php:51
+msgid "Skip For Now"
+msgstr ""
+
 #: public/class-woocommerce_refund_and_exchange_lite-public.php:108
 msgid "Please enter refund subject."
 msgstr ""
@@ -374,16 +673,33 @@ msgid ""
 "this, Please check your mail. Soon You redirect to My Account Page. Thanks"
 msgstr ""
 
-#: public/class-woocommerce_refund_and_exchange_lite-public.php:802
-#: public/partials/mwb-rnx-lite-refund-request-form.php:231
-#, php-format
-msgid "<a href=\"%s\">%s</a>"
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:761
+msgid "Refund Requested Product"
 msgstr ""
 
-#: public/class-woocommerce_refund_and_exchange_lite-public.php:803
-#: public/partials/mwb-rnx-lite-refund-request-form.php:232
-#, php-format
-msgid "&times; %s"
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:771
+msgid "Following product Refund request made on"
+msgstr ""
+
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:843
+msgid "Extra Cost"
+msgstr ""
+
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:860
+#: public/partials/mwb-rnx-lite-refund-request-form.php:285
+msgid "Total Refund Amount"
+msgstr ""
+
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:900
+msgid "Update Request"
+msgstr ""
+
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:912
+msgid "Above product Refund request is approved on"
+msgstr ""
+
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:921
+msgid "Above product Refund request is cancelled on"
 msgstr ""
 
 #: public/partials/mwb-rnx-lite-refund-request-form.php:43
@@ -407,15 +723,28 @@ msgstr ""
 msgid "Update Refund request is disabled."
 msgstr ""
 
-#: public/partials/mwb-rnx-lite-refund-request-form.php:260
-#, php-format
-msgid "<input type=\"number\" disabled value=\""
+#: public/partials/mwb-rnx-lite-refund-request-form.php:152
+msgid "Order Refund Request Form"
+msgstr ""
+
+#: public/partials/mwb-rnx-lite-refund-request-form.php:251
+#: public/partials/mwb-rnx-lite-refund-request-form.php:268
+#: public/partials/mwb-rnx-lite-refund-request-form.php:291
+msgid "(incl. tax)"
 msgstr ""
 
 #: public/partials/mwb-rnx-lite-refund-request-form.php:322
 msgid "Subject of Refund Request :"
 msgstr ""
 
+#: public/partials/mwb-rnx-lite-refund-request-form.php:343
+msgid "Other"
+msgstr ""
+
+#: public/partials/mwb-rnx-lite-refund-request-form.php:351
+msgid "Write your reason subject"
+msgstr ""
+
 #: public/partials/mwb-rnx-lite-refund-request-form.php:363
 msgid "Reason of Refund Request"
 msgstr ""
@@ -424,10 +753,43 @@ msgstr ""
 msgid "Reason for the Refund Request"
 msgstr ""
 
+#: public/partials/mwb-rnx-lite-refund-request-form.php:380
+#: public/partials/mwb-rnx-lite-refund-request-form.php:385
+msgid "No Reason Enter"
+msgstr ""
+
+#: public/partials/mwb-rnx-lite-refund-request-form.php:396
+msgid "Attach Files"
+msgstr ""
+
+#: public/partials/mwb-rnx-lite-refund-request-form.php:400
+msgid "ced_rnx_refund_upload_files"
+msgstr ""
+
+#: public/partials/mwb-rnx-lite-refund-request-form.php:402
+msgid "Add More"
+msgstr ""
+
+#: public/partials/mwb-rnx-lite-refund-request-form.php:403
+msgid "Only .png, .jpeg extension file is approved."
+msgstr ""
+
+#: public/partials/mwb-rnx-lite-refund-request-form.php:410
+msgid "Submit Request"
+msgstr ""
+
 #: public/partials/mwb-rnx-lite-refund-request-form.php:440
 msgid "Refund Request can't be sent. "
 msgstr ""
 
+#: public/partials/mwb-rnx-lite-view-order-msg.php:41
+msgid "Message has been sent."
+msgstr ""
+
+#: public/partials/mwb-rnx-lite-view-order-msg.php:49
+msgid "Write a message you want to sent to the Shop Manager."
+msgstr ""
+
 #: woocommerce-refund-and-exchange-lite.php:166
 msgid "Settings"
 msgstr ""
@@ -439,3 +801,16 @@ msgstr ""
 #: woocommerce-refund-and-exchange-lite.php:190
 msgid "Go Premium"
 msgstr ""
+
+#: woocommerce-refund-and-exchange-lite.php:329
+msgid ""
+"Woocommerce is not activated, Please activate Woocommerce first to install "
+"WooCommerce Refund and Exchange Lite."
+msgstr ""
+
+#: woocommerce-refund-and-exchange-lite.php:348
+msgid ""
+"WooCommerce RMA | Return-Refund-Exchange is activated so you did not need to "
+"install WooCommerce Refund and Exchange Lite because Main version is "
+"contains all the feature of our lite extention ."
+msgstr ""
diff --git a/languages/woo-refund-and-exchange-lite-en_US.pot b/languages/woo-refund-and-exchange-lite-en_US.pot
index a8fa7e6..dd8f8b5 100644
--- a/languages/woo-refund-and-exchange-lite-en_US.pot
+++ b/languages/woo-refund-and-exchange-lite-en_US.pot
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Return Refund and Exchange for Woocommerce\n"
-"POT-Creation-Date: 2020-11-13 18:43+0530\n"
-"PO-Revision-Date: 2020-11-13 18:43+0530\n"
+"Project-Id-Version: Return Refund and Exchange for Woocommerce 3.0.4\n"
+"POT-Creation-Date: 2020-12-17 17:33+0530\n"
+"PO-Revision-Date: 2020-12-17 17:33+0530\n"
 "Last-Translator: \n"
 "Language-Team: MakeWebBetter\n"
 "Language: en_US\n"
@@ -10,11 +10,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.0.6\n"
-"X-Poedit-Basepath: ../../../../opt/lampp/htdocs/rma/wp-content/plugins/woo-"
-"refund-and-exchange-lite\n"
+"X-Poedit-Basepath: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-KeywordsList: __;_e;esc_html;esc_html__;esc_html_;sprintf\n"
+"X-Poedit-KeywordsList: __;_e;esc_html;esc_html__;esc_html_e\n"
 "X-Poedit-SearchPath-0: .\n"
 
 #: admin/class-woocommerce_refund_and_exchange_lite-admin.php:109
@@ -34,6 +33,7 @@ msgid "Refund Requested"
 msgstr ""
 
 #: admin/class-woocommerce_refund_and_exchange_lite-admin.php:197
+#: admin/partials/mwb-rnx-lite-notification.php:295
 msgid "Refund Approved"
 msgstr ""
 
@@ -47,16 +47,20 @@ msgstr ""
 
 #: admin/class-woocommerce_refund_and_exchange_lite-admin.php:380
 #: public/class-woocommerce_refund_and_exchange_lite-public.php:541
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:775
+#: public/partials/mwb-rnx-lite-refund-request-form.php:162
 msgid "Product"
 msgstr ""
 
 #: admin/class-woocommerce_refund_and_exchange_lite-admin.php:381
 #: public/class-woocommerce_refund_and_exchange_lite-public.php:542
+#: public/partials/mwb-rnx-lite-refund-request-form.php:163
 msgid "Quantity"
 msgstr ""
 
 #: admin/class-woocommerce_refund_and_exchange_lite-admin.php:382
 #: public/class-woocommerce_refund_and_exchange_lite-public.php:543
+#: public/partials/mwb-rnx-lite-refund-request-form.php:246
 msgid "Price"
 msgstr ""
 
@@ -107,6 +111,292 @@ msgid ""
 "Product Stock is not updated as manage stock setting of product is disable."
 msgstr ""
 
+#: admin/partials/mwb-rnx-lite-notification.php:37
+#: admin/partials/mwb-rnx-lite-notification.php:65
+msgid "Settings saved."
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:39
+#: admin/partials/mwb-rnx-lite-notification.php:67
+msgid "Dismiss this notices."
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:83
+msgid "Notification Setting"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:85
+msgid "Basic"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:86
+#: admin/settings/class-woocommerce_refund_and_exchange_lite-settings.php:290
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:207
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:717
+msgid "Refund"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:88
+msgid "Exchange"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:89
+msgid "Return Ship Label"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:91
+msgid "GO TO SETTING"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:100
+msgid "Mail Setting"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:107
+msgid "From Name"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:122
+msgid "From Email"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:137
+msgid "Mail Header"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:158
+msgid "Mail Footer"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:180
+msgid "Predefined Refund Reason"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:203
+msgid "ADD MORE"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:211
+msgid "Save changes"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:222
+msgid "Merchant Setting"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:229
+msgid "Merchant Refund Request Subject"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:244
+msgid "Short-Codes "
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:246
+msgid ""
+"These are some shortcodes that you can use in EMAIL MESSESGES. It will be "
+"changed with its dynamic values."
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:248
+msgid "Note :"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:248
+msgid "Use"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:248
+msgid "for Order Number"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:248
+msgid "for home page url and"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:248
+msgid "for user name."
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:254
+msgid "Refund Request"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:260
+msgid "Refund Request Subject"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:271
+msgid "Recieved Refund Request Message"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:301
+msgid "Approved Refund Request Subject"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:312
+msgid "Approved Refund Request Message"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:336
+msgid "Refund Cancel"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:342
+msgid "Cancelled Refund Request Subject"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:354
+msgid "Cancelled Refund Request Message"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-notification.php:379
+msgid "Save Settings"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-order-msg-history-meta.php:27
+#: public/partials/mwb-rnx-lite-view-order-msg.php:67
+msgid "Messages Refreshed Succesfully."
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-order-msg-history-meta.php:32
+#: public/partials/mwb-rnx-lite-view-order-msg.php:70
+msgid "Message History"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-order-msg-history-meta.php:56
+#: public/partials/mwb-rnx-lite-view-order-msg.php:92
+msgid "Message attachments:"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-order-msg-history-meta.php:84
+#: public/partials/mwb-rnx-lite-view-order-msg.php:48
+msgid "Add a message"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-order-msg-history-meta.php:85
+msgid "Write a message you want to sent to the Customer."
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-order-msg-history-meta.php:87
+#: public/partials/mwb-rnx-lite-view-order-msg.php:52
+msgid "Attach files "
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-order-msg-history-meta.php:92
+#: public/partials/mwb-rnx-lite-view-order-msg.php:60
+msgid "Send"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-pro-purchase-template.php:41
+msgid ""
+"Connect With Us and Explore More About Return Refund and Exchange for "
+"Woocommerce"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-pro-purchase-template.php:42
+msgid ""
+"Refund and Exchange plugin for WooCommerce gives your customers an easy and "
+"simple Refund Management system stuffed with organized Exchange, and Cancel "
+"features with a dedicated and streamlined mailing system."
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-pro-purchase-template.php:60
+msgid ""
+"Please Purchase Our Premium version for this feature and also for some more "
+"exciting feature."
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-pro-purchase-template.php:62
+msgid "Get it now"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:38
+msgid "Following product refund request made on"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:44
+msgid "Item"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:45
+msgid "Name"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:46
+msgid "Cost"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:47
+msgid "Qty"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:48
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:776
+#: public/partials/mwb-rnx-lite-refund-request-form.php:164
+msgid "Total"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:99
+msgid "SKU:"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:102
+msgid "Variation ID:"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:106
+msgid "No longer exists"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:130
+msgid "Total Amount"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:149
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:831
+msgid "Refund Amount"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:151
+#: emails/class-wc-rma-messages-email.php:147
+msgid "Subject"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:152
+msgid "Reason"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:159
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:168
+msgid "Attachment"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:206
+msgid "Following product refund request is approved on"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:221
+msgid "When Product Bacck in stock then for stock management click on "
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:229
+msgid "Following product refund request is cancelled on"
+msgstr ""
+
+#: admin/partials/mwb-rnx-lite-return-product-meta.php:241
+msgid "No request from customer"
+msgstr ""
+
+#: admin/partials/mwb_rnx_lite_refund_rules.php:5
+#: admin/settings/class-woocommerce_refund_and_exchange_lite-settings.php:215
+msgid "Enable"
+msgstr ""
+
+#: admin/partials/mwb_rnx_lite_refund_rules.php:13
+msgid "Custom Rules "
+msgstr ""
+
 #: admin/settings/class-woocommerce_refund_and_exchange_lite-settings.php:16
 msgid "Refund Requested Products"
 msgstr ""
@@ -163,10 +453,6 @@ msgstr ""
 msgid "Refund Products Setting"
 msgstr ""
 
-#: admin/settings/class-woocommerce_refund_and_exchange_lite-settings.php:215
-msgid "Enable"
-msgstr ""
-
 #: admin/settings/class-woocommerce_refund_and_exchange_lite-settings.php:216
 msgid "Enable Refund Request"
 msgstr ""
@@ -248,12 +534,6 @@ msgstr ""
 msgid "Refund Button Text"
 msgstr ""
 
-#: admin/settings/class-woocommerce_refund_and_exchange_lite-settings.php:290
-#: public/class-woocommerce_refund_and_exchange_lite-public.php:207
-#: public/class-woocommerce_refund_and_exchange_lite-public.php:717
-msgid "Refund"
-msgstr ""
-
 #: admin/settings/class-woocommerce_refund_and_exchange_lite-settings.php:291
 msgid "Change Refund button text on frontend"
 msgstr ""
@@ -293,36 +573,32 @@ msgstr ""
 msgid "Change View Order Messages Button text on frontend"
 msgstr ""
 
-#: emails/class-wc-rma-messages-email.php:98
-msgid "Your {site_title} order message from {message_date}"
+#: emails/class-wc-rma-messages-email.php:101
+msgid "Your {site_title} order {order_id} message from {message_date}"
 msgstr ""
 
-#: emails/class-wc-rma-messages-email.php:105
+#: emails/class-wc-rma-messages-email.php:108
 msgid "Thank you"
 msgstr ""
 
-#: emails/class-wc-rma-messages-email.php:135
+#: emails/class-wc-rma-messages-email.php:138
 #, php-format
 msgid "Available placeholders: %s"
 msgstr ""
 
-#: emails/class-wc-rma-messages-email.php:144
-msgid "Subject"
-msgstr ""
-
-#: emails/class-wc-rma-messages-email.php:152
+#: emails/class-wc-rma-messages-email.php:155
 msgid "Heading"
 msgstr ""
 
-#: emails/class-wc-rma-messages-email.php:166
+#: emails/class-wc-rma-messages-email.php:169
 msgid "Plain text"
 msgstr ""
 
-#: emails/class-wc-rma-messages-email.php:167
+#: emails/class-wc-rma-messages-email.php:170
 msgid "HTML"
 msgstr ""
 
-#: emails/class-wc-rma-messages-email.php:168
+#: emails/class-wc-rma-messages-email.php:171
 msgid "Multipart"
 msgstr ""
 
@@ -346,6 +622,29 @@ msgstr ""
 msgid "Select Any One Option..."
 msgstr ""
 
+#: includes/extra-templates/makewebbetter-deactivation-template-display.php:37
+msgid "May we have a little info about why you are deactivating?"
+msgstr ""
+
+#: includes/extra-templates/makewebbetter-deactivation-template-display.php:47
+msgid "Skip and Deactivate Now"
+msgstr ""
+
+#: includes/extra-templates/makewebbetter-onboarding-template-display.php:40
+msgid "Welcome to MakeWebBetter"
+msgstr ""
+
+#: includes/extra-templates/makewebbetter-onboarding-template-display.php:41
+msgid ""
+"We love making new friends! Subscribe below and we promise to keep you up-to-"
+"date with our latest new plugins, updates, awesome deals and a few special "
+"offers."
+msgstr ""
+
+#: includes/extra-templates/makewebbetter-onboarding-template-display.php:51
+msgid "Skip For Now"
+msgstr ""
+
 #: public/class-woocommerce_refund_and_exchange_lite-public.php:108
 msgid "Please enter refund subject."
 msgstr ""
@@ -374,16 +673,33 @@ msgid ""
 "this, Please check your mail. Soon You redirect to My Account Page. Thanks"
 msgstr ""
 
-#: public/class-woocommerce_refund_and_exchange_lite-public.php:802
-#: public/partials/mwb-rnx-lite-refund-request-form.php:231
-#, php-format
-msgid "<a href=\"%s\">%s</a>"
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:761
+msgid "Refund Requested Product"
 msgstr ""
 
-#: public/class-woocommerce_refund_and_exchange_lite-public.php:803
-#: public/partials/mwb-rnx-lite-refund-request-form.php:232
-#, php-format
-msgid "&times; %s"
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:771
+msgid "Following product Refund request made on"
+msgstr ""
+
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:843
+msgid "Extra Cost"
+msgstr ""
+
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:860
+#: public/partials/mwb-rnx-lite-refund-request-form.php:285
+msgid "Total Refund Amount"
+msgstr ""
+
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:900
+msgid "Update Request"
+msgstr ""
+
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:912
+msgid "Above product Refund request is approved on"
+msgstr ""
+
+#: public/class-woocommerce_refund_and_exchange_lite-public.php:921
+msgid "Above product Refund request is cancelled on"
 msgstr ""
 
 #: public/partials/mwb-rnx-lite-refund-request-form.php:43
@@ -407,15 +723,28 @@ msgstr ""
 msgid "Update Refund request is disabled."
 msgstr ""
 
-#: public/partials/mwb-rnx-lite-refund-request-form.php:260
-#, php-format
-msgid "<input type=\"number\" disabled value=\""
+#: public/partials/mwb-rnx-lite-refund-request-form.php:152
+msgid "Order Refund Request Form"
+msgstr ""
+
+#: public/partials/mwb-rnx-lite-refund-request-form.php:251
+#: public/partials/mwb-rnx-lite-refund-request-form.php:268
+#: public/partials/mwb-rnx-lite-refund-request-form.php:291
+msgid "(incl. tax)"
 msgstr ""
 
 #: public/partials/mwb-rnx-lite-refund-request-form.php:322
 msgid "Subject of Refund Request :"
 msgstr ""
 
+#: public/partials/mwb-rnx-lite-refund-request-form.php:343
+msgid "Other"
+msgstr ""
+
+#: public/partials/mwb-rnx-lite-refund-request-form.php:351
+msgid "Write your reason subject"
+msgstr ""
+
 #: public/partials/mwb-rnx-lite-refund-request-form.php:363
 msgid "Reason of Refund Request"
 msgstr ""
@@ -424,10 +753,43 @@ msgstr ""
 msgid "Reason for the Refund Request"
 msgstr ""
 
+#: public/partials/mwb-rnx-lite-refund-request-form.php:380
+#: public/partials/mwb-rnx-lite-refund-request-form.php:385
+msgid "No Reason Enter"
+msgstr ""
+
+#: public/partials/mwb-rnx-lite-refund-request-form.php:396
+msgid "Attach Files"
+msgstr ""
+
+#: public/partials/mwb-rnx-lite-refund-request-form.php:400
+msgid "ced_rnx_refund_upload_files"
+msgstr ""
+
+#: public/partials/mwb-rnx-lite-refund-request-form.php:402
+msgid "Add More"
+msgstr ""
+
+#: public/partials/mwb-rnx-lite-refund-request-form.php:403
+msgid "Only .png, .jpeg extension file is approved."
+msgstr ""
+
+#: public/partials/mwb-rnx-lite-refund-request-form.php:410
+msgid "Submit Request"
+msgstr ""
+
 #: public/partials/mwb-rnx-lite-refund-request-form.php:440
 msgid "Refund Request can't be sent. "
 msgstr ""
 
+#: public/partials/mwb-rnx-lite-view-order-msg.php:41
+msgid "Message has been sent."
+msgstr ""
+
+#: public/partials/mwb-rnx-lite-view-order-msg.php:49
+msgid "Write a message you want to sent to the Shop Manager."
+msgstr ""
+
 #: woocommerce-refund-and-exchange-lite.php:166
 msgid "Settings"
 msgstr ""
@@ -439,3 +801,16 @@ msgstr ""
 #: woocommerce-refund-and-exchange-lite.php:190
 msgid "Go Premium"
 msgstr ""
+
+#: woocommerce-refund-and-exchange-lite.php:329
+msgid ""
+"Woocommerce is not activated, Please activate Woocommerce first to install "
+"WooCommerce Refund and Exchange Lite."
+msgstr ""
+
+#: woocommerce-refund-and-exchange-lite.php:348
+msgid ""
+"WooCommerce RMA | Return-Refund-Exchange is activated so you did not need to "
+"install WooCommerce Refund and Exchange Lite because Main version is "
+"contains all the feature of our lite extention ."
+msgstr ""
diff --git a/public/partials/mwb-rnx-lite-view-order-msg.php b/public/partials/mwb-rnx-lite-view-order-msg.php
index c7484bc..27a0e7d 100644
--- a/public/partials/mwb-rnx-lite-view-order-msg.php
+++ b/public/partials/mwb-rnx-lite-view-order-msg.php
@@ -68,7 +68,7 @@
 	</div>
 	<div class="mwb_order_msg_history_container">
 		<div class="mwb_order_msg_history_title"><h4 class="mwb-order-heading"><?php esc_html_e( 'Message History', 'woo-refund-and-exchange-lite' ); ?>
-			<a href="" class="mwb_reload_messages"><img src="<?php echo esc_url( get_home_url() ) . '/wp-content/plugins/woo-refund-and-exchange-lite/public/images/reload-icon.png'; ?>" class="reload-icon"></a>
+			<a href="" class="mwb_reload_messages"><img src="<?php echo esc_url( MWB_REFUND_N_EXCHANGE_LITE_URL ) . '/public/images/reload-icon.png'; ?>" class="reload-icon"></a>
 		</h4>
 		</div>
 		<div class="mwb_order_msg_sub_container">
@@ -97,7 +97,7 @@
 											?>
 											<div class="mwb_order_msg_single_attachment">
 												<a target="_blank" href="<?php echo esc_url( get_home_url() ) . '/wp-content/attachment/' . esc_html( $order_id ) . '-' . esc_html( $fval['name'] ); ?>">
-													<img class="mwb_order_msg_attachment_thumbnail" src="<?php echo $is_image ? esc_url( get_home_url() ) . '/wp-content/attachment/' . esc_html( $order_id ) . '-' . esc_html( $fval['name'] ) : esc_url( get_home_url() ) . '/wp-content/plugins/woo-refund-and-exchange-lite/public/images/attachment.png'; ?>">
+													<img class="mwb_order_msg_attachment_thumbnail" src="<?php echo $is_image ? esc_url( get_home_url() ) . '/wp-content/attachment/' . esc_html( $order_id ) . '-' . esc_html( $fval['name'] ) : esc_url( MWB_REFUND_N_EXCHANGE_LITE_URL ) . '/public/images/attachment.png'; ?>">
 													<span class="mwb_order_msg_attachment_file_name"><?php echo esc_html( $fval['name'] ); ?></span>
 												</a>
 											</div>
diff --git a/readme.txt b/readme.txt
index 80227ef..6af9eec 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,10 +3,10 @@ Contributors: makewebbetter
 Donate link:  https://makewebbetter.com/
 Tags: return,refund, woocommerce,exchange,RMA
 Requires at least: 4.0
-Tested up to: 5.5.3
+Tested up to: 5.6
 WC requires at least: 3.0.0
-WC tested up to: 4.7.0
-Stable tag: 3.0.3
+WC tested up to: 4.8.0
+Stable tag: 3.0.4
 Requires PHP: 5.6
 License: GPLv3 or later 
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -20,7 +20,7 @@ Provide an easy refund service and increase customer satisfaction with this Retu
 
 Return Refund and Exchange for WooCommerce lets you create a simple refund management system stuffed with an organized exchange, wallet, cancel features. It saves time on complaints, calls disputes, and the hurdles of managing stock. Customers can request full or partial refunds from their accounts with a justification statement. The whole process goes under a dedicated and streamlined mailing system that keeps both parties on the same note. Ultimately leads to easy returns & increased customer satisfaction.
 
-[youtube https://www.youtube.com/watch?v=cUhLwWvZbJU]
+[youtube https://www.youtube.com/watch?v=z0kG75E60TI]
 
 
 == WITH THE RETURN REFUND AND EXCHANGE FOR WOOCOMMERCE PLUGIN YOU CAN: ==
@@ -37,6 +37,7 @@ Return Refund and Exchange for WooCommerce lets you create a simple refund manag
 * Create a dedicated mailing system for refund management
 * Add predefined elements in email content with shortcodes
 * Communicate with customers through messages and Emails
+* Admin can add shortcode for order_id in the emails to track down the customer from whom refund and exchange request is made
 
 
 == WHAT’S INCLUDED IN OUR FREE RETURN REFUND AND EXCHANGE FOR WOOCOMMERCE PLUGIN ==
@@ -149,6 +150,12 @@ When a customer clicks on the refund button then on the refund request form cust
 
 == Changelog ==
 
+= 3.0.4 - RELEASED ON 17 DECEMBER 2020 =
+
+* NEW: order_id shortcode for view order msg mails
+* NEW: Video link on Overview tab
+* FIX: Compatibility with Latest WP (5.6)
+
 = 3.0.3 - RELEASED ON 13 NOVEMBER 2020 =
 
 * Fix: Minor Bug Fixes
@@ -218,8 +225,8 @@ When a customer clicks on the refund button then on the refund request form cust
 
 == Upgrade Notice ==
 
-= 3.0.3 - RELEASED ON 13 NOVEMBER 2020 =
-
-* Fix: Minor Bug Fixes
-* Fix: Update in Plugin Co
+= 3.0.4 - RELEASED ON 17 DECEMBER 2020 =
 
+* NEW: Order Id shortcode for view order msg mails
+* NEW: Video link on Overview tab
+* FIX: Compatibility with Latest WP (5.6)