Merge branch 'release/v2.3.1'

weDevsOfficial · Dec 19, 2017 · db040b8 · db040b8
2 parents eb8ed87 + 4452e4b
commit db040b8
Show file tree

Hide file tree

Showing 41 changed files with 474 additions and 457 deletions.
diff --git a/404.php b/404.php
@@ -13,11 +13,11 @@
 
         <article id="post-0" class="post error404 not-found">
             <header class="entry-header">
-                <h1 class="entry-title"><?php _e( 'Oops! That page can&rsquo;t be found.', 'dokan' ); ?></h1>
+                <h1 class="entry-title"><?php _e( 'Oops! That page can&rsquo;t be found.', 'dokan-theme' ); ?></h1>
             </header><!-- .entry-header -->
 
             <div class="entry-content">
-                <p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'dokan' ); ?></p>
+                <p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'dokan-theme' ); ?></p>
 
                 <?php get_search_form(); ?>
 
@@ -30,7 +30,7 @@
             </div>
             <div class="col-md-4">
                 <div class="widget">
-                    <h2 class="widgettitle"><?php _e( 'Categories', 'dokan' ); ?></h2>
+                    <h2 class="widgettitle"><?php _e( 'Categories', 'dokan-theme' ); ?></h2>
                     <ul>
                         <?php wp_list_categories( array('orderby' => 'count', 'order' => 'DESC', 'show_count' => 1, 'title_li' => '', 'number' => 10) ); ?>
                     </ul>
@@ -42,7 +42,7 @@
 
                 <?php
                 /* translators: %1$s: smilie */
-                $archive_content = '<p>' . sprintf( __( 'Try looking in the monthly archives. %1$s', 'dokan' ), convert_smilies( ':)' ) ) . '</p>';
+                $archive_content = '<p>' . sprintf( __( 'Try looking in the monthly archives. %1$s', 'dokan-theme' ), convert_smilies( ':)' ) ) . '</p>';
                 the_widget( 'WP_Widget_Archives', 'dropdown=1', "after_title=</h2>$archive_content" );
                 ?>
             </div>

diff --git a/archive.php b/archive.php
@@ -19,28 +19,28 @@
                 <h1 class="page-title">
                     <?php
                     if ( is_category() ) {
-                        printf( __( 'Category Archives: %s', 'dokan' ), '<span>' . single_cat_title( '', false ) . '</span>' );
+                        printf( __( 'Category Archives: %s', 'dokan-theme' ), '<span>' . single_cat_title( '', false ) . '</span>' );
                     } elseif ( is_tag() ) {
-                        printf( __( 'Tag Archives: %s', 'dokan' ), '<span>' . single_tag_title( '', false ) . '</span>' );
+                        printf( __( 'Tag Archives: %s', 'dokan-theme' ), '<span>' . single_tag_title( '', false ) . '</span>' );
                     } elseif ( is_author() ) {
                         /* Queue the first post, that way we know
                          * what author we're dealing with (if that is the case).
                          */
                         the_post();
-                        printf( __( 'Author Archives: %s', 'dokan' ), '<span class="vcard"><a class="url fn n" href="' . get_author_posts_url( get_the_author_meta( "ID" ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' );
+                        printf( __( 'Author Archives: %s', 'dokan-theme' ), '<span class="vcard"><a class="url fn n" href="' . get_author_posts_url( get_the_author_meta( "ID" ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' );
                         /* Since we called the_post() above, we need to
                          * rewind the loop back to the beginning that way
                          * we can run the loop properly, in full.
                          */
                         rewind_posts();
                     } elseif ( is_day() ) {
-                        printf( __( 'Daily Archives: %s', 'dokan' ), '<span>' . get_the_date() . '</span>' );
+                        printf( __( 'Daily Archives: %s', 'dokan-theme' ), '<span>' . get_the_date() . '</span>' );
                     } elseif ( is_month() ) {
-                        printf( __( 'Monthly Archives: %s', 'dokan' ), '<span>' . get_the_date( 'F Y' ) . '</span>' );
+                        printf( __( 'Monthly Archives: %s', 'dokan-theme' ), '<span>' . get_the_date( 'F Y' ) . '</span>' );
                     } elseif ( is_year() ) {
-                        printf( __( 'Yearly Archives: %s', 'dokan' ), '<span>' . get_the_date( 'Y' ) . '</span>' );
+                        printf( __( 'Yearly Archives: %s', 'dokan-theme' ), '<span>' . get_the_date( 'Y' ) . '</span>' );
                     } else {
-                        _e( 'Archives', 'dokan' );
+                        _e( 'Archives', 'dokan-theme' );
                     }
                     ?>
                 </h1>

diff --git a/assets/css/skins/blue.css b/assets/css/skins/blue.css
@@ -606,4 +606,3 @@ fieldset[disabled] .woocommerce-page #content input.button.active {
 .woocommerce .star-rating {
   color: #2980b9;
 }
-/*# sourceMappingURL=style.css.map */
diff --git a/assets/css/skins/green.css b/assets/css/skins/green.css
@@ -606,4 +606,3 @@ fieldset[disabled] .woocommerce-page #content input.button.active {
 .woocommerce .star-rating {
   color: #27ae60;
 }
-/*# sourceMappingURL=style.css.map */
diff --git a/assets/css/skins/orange.css b/assets/css/skins/orange.css
@@ -606,4 +606,3 @@ fieldset[disabled] .woocommerce-page #content input.button.active {
 .woocommerce .star-rating {
   color: #f05025;
 }
-/*# sourceMappingURL=style.css.map */
diff --git a/assets/css/skins/pink.css b/assets/css/skins/pink.css
@@ -606,4 +606,3 @@ fieldset[disabled] .woocommerce-page #content input.button.active {
 .woocommerce .star-rating {
   color: #f17288;
 }
-/*# sourceMappingURL=style.css.map */
diff --git a/assets/css/skins/purple.css b/assets/css/skins/purple.css
@@ -606,4 +606,3 @@ fieldset[disabled] .woocommerce-page #content input.button.active {
 .woocommerce .star-rating {
   color: #8e44ad;
 }
-/*# sourceMappingURL=style.css.map */
diff --git a/assets/css/skins/red.css b/assets/css/skins/red.css
@@ -606,4 +606,3 @@ fieldset[disabled] .woocommerce-page #content input.button.active {
 .woocommerce .star-rating {
   color: #e74c3c;
 }
-/*# sourceMappingURL=style.css.map */
diff --git a/assets/css/skins/rose-quartz.css b/assets/css/skins/rose-quartz.css
@@ -606,4 +606,3 @@ fieldset[disabled] .woocommerce-page #content input.button.active {
 .woocommerce .star-rating {
   color: #AF93A0;
 }
-/*# sourceMappingURL=style.css.map */
diff --git a/assets/css/skins/sky.css b/assets/css/skins/sky.css
@@ -606,4 +606,3 @@ fieldset[disabled] .woocommerce-page #content input.button.active {
 .woocommerce .star-rating {
   color: #3498db;
 }
-/*# sourceMappingURL=style.css.map */
diff --git a/assets/js/script.js b/assets/js/script.js
@@ -55,15 +55,15 @@ jQuery(function($) {
         maxItems: getGridSize()
     });
 
-    $('body').on('added_to_cart wc_cart_button_updated', function( data ) {
+    $('body').on('added_to_cart wc_cart_button_updated', function( fragment, data ) {
         var viewCartText = $('a.added_to_cart.wc-forward').text();
 
         $('i.fa-shopping-cart').removeClass('fa-spin');
         $('a.added_to_cart.wc-forward').html('<i class="fa fa-eye" data-toggle="tooltip" data-placement="top" title="' + viewCartText + '" aria-hidden="true"></i>');
         $('[data-toggle="tooltip"]').tooltip();
 
         $('.dokan-cart-amount-top > .amount').fadeOut( 'fast', function(){
-            $('.dokan-cart-amount-top > .amount').html(data.amount).fadeIn('fast');
+            $('.dokan-cart-amount-top > .amount').html( data.dokan_cart_amount ).fadeIn('fast');
         });
     });
 

diff --git a/assets/less/style.less b/assets/less/style.less
@@ -4,7 +4,7 @@ Theme URI: http://wedevs.com/theme/dokan/
 Author: Tareq Hasan
 Author URI: http://tareq.weDevs.com
 Description: An e-commerce theme for Dokan
-Version: 2.2.1
+Version: 2.3.1
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 */
@@ -72,3 +72,12 @@ input, textarea {
     background-color: #fdfdfd;
     border: 1px solid #e3e3e3;
 }
+
+/* woocommerce auction */
+.auction_form {
+    .input-text.qty.bid.text {
+        padding-left: 0;
+        padding-right: 0;
+        width: 80px;
+    }
+}
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,12 @@
+v2.3.1 -> December 19, 2017
+---------------------
+- [new]   Help link added on Slider menu
+- [new]   Made compatible with Dokan Live Search module
+- [fix]   Mini cart not updating live
+- [fix]   Showing My account page inside Checkout page
+- [tweak] Updated outdated template versions
+- [tweak] Updated missing text domains
+
 v2.3.0 -> July 31, 2017
 ---------------------
 - [new]   Rose Quartz Color scheme added