Skip to content

Commit

Permalink
Merge pull request #73 from wpswings/v4.0.6
Browse files Browse the repository at this point in the history 
V4.0.6
  • Loading branch information
@mohammaddanish-cedcoss
mohammaddanish-cedcoss authored Sep 19, 2022
2 parents 5586937 + a9a10fe commit dee47c2
Show file tree
Hide file tree
Showing 10 changed files with 174 additions and 152 deletions.
1 change: 1 addition & 0 deletions admin/image/Icon_services.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.
10 changes: 5 additions & 5 deletions admin/partials/woo-refund-and-exchange-lite-developer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,16 +110,16 @@ function filtered_array( $argu ) {
foreach ( $argu as $key => $value ) {
foreach ( $value as $key => $originvalue ) {
if ( isset( $originvalue['action_hook'] ) ) {
$val = explode( "'", $originvalue['action_hook'] );
$val = $val[1];
$val = explode( "'", $originvalue['action_hook'] );
$val = isset( $val[1] ) ? $val[1] : '';
$count_admin[ $key ]['action_hook'] = $val;
}
if ( isset( $originvalue['filter_hook'] ) ) {
$val = explode( "'", $originvalue['filter_hook'] );
$val = $val[1];
$val = explode( "'", $originvalue['filter_hook'] );
$val = isset( $val[1] ) ? $val[1] : '';
$count_admin[ $key ]['filter_hook'] = $val;
}
$vale = str_replace( '//desc - ', '', $originvalue['desc'] );
$vale = str_replace( '//desc - ', '', $originvalue['desc'] );
$count_admin[ $key ]['desc'] = $vale;
}
}
Expand Down
14 changes: 4 additions & 10 deletions admin/partials/woo-refund-and-exchange-lite-return-meta.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@
if ( isset( $return_datas ) && ! empty( $return_datas ) ) {
$ref_meth = get_option( $order_id . 'wps_rma_refund_method' );
foreach ( $return_datas as $key => $return_data ) {
$date = date_create( $key );
$date_format = get_option( 'date_format' );
$date = date_format( $date, $date_format );
$date = date_i18n( wc_date_format(), $key );
$refund_method = isset( $ref_meth ) ? $ref_meth : '';
$refund_method = isset( $return_data['refund_method'] ) ? $return_data['refund_method'] : $refund_method;
?>
Expand Down Expand Up @@ -70,7 +68,7 @@
?>
<tr>
<td class="thumb">
<?php echo '<div class="wc-order-item-thumbnail">' . wp_get_attachment_image( $product->get_image_id(), 'thumbnail' ) . '</div>'; ?>
<?php echo '<div class="wc-order-item-thumbnail">' . wp_kses_post( $product->get_image() ) . '</div>'; ?>
</td>
<td>
<?php
Expand Down Expand Up @@ -187,9 +185,7 @@
<input type="hidden" name="wps_rma_total_amount_for_refund" class="wps_rma_total_amount_for_refund" value="<?php echo esc_html( $total_refund_amu ); ?>">
<input type="hidden" value="<?php echo esc_html( $return_data['subject'] ); ?>" id="wps_rma_refund_reason">
<?php
$approve_date = date_create( $return_data['approve_date'] );
$date_format = get_option( 'date_format' );
$approve_date = date_format( $approve_date, $date_format );
$approve_date = date_i18n( wc_date_format(), $return_data['approve_date'] );
$wps_rma_refund_amount = get_post_meta( $order_id, 'wps_rma_left_amount_done', true );
esc_html_e( 'Following product refund request is approved on', 'woo-refund-and-exchange-lite' );
?>
Expand All @@ -216,9 +212,7 @@
}

if ( 'cancel' === $return_data['status'] ) {
$cancel_date = date_create( $return_data['cancel_date'] );
$date_format = get_option( 'date_format' );
$cancel_date = date_format( $cancel_date, $date_format );
$cancel_date = date_i18n( wc_date_format(), $return_data['cancel_date'] );
esc_html_e( 'Following product refund request is cancelled on', 'woo-refund-and-exchange-lite' );
?>
<b><?php echo esc_html( $cancel_date ); ?>.</b>
Expand Down
6 changes: 6 additions & 0 deletions includes/class-woo-refund-and-exchange-lite-activator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ public static function woo_refund_and_exchange_lite_activate( $network_wide ) {
* Creates a translation of a post (to be used with WPML) && pages
**/
public static function wps_rma_create_pages() {
if ( 'no_exist' === get_option( 'wps_rma_refund_enable', 'no_exist' ) ) {
update_option( 'wps_rma_refund_enable', 'on' );
}
if ( 'no_exist' === get_option( 'wps_rma_general_om', 'no_exist' ) ) {
update_option( 'wps_rma_general_om', 'on' );
}
$timestamp = get_option( 'wps_rma_activated_timestamp', 'not_set' );

if ( 'not_set' === $timestamp ) {
Expand Down
Binary file modified languages/woo-refund-and-exchange-lite-en_US.mo
View file
Binary file not shown.
101 changes: 53 additions & 48 deletions languages/woo-refund-and-exchange-lite-en_US.po
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
msgid ""
msgstr ""
"Project-Id-Version: Return Refund and Exchange for WooCommerce 4.0.5\n"
"POT-Creation-Date: 2022-07-20 18:34+0530\n"
"PO-Revision-Date: 2022-07-20 18:35+0530\n"
"Project-Id-Version: Return Refund and Exchange for WooCommerce 4.0.6\n"
"POT-Creation-Date: 2022-09-15 17:20+0530\n"
"PO-Revision-Date: 2022-09-15 17:57+0530\n"
"Last-Translator: \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"
"X-Generator: Poedit 2.0.6\n"
"X-Poedit-Basepath: ..\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 3.1.1\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"

#: admin/class-woo-refund-and-exchange-lite-admin.php:156
Expand Down Expand Up @@ -226,20 +227,20 @@ msgstr ""

#: admin/partials/email_template/woo-refund-and-exchange-lite-refund-request-accept-email.php:38
#: common/partials/email_template/woo-refund-and-exchange-lite-refund-request-email.php:45
#: public/class-woo-refund-and-exchange-lite-public.php:227
#: public/class-woo-refund-and-exchange-lite-public.php:225
#: public/partials/wps-rma-refund-request-form.php:87
msgid "Product"
msgstr ""

#: admin/partials/email_template/woo-refund-and-exchange-lite-refund-request-accept-email.php:39
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:47
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:45
#: common/partials/email_template/woo-refund-and-exchange-lite-refund-request-email.php:46
#: public/partials/wps-rma-refund-request-form.php:88
msgid "Quantity"
msgstr ""

#: admin/partials/email_template/woo-refund-and-exchange-lite-refund-request-accept-email.php:40
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:46
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:44
#: common/partials/email_template/woo-refund-and-exchange-lite-refund-request-email.php:47
#: public/partials/wps-rma-refund-request-form.php:187
msgid "Price"
Expand Down Expand Up @@ -285,12 +286,12 @@ msgid "RETURN REFUND AND EXCHANGE FOR WOOCOMMERCE"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-admin-dashboard.php:52
#: woocommerce-refund-and-exchange-lite.php:192
#: woocommerce-refund-and-exchange-lite.php:191
msgid "Documentation"
msgstr ""

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

Expand Down Expand Up @@ -579,102 +580,102 @@ msgstr ""
msgid "To Configure Refund Request Cancel Email %s."
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:39
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:37
msgid "Following product refund request made on"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:44
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:42
msgid "Item"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:45
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:43
msgid "Name"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:48
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:104
#: public/class-woo-refund-and-exchange-lite-public.php:228
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:46
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:102
#: public/class-woo-refund-and-exchange-lite-public.php:226
#: public/partials/wps-rma-refund-request-form.php:89
msgid "Total"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:79
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:77
msgid "SKU:"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:82
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:80
msgid "Variation ID:"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:118
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:202
#: public/class-woo-refund-and-exchange-lite-public.php:291
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:116
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:198
#: public/class-woo-refund-and-exchange-lite-public.php:289
msgid "Refund Amount"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:122
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:120
#: emails/class-wps-rma-order-messages-email.php:151
#: emails/class-wps-rma-refund-request-accept-email.php:154
#: emails/class-wps-rma-refund-request-cancel-email.php:150
#: emails/class-wps-rma-refund-request-email.php:156
msgid "Subject"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:125
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:123
#: includes/class-woo-refund-and-exchange-lite-onboarding-steps.php:490
msgid "Reason"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:133
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:131
msgid "Bank Details"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:141
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:149
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:139
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:147
msgid "Attachment"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:149
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:147
msgid "/attachment/"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:154
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:152
msgid "No attachment from customer"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:174
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:172
msgid "Accept Request"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:175
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:173
msgid "Cancel Request"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:182
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:180
msgid "admin/image/loader.gif"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:194
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:190
msgid "Following product refund request is approved on"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:213
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:209
msgid "When Product Back in stock then for stock management click on "
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:213
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:209
msgid "Manage Stock"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:222
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:216
msgid "Following product refund request is cancelled on"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:241
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:235
msgid "No request from customer"
msgstr ""

#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:242
#: admin/partials/woo-refund-and-exchange-lite-return-meta.php:236
msgid "Initiate Refund Request"
msgstr ""

Expand Down Expand Up @@ -835,19 +836,19 @@ msgstr ""
msgid "Refund Request Email"
msgstr ""

#: includes/class-woo-refund-and-exchange-lite-activator.php:77
#: includes/class-woo-refund-and-exchange-lite-activator.php:83
msgid "refund-request-form"
msgstr ""

#: includes/class-woo-refund-and-exchange-lite-activator.php:78
#: includes/class-woo-refund-and-exchange-lite-activator.php:84
msgid "Refund Request Form"
msgstr ""

#: includes/class-woo-refund-and-exchange-lite-activator.php:93
#: includes/class-woo-refund-and-exchange-lite-activator.php:99
msgid "view-order-msg"
msgstr ""

#: includes/class-woo-refund-and-exchange-lite-activator.php:94
#: includes/class-woo-refund-and-exchange-lite-activator.php:100
#: public/class-woo-refund-and-exchange-lite-public.php:107
msgid "View Order Messages"
msgstr ""
Expand Down Expand Up @@ -1134,19 +1135,19 @@ msgstr ""
msgid "Refund Requested Product"
msgstr ""

#: public/class-woo-refund-and-exchange-lite-public.php:223
#: public/class-woo-refund-and-exchange-lite-public.php:221
msgid "Following product Refund request made on"
msgstr ""

#: public/class-woo-refund-and-exchange-lite-public.php:306
#: public/class-woo-refund-and-exchange-lite-public.php:304
msgid "Update Request"
msgstr ""

#: public/class-woo-refund-and-exchange-lite-public.php:316
#: public/class-woo-refund-and-exchange-lite-public.php:312
msgid "The above product Refund request is approved on"
msgstr ""

#: public/class-woo-refund-and-exchange-lite-public.php:325
#: public/class-woo-refund-and-exchange-lite-public.php:319
msgid "The above product Refund request is cancelled on"
msgstr ""

Expand Down Expand Up @@ -1232,10 +1233,14 @@ msgstr ""
msgid "Woo Refund And Exchange Lite"
msgstr ""

#: woocommerce-refund-and-exchange-lite.php:191
#: woocommerce-refund-and-exchange-lite.php:190
msgid "Demo"
msgstr ""

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

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

0 comments on commit dee47c2

Please sign in to comment.