From ac594695fbbab3db013c543f651f28020effb6d6 Mon Sep 17 00:00:00 2001 From: Sabbir Ahmed Date: Sun, 11 Jun 2017 12:25:10 +0600 Subject: [PATCH 01/13] Pagination problem fixed #27 --- includes/template-tags.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/template-tags.php b/includes/template-tags.php index 65f6799c03..119a37c6c4 100755 --- a/includes/template-tags.php +++ b/includes/template-tags.php @@ -52,7 +52,7 @@ function dokan_content_nav( $nav_id, $query = null ) { - max_num_pages > 1 && ( is_home() || is_archive() || is_search() ) ) : // navigation links for home, archive, and search pages ?> + max_num_pages > 1 && ( dokan_is_store_page() || is_home() || is_archive() || is_search() ) ) : // navigation links for home, archive, and search pages ?> From c39e04c760bacf2b1873fffc847a9b2a4a3e86fd Mon Sep 17 00:00:00 2001 From: rafsuntaskin Date: Tue, 13 Jun 2017 11:02:25 +0600 Subject: [PATCH 02/13] Banner is now shown in settings for all appearances , resolved #114, #138 --- templates/settings/store-form.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/templates/settings/store-form.php b/templates/settings/store-form.php index 4365a107f8..f26418b491 100644 --- a/templates/settings/store-form.php +++ b/templates/settings/store-form.php @@ -51,7 +51,6 @@ -
@@ -89,7 +88,6 @@
-
From 5870a41e6c25637b3c01a83af1f573a1c3d7d9f8 Mon Sep 17 00:00:00 2001 From: rafsuntaskin Date: Tue, 13 Jun 2017 13:41:43 +0600 Subject: [PATCH 03/13] Fixed profile progress calculation if overridden and filter added `dokan_profile_completion_progress_value` --- classes/template-settings.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/classes/template-settings.php b/classes/template-settings.php index 5c080f17b9..c8676d9a54 100755 --- a/classes/template-settings.php +++ b/classes/template-settings.php @@ -557,7 +557,7 @@ function calculate_profile_completeness_value( $dokan_settings ) { extract( $progress_values ); //settings wise completeness section - if( isset( $dokan_settings['gravatar'] ) ): + if ( isset( $profile_picture_val ) && isset( $dokan_settings['gravatar'] ) ): if ( $dokan_settings['gravatar'] != 0 ) { $profile_val = $profile_val + $profile_picture_val; $track_val['gravatar'] = $profile_picture_val; @@ -569,7 +569,7 @@ function calculate_profile_completeness_value( $dokan_settings ) { endif; // Calculate Social profiles - if( isset( $dokan_settings['social'] ) ): + if ( isset( $social_val ) && isset( $dokan_settings['social'] ) ): foreach ( $dokan_settings['social'] as $key => $value ) { @@ -590,7 +590,7 @@ function calculate_profile_completeness_value( $dokan_settings ) { endif; //calculate completeness for phone - if( isset( $dokan_settings['phone'] ) ): + if ( isset( $phone_val ) && isset( $dokan_settings['phone'] ) ): if ( strlen( trim( $dokan_settings['phone'] ) ) != 0 ) { $profile_val = $profile_val + $phone_val; @@ -604,7 +604,7 @@ function calculate_profile_completeness_value( $dokan_settings ) { endif; //calculate completeness for banner - if( isset( $dokan_settings['banner'] ) ): + if ( isset( $banner_val ) && isset( $dokan_settings['banner'] ) ): if ( $dokan_settings['banner'] != 0 ) { $profile_val = $profile_val + $banner_val; @@ -616,7 +616,7 @@ function calculate_profile_completeness_value( $dokan_settings ) { endif; //calculate completeness for store name - if( isset( $dokan_settings['store_name'] ) ): + if ( isset( $store_name_val ) && isset( $dokan_settings['store_name'] ) ): if ( isset( $dokan_settings['store_name'] ) ) { $profile_val = $profile_val + $store_name_val; $track_val['store_name'] = $store_name_val; @@ -628,7 +628,7 @@ function calculate_profile_completeness_value( $dokan_settings ) { endif; //calculate completeness for address - if( isset( $dokan_settings['address'] ) ): + if ( isset( $address_val ) && isset( $dokan_settings['address'] ) ): if ( !empty($dokan_settings['address']['street_1']) ) { $profile_val = $profile_val + $address_val; $track_val['address'] = $address_val; @@ -640,7 +640,7 @@ function calculate_profile_completeness_value( $dokan_settings ) { endif; // Calculate Payment method val for Bank - if ( isset( $dokan_settings['payment']['bank'] ) ) { + if ( isset( $dokan_settings['payment'] ) && isset( $dokan_settings['payment']['bank'] ) ) { $count_bank = true; // if any of the values for bank details are blank, check_bank will be set as false @@ -659,7 +659,7 @@ function calculate_profile_completeness_value( $dokan_settings ) { } // Calculate Payment method val for Paypal - if ( isset( $dokan_settings['payment']['paypal'] ) ) { + if ( isset( $dokan_settings['payment'] ) && isset( $dokan_settings['payment']['paypal'] ) ) { $p_email = isset($dokan_settings['payment']['paypal']['email']) ? $dokan_settings['payment']['paypal']['email'] : false; if ( $p_email != false ) { @@ -670,7 +670,7 @@ function calculate_profile_completeness_value( $dokan_settings ) { } // Calculate Payment method val for skrill - if ( isset( $dokan_settings['payment']['skrill'] ) ) { + if ( isset( $dokan_settings['payment'] ) && isset( $dokan_settings['payment']['skrill'] ) ) { $s_email = isset( $dokan_settings['payment']['skrill']['email'] ) ? $dokan_settings['payment']['skrill']['email'] : false; if ( $s_email != false ) { @@ -696,8 +696,8 @@ function calculate_profile_completeness_value( $dokan_settings ) { $track_val['next_todo'] = $next_add; $track_val['progress'] = $profile_val; - - return $track_val; + + return apply_filters( 'dokan_profile_completion_progress_value', $track_val ) ; } /** From 102ebc8e3b6b6950533f93c7289ff2a192c5d585 Mon Sep 17 00:00:00 2001 From: mainul11 Date: Thu, 15 Jun 2017 08:51:48 +0600 Subject: [PATCH 04/13] Added title heading to the description --- readme.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index 2860a4bc83..a1e0f4546b 100644 --- a/readme.txt +++ b/readme.txt @@ -12,6 +12,8 @@ The pioneer multi-vendor plugin for WordPress. Start your own marketplace in min == Description == +Dokan Multivendor Marketplace Plugin For WordPress + Dokan is the best front end multi vendor marketplace on WordPress, powered by WooCommerce. Build your own Amazon, Shopify, eBay, Magento like marketplace in just 30 minutes. Dokan is the fastest way to start ecommerce and earn through commissions with products ranging from digital, physical to variable. **The best Frontend user interface** @@ -444,4 +446,4 @@ Initial version released == Upgrade Notice == = 2.6.0 = -**Important Update** This update is compatible with WooCommerce 3.0. Make sure to backup and read full [changelog](https://docs.wedevs.com/docs/dokan/changelog/) for more details. \ No newline at end of file +**Important Update** This update is compatible with WooCommerce 3.0. Make sure to backup and read full [changelog](https://docs.wedevs.com/docs/dokan/changelog/) for more details. From 70cf7597fdc003d805fa18e05f0c05e9f05d41d7 Mon Sep 17 00:00:00 2001 From: mainul11 Date: Thu, 15 Jun 2017 09:11:20 +0600 Subject: [PATCH 05/13] Create readme.txt --- readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index a1e0f4546b..a51f7aaefb 100644 --- a/readme.txt +++ b/readme.txt @@ -12,7 +12,7 @@ The pioneer multi-vendor plugin for WordPress. Start your own marketplace in min == Description == -Dokan Multivendor Marketplace Plugin For WordPress += Dokan Multivendor Marketplace Plugin For WordPress = Dokan is the best front end multi vendor marketplace on WordPress, powered by WooCommerce. Build your own Amazon, Shopify, eBay, Magento like marketplace in just 30 minutes. Dokan is the fastest way to start ecommerce and earn through commissions with products ranging from digital, physical to variable. From e7f9b75a86d77f19962112f409a321c8a77075de Mon Sep 17 00:00:00 2001 From: Sabbir Ahmed Date: Mon, 19 Jun 2017 09:39:18 +0600 Subject: [PATCH 06/13] Fix order exporting issue fixed #31 --- classes/template-orders.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/template-orders.php b/classes/template-orders.php index a162efe9e4..4669824e39 100644 --- a/classes/template-orders.php +++ b/classes/template-orders.php @@ -136,7 +136,7 @@ function handle_order_export() { $customer_phone = esc_html( get_post_meta( $order->order_id, '_billing_phone', true ) ); $customer_ip = esc_html( get_post_meta( $order->order_id, '_customer_ip_address', true ) ); } else { - $customer_name = get_post_meta( dokan_get_prop( $order, 'id' ), '_billing_first_name', true ). ' '. get_post_meta( dokan_get_prop( $order, 'id' ), '_billing_last_name', true ).'(Guest)'; + $customer_name = get_post_meta( $order->order_id, '_billing_first_name', true ). ' '. get_post_meta( $order->order_id, '_billing_last_name', true ).'(Guest)'; $customer_email = esc_html( get_post_meta( $order->order_id, '_billing_email', true ) ); $customer_phone = esc_html( get_post_meta( $order->order_id, '_billing_phone', true ) ); $customer_ip = esc_html( get_post_meta( $order->order_id, '_customer_ip_address', true ) ); @@ -149,7 +149,7 @@ function handle_order_export() { 'order_shipping_cost' => $the_order->get_total_shipping(), 'order_payment_method' => get_post_meta( $order->order_id, '_payment_method_title', true ), 'order_total' => $the_order->get_total(), - 'order_status' => $statuses[dokan_get_prop( $the_order, 'status' )], + 'order_status' => $statuses['wc-' . dokan_get_prop( $the_order, 'status' )], 'order_date' => dokan_get_date_created( $the_order ), 'customer_name' => $customer_name, 'customer_email' => $customer_email, From 395f9ffa6072413fd04467ee4257aa9271055621 Mon Sep 17 00:00:00 2001 From: Sabbir Ahmed Date: Mon, 19 Jun 2017 10:55:00 +0600 Subject: [PATCH 07/13] Change chosen to select2 in downloadable product permission in vendor order details page --- assets/js/dokan.js | 2 +- templates/orders/downloadable.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/dokan.js b/assets/js/dokan.js index 0a1305cf25..bccac2f2f0 100644 --- a/assets/js/dokan.js +++ b/assets/js/dokan.js @@ -1,7 +1,7 @@ jQuery(function($) { $('.tips').tooltip(); - $('select.grant_access_id').chosen(); + // $('select.grant_access_id').chosen(); $('ul.order-status').on('click', 'a.dokan-edit-status', function(e) { $(this).addClass('dokan-hide').closest('li').next('li').removeClass('dokan-hide'); diff --git a/templates/orders/downloadable.php b/templates/orders/downloadable.php index d7517ac8ad..761915691a 100755 --- a/templates/orders/downloadable.php +++ b/templates/orders/downloadable.php @@ -36,7 +36,7 @@
- '; From 563df10fc05cccd191687445d9590bd2790cba5d Mon Sep 17 00:00:00 2001 From: Sabbir Ahmed Date: Mon, 19 Jun 2017 10:58:22 +0600 Subject: [PATCH 08/13] Allow memory size issue fixed #32 --- templates/orders/downloadable.php | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/templates/orders/downloadable.php b/templates/orders/downloadable.php index 761915691a..eca424fde4 100755 --- a/templates/orders/downloadable.php +++ b/templates/orders/downloadable.php @@ -35,26 +35,23 @@
- From 415b9510cebbefccc9d2a36aa7748adf174c1851 Mon Sep 17 00:00:00 2001 From: Sabbir Ahmed Date: Wed, 21 Jun 2017 12:27:01 +0600 Subject: [PATCH 09/13] Fix order earning issue in vendor dashboard and statement --- includes/order-functions.php | 8 ++++---- includes/wc-functions.php | 8 ++++---- templates/dashboard/big-counter-widget.php | 1 - 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/includes/order-functions.php b/includes/order-functions.php index b8ab649f91..d2e631365c 100755 --- a/includes/order-functions.php +++ b/includes/order-functions.php @@ -89,7 +89,7 @@ function dokan_get_seller_orders_by_date( $start_date, $end_date, $seller_id = f global $wpdb; $seller_id = ! $seller_id ? get_current_user_id() : intval( $seller_id ); - + $end_date = date( 'Y-m-d 00:00:00', strtotime( $end_date ) ); $end_date = date( 'Y-m-d h:i:s', strtotime( $end_date . '-1 minute' ) ); $start_date = date( 'Y-m-d', strtotime( $start_date ) ); @@ -373,7 +373,7 @@ function dokan_sync_insert_order( $order_id ) { $net_amount = apply_filters( 'dokan_order_net_amount', $net_amount, $order ); dokan_delete_sync_duplicate_order( $order_id, $seller_id ); - + // make sure order status contains "wc-" prefix if ( stripos( $order_status, 'wc-' ) === false ) { $order_status = 'wc-' . $order_status; @@ -576,12 +576,12 @@ function dokan_sync_order_table( $order_id ) { $admin_commission = dokan_get_admin_commission_by( $order, $seller_id ); $net_amount = $order_total - $admin_commission; $net_amount = apply_filters( 'dokan_sync_order_net_amount', $net_amount, $order ); - + // make sure order status contains "wc-" prefix if ( stripos( $order_status, 'wc-' ) === false ) { $order_status = 'wc-' . $order_status; } - + $wpdb->insert( $wpdb->prefix . 'dokan_orders', array( 'order_id' => $order_id, diff --git a/includes/wc-functions.php b/includes/wc-functions.php index 20c63fa0c0..bc4f1597d3 100755 --- a/includes/wc-functions.php +++ b/includes/wc-functions.php @@ -573,7 +573,7 @@ function dokan_seller_displayname ( $display_name ) { * @return \WP_Query */ function dokan_get_featured_products( $per_page = 9) { - + $args = array( 'posts_per_page' => $per_page, @@ -635,7 +635,7 @@ function dokan_get_latest_products( $per_page = 9 , $seller_id = '' ) { ); if ( version_compare( WC_VERSION, '2.7', '>' ) ) { - + $product_visibility_term_ids = wc_get_product_visibility_term_ids(); $args['tax_query'] = array( @@ -683,7 +683,7 @@ function dokan_get_best_selling_products( $per_page = 8, $seller_id = '' ) { ); if ( version_compare( WC_VERSION, '2.7', '>' ) ) { - + $product_visibility_term_ids = wc_get_product_visibility_term_ids(); $args['tax_query'] = array( 'taxonomy' => 'product_visibility', @@ -877,7 +877,7 @@ function dokan_get_seller_earnings( $seller_id, $start_date = '', $end_date = '' } if ( empty( $end_date ) ) { - $end_date = date( 'Y-m-d', strtotime( 'midnight', current_time( 'timestamp' ) ) ); + $end_date = date( 'Y-m-d', strtotime( '+1 day', current_time( 'timestamp' ) ) ); } $all_orders = dokan_get_seller_orders_by_date( $start_date, $end_date, $seller_id, dokan_withdraw_get_active_order_status() ); diff --git a/templates/dashboard/big-counter-widget.php b/templates/dashboard/big-counter-widget.php index 631ef2d36e..dc1aa4e835 100644 --- a/templates/dashboard/big-counter-widget.php +++ b/templates/dashboard/big-counter-widget.php @@ -37,7 +37,6 @@ foreach ( $status as $order_status ){ $total += $orders_count->$order_status; } - // $total = $orders_count->{'wc-completed'} + $orders_count->{'wc-processing'} + $orders_count->{'wc-on-hold'}; echo number_format_i18n( $total, 0 ); ?>
From 6bc2099e0cabf9fbf175af7c077e61b47ec26a17 Mon Sep 17 00:00:00 2001 From: rafsuntaskin Date: Thu, 22 Jun 2017 10:00:36 +0600 Subject: [PATCH 10/13] change log updated --- changelog.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/changelog.txt b/changelog.txt index cbad32fc79..68d869eef9 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,12 @@ +v2.6.4 -> June 22, 2017 +--------------------- +- [fix] Store page product loop pagination not showing +- [fix] Order exporting not working properly +- [fix] Earning calculation date range issue +- [tweak] Banner upload is now available in store settings for all appearances +- [tweak] Profile completion progress custom values logic updated +- [tweak] Downloadable product section performance tweaks + v2.6.3 -> June 08, 2017 --------------------- - [fix] Missing text domains updated From a6d83b1858594790d37d661d7a987de38daa0b0e Mon Sep 17 00:00:00 2001 From: rafsuntaskin Date: Thu, 22 Jun 2017 11:30:56 +0600 Subject: [PATCH 11/13] fixed non-numeric warning issue for php 7.1 --- includes/order-functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/order-functions.php b/includes/order-functions.php index d2e631365c..76e7e9b8bb 100755 --- a/includes/order-functions.php +++ b/includes/order-functions.php @@ -15,7 +15,7 @@ function dokan_get_seller_amount_from_order( $order_id, $get_array = false ) { $order_total = $order->get_total(); $order_shipping = $order->get_total_shipping(); $order_tax = $order->get_total_tax(); - $extra_cost = $order_shipping + $order_tax; + $extra_cost = (float) $order_shipping + (float) $order_tax; $commission_recipient = dokan_get_option( 'extra_fee_recipient', 'dokan_general', 'seller' ); From 31e278d2455f774c4c8d5915669ea7a9686f85b7 Mon Sep 17 00:00:00 2001 From: rafsuntaskin Date: Thu, 22 Jun 2017 11:41:20 +0600 Subject: [PATCH 12/13] version bump and readme updated --- dokan.php | 4 ++-- package.json | 2 +- readme.txt | 9 +++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dokan.php b/dokan.php index 0b32923a06..e787964b57 100755 --- a/dokan.php +++ b/dokan.php @@ -3,7 +3,7 @@ Plugin Name: Dokan (Lite) - Multi-vendor Marketplace Plugin URI: https://wordpress.org/plugins/dokan-lite/ Description: An e-commerce marketplace plugin for WordPress. Powered by WooCommerce and weDevs. -Version: 2.6.3 +Version: 2.6.4 Author: Tareq Hasan Author URI: http://tareq.co/ Text Domain: dokan-lite @@ -45,7 +45,7 @@ define( '__DIR__', dirname( __FILE__ ) ); } -define( 'DOKAN_PLUGIN_VERSION', '2.6.3' ); +define( 'DOKAN_PLUGIN_VERSION', '2.6.4' ); define( 'DOKAN_FILE', __FILE__ ); define( 'DOKAN_DIR', __DIR__ ); define( 'DOKAN_INC_DIR', __DIR__ . '/includes' ); diff --git a/package.json b/package.json index 5ff6fc6104..3c8c4a1a23 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dokan", - "version": "2.6.3", + "version": "2.6.4", "description": "A WordPress marketplace plugin", "author": "Tareq Hasan", "license": "GPL", diff --git a/readme.txt b/readme.txt index a51f7aaefb..510898ae40 100644 --- a/readme.txt +++ b/readme.txt @@ -178,6 +178,15 @@ A. Just install and activate the PRO version without deleting the free plugin. A == Changelog == +v2.6.4 -> June 22, 2017 +--------------------- +- [fix] Store page product loop pagination not showing +- [fix] Order exporting not working properly +- [fix] Earning calculation date range issue +- [tweak] Banner upload is now available in store settings for all appearances +- [tweak] Profile completion progress custom values logic updated +- [tweak] Downloadable product section performance tweaks + v2.6.3 -> June 08, 2017 --------------------- - [fix] Missing text domains updated From 37ce1ec1ab669a6d855fca9475b5794e11dbe921 Mon Sep 17 00:00:00 2001 From: rafsuntaskin Date: Thu, 22 Jun 2017 11:41:50 +0600 Subject: [PATCH 13/13] generated pot file --- assets/js/dokan.js | 2 +- assets/src/js/orders.js | 2 +- languages/dokan-lite.pot | 48 ++++++++++++++++++++-------------------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/assets/js/dokan.js b/assets/js/dokan.js index bccac2f2f0..6208044197 100644 --- a/assets/js/dokan.js +++ b/assets/js/dokan.js @@ -1,7 +1,7 @@ jQuery(function($) { $('.tips').tooltip(); - // $('select.grant_access_id').chosen(); + //$('select.grant_access_id').chosen(); $('ul.order-status').on('click', 'a.dokan-edit-status', function(e) { $(this).addClass('dokan-hide').closest('li').next('li').removeClass('dokan-hide'); diff --git a/assets/src/js/orders.js b/assets/src/js/orders.js index 627a45a6e9..79a23a42a7 100755 --- a/assets/src/js/orders.js +++ b/assets/src/js/orders.js @@ -1,7 +1,7 @@ jQuery(function($) { $('.tips').tooltip(); - $('select.grant_access_id').chosen(); + //$('select.grant_access_id').chosen(); $('ul.order-status').on('click', 'a.dokan-edit-status', function(e) { $(this).addClass('dokan-hide').closest('li').next('li').removeClass('dokan-hide'); diff --git a/languages/dokan-lite.pot b/languages/dokan-lite.pot index 81dc4b454e..6845fd3c21 100644 --- a/languages/dokan-lite.pot +++ b/languages/dokan-lite.pot @@ -2,9 +2,9 @@ # This file is distributed under the GPL2. msgid "" msgstr "" -"Project-Id-Version: Dokan (Lite) - Multi-vendor Marketplace 2.6.3\n" +"Project-Id-Version: Dokan (Lite) - Multi-vendor Marketplace 2.6.4\n" "Report-Msgid-Bugs-To: http://wedevs.com/support/forum/theme-support/dokan/\n" -"POT-Creation-Date: 2017-06-08 08:00:05+00:00\n" +"POT-Creation-Date: 2017-06-22 05:37:03+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -41,7 +41,7 @@ msgstr "" msgid "Banner" msgstr "" -#: classes/admin-user-profile.php:97 templates/settings/store-form.php:68 +#: classes/admin-user-profile.php:97 templates/settings/store-form.php:67 msgid "Upload banner" msgstr "" @@ -507,7 +507,7 @@ msgstr "" msgid "Store Setup" msgstr "" -#: classes/seller-setup-wizard.php:240 templates/settings/store-form.php:119 +#: classes/seller-setup-wizard.php:240 templates/settings/store-form.php:117 msgid "Store Product Per Page" msgstr "" @@ -535,11 +535,11 @@ msgstr "" msgid "State Name" msgstr "" -#: classes/seller-setup-wizard.php:281 templates/settings/store-form.php:149 +#: classes/seller-setup-wizard.php:281 templates/settings/store-form.php:147 msgid "Email" msgstr "" -#: classes/seller-setup-wizard.php:284 templates/settings/store-form.php:154 +#: classes/seller-setup-wizard.php:284 templates/settings/store-form.php:152 msgid "Show email address in store" msgstr "" @@ -1161,7 +1161,7 @@ msgid "Define the seller store URL (%s[this-text]/[seller-name] msgstr "" #: includes/admin/admin.php:312 includes/functions.php:997 -#: templates/settings/store-form.php:196 +#: templates/settings/store-form.php:194 msgid "Terms and Conditions" msgstr "" @@ -2602,11 +2602,11 @@ msgstr "" msgid "Add Tracking Details" msgstr "" -#: templates/orders/downloadable.php:39 +#: templates/orders/downloadable.php:38 msgid "Choose a downloadable product…" msgstr "" -#: templates/orders/downloadable.php:72 +#: templates/orders/downloadable.php:68 msgid "Grant Access" msgstr "" @@ -3150,63 +3150,63 @@ msgstr "" msgid "State " msgstr "" -#: templates/settings/payment.php:39 templates/settings/store-form.php:228 +#: templates/settings/payment.php:39 templates/settings/store-form.php:226 msgid "Update Settings" msgstr "" -#: templates/settings/store-form.php:81 +#: templates/settings/store-form.php:80 msgid "Upload a banner for your store. Banner size is (%sx%s) pixels." msgstr "" -#: templates/settings/store-form.php:95 +#: templates/settings/store-form.php:93 msgid "Profile Picture" msgstr "" -#: templates/settings/store-form.php:105 +#: templates/settings/store-form.php:103 msgid "Upload Photo" msgstr "" -#: templates/settings/store-form.php:111 +#: templates/settings/store-form.php:109 msgid "Store Name" msgstr "" -#: templates/settings/store-form.php:114 +#: templates/settings/store-form.php:112 msgid "store name" msgstr "" -#: templates/settings/store-form.php:142 +#: templates/settings/store-form.php:140 msgid "Phone No" msgstr "" -#: templates/settings/store-form.php:144 +#: templates/settings/store-form.php:142 msgid "+123456.." msgstr "" -#: templates/settings/store-form.php:161 +#: templates/settings/store-form.php:159 msgid "More product" msgstr "" -#: templates/settings/store-form.php:166 +#: templates/settings/store-form.php:164 msgid "Enable tab on product single page view" msgstr "" -#: templates/settings/store-form.php:174 +#: templates/settings/store-form.php:172 msgid "Map" msgstr "" -#: templates/settings/store-form.php:181 +#: templates/settings/store-form.php:179 msgid "Type an address to find" msgstr "" -#: templates/settings/store-form.php:182 +#: templates/settings/store-form.php:180 msgid "Find Address" msgstr "" -#: templates/settings/store-form.php:200 +#: templates/settings/store-form.php:198 msgid "Show terms and conditions in store page" msgstr "" -#: templates/settings/store-form.php:206 +#: templates/settings/store-form.php:204 msgid "TOC Details" msgstr ""