diff --git a/Gruntfile.js b/Gruntfile.js index 0faaf5e888..e43a5bf25e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -25,7 +25,8 @@ module.exports = function(grunt) { sourceMapRootpath: '../../' }, files: { - '<%= dirs.css %>/style.css': '<%= dirs.devLessSrc %>/style.less' + '<%= dirs.css %>/style.css': '<%= dirs.devLessSrc %>/style.less', + '<%= dirs.css %>/rtl.css': '<%= dirs.devLessSrc %>/rtl.less' } }, diff --git a/assets/css/rtl.css b/assets/css/rtl.css new file mode 100644 index 0000000000..4e2fbf494b --- /dev/null +++ b/assets/css/rtl.css @@ -0,0 +1,210 @@ +.dokan-right { + float: left !important; +} +.dokan-left { + float: right !important; +} +.dokan-w1, +.dokan-w2, +.dokan-w3, +.dokan-w4, +.dokan-w5, +.dokan-w6, +.dokan-w7, +.dokan-w8, +.dokan-w9, +.dokan-w10, +.dokan-w11, +.dokan-w12 { + float: right; +} +.dokan-form-horizontal .dokan-control-label { + text-align: left; + padding-left: 15px; +} +.dokan-form-group .checkbox input[type="checkbox"] { + float: right; + margin-left: 10px; +} +.dokan-form-group .ajax_prev { + margin-right: 23% !important; +} +.dokan-text-left { + text-align: right; +} +#dokan-comments-table td.col-author .dokan-author-img, +#dokan-comments-table th.col-author .dokan-author-img { + float: right !important; + margin-left: 5px !important; +} +#dokan-comments-table td.col-author .dokan-author-meta, +#dokan-comments-table th.col-author .dokan-author-meta { + float: right !important; +} +.dokan-dashboard .dokan-dashboard-content { + padding: 0 25px 0 0; +} +.dokan-dashboard .dokan-dashboard-content article.dashboard-content-area .dokan-dash-left { + padding-right: 0px; + padding-left: 15px; +} +.dokan-dashboard .dokan-dashboard-content article.dashboard-content-area .dashboard-widget .list-count .count { + float: left; +} +.dokan-dashboard .dokan-dashboard-content article.dashboard-content-area .dashboard-widget.orders .content-half-part { + float: right; +} +.dokan-dashboard .dokan-dashboard-content article.dokan-orders-area .dokan-order-left-content { + margin-right: 0; + margin-left: 3%; +} +.dokan-dashboard .dokan-dashboard-content article.dokan-orders-area .dokan-order-left-content .dokan-order-billing-address { + min-width: 49%; + margin-right: 0; + margin-left: 2%; +} +.dokan-dashboard .dokan-dashboard-content article.dokan-orders-area .dokan-order-left-content .dokan-order-shipping-address { + min-width: 49%; +} +.dokan-dashboard .dokan-dashboard-content .dokan-product-listing-area .product-listing-top .dokan-listing-filter { + float: right !important; +} +.dokan-dashboard .dokan-dashboard-content .dokan-product-listing-area .product-listing-top span.dokan-add-product-link a { + float: left !important; +} +.dokan-dashboard .dokan-dashboard-content .dokan-product-listing-area button[name="product_listing_search"] { + float: left !important; + margin-right: 5px; +} +.dokan-dashboard .dokan-dashboard-content .dokan-product-listing-area .dokan-product-date-filter .dokan-form-group { + float: right; +} +.dokan-dashboard .dokan-dashboard-content .dokan-product-listing-area .dokan-product-date-filter button { + float: right; + margin-right: 5px; +} +.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.active:after { + left: 0px; + right: 93%; + border-width: 16px 0px 16px 16px; +} +.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.back a { + padding-left: 0px; + padding-right: 16px; +} +.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.back a i { + float: left; +} +.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li a i { + margin-top: 5px; +} +.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li a i.fa-angle-right { + padding-top: 0px; + -webkit-transform: rotate(180deg); + -moz-transform: rotate(180deg); + -o-transform: rotate(180deg); + -ms-transform: rotate(180deg); + transform: rotate(180deg); +} +.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.dokan-common-links a { + padding: 5% 5%; +} +.dokan-dashboard .product-edit-new-container .dokan-edit-row .dokan-section-heading h2 { + float: right; +} +.dokan-dashboard .product-edit-new-container .dokan-edit-row .dokan-section-heading p { + float: right; + margin-right: 8px; +} +.dokan-dashboard .product-edit-new-container .dokan-edit-row .dokan-section-toggle { + float: left; +} +.dokan-dashboard .product-edit-new-container .dokan-attribute-variation-options .dokan-product-attribute-wrapper ul { + padding-right: 0px; + margin-right: 0px; +} +.dokan-dashboard .product-edit-new-container .dokan-attribute-variation-options .dokan-product-attribute-wrapper ul li.product-attribute-list .dokan-product-attribute-heading a.dokan-product-remove-attribute { + position: relative; + float: left; + right: 0px; + top: 0px; +} +.dokan-dashboard .product-edit-new-container .dokan-attribute-variation-options .dokan-product-attribute-wrapper ul li.product-attribute-list .dokan-product-attribute-heading a.dokan-product-toggle-attribute { + left: 50px; + right: auto; +} +.dokan-dashboard .product-edit-new-container .dokan-attribute-variation-options .dokan-attribute-type select { + margin-right: 0px; + margin-left: 10px; +} +.dokan-dashboard .product-edit-new-container .dokan-attribute-variation-options .dokan-product-variation-wrapper .dokan-variations-container .dokan-product-variation-itmes h3.variation-topbar-heading strong { + float: right; +} +.dokan-dashboard .product-edit-new-container .dokan-attribute-variation-options .dokan-product-variation-wrapper .dokan-variations-container .dokan-product-variation-itmes h3.variation-topbar-heading select { + float: right; +} +.dokan-dashboard .product-edit-new-container .dokan-attribute-variation-options .dokan-product-variation-wrapper .dokan-variations-container .dokan-product-variation-itmes .actions { + left: 15px; + right: auto; +} +.dokan-dashboard .product-edit-new-container .dokan-attribute-variation-options .dokan-product-variation-wrapper .dokan-variations-container .dokan-product-variation-itmes .dokan-variable-attributes .thumbnail-checkbox-options .upload_image { + float: right; +} +.dokan-dashboard .product-edit-new-container .dokan-attribute-variation-options .dokan-product-variation-wrapper .dokan-variations-container .dokan-product-variation-itmes .dokan-variable-attributes .thumbnail-checkbox-options .options { + float: right; + margin-right: 24px; +} +#dokan-seller-listing-wrap ul.dokan-seller-wrap li .store-footer .seller-avatar { + left: 20px; + right: auto; +} +.dokan-store-sidebar { + margin-right: 0 !important; + margin-left: 3%; +} +.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout1 .profile-info-summery-wrapper .profile-info-summery .profile-info-head { + float: right; +} +.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout1 .profile-info-summery-wrapper .profile-info-summery .profile-info { + float: right; +} +.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout1 .profile-info-summery-wrapper .profile-info-summery .profile-info .store-name { + margin: 10px 15px 25px 15px; +} +.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout3 .profile-info-summery-wrapper .profile-info-summery .profile-info-head { + float: right; +} +.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout3 .profile-info-summery-wrapper .profile-info-summery .profile-info { + float: right; + width: 80%; +} +.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout3 .profile-info-summery-wrapper .profile-info-summery .profile-info .dokan-store-info li { + float: right; + margin-left: 40px; + margin-right: 0px; +} +.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout3 .profile-info-summery-wrapper .profile-info-summery .profile-info .dokan-store-info li.dokan-store-rating { + float: none !important; +} +.dokan-single-store .profile-frame .profile-info-box .profile-info-summery-wrapper .profile-info-summery .profile-info-head .profile-img img { + float: none; +} +.dokan-single-store .profile-frame .profile-info-box .profile-info-summery-wrapper .profile-info-summery .profile-info i { + float: right; + margin-right: -25px; + margin-left: 0; +} +@media (min-width: 1200px) { + .dokan-single-store .profile-frame .profile-info-box .profile-info-summery-wrapper .profile-info-summery .profile-info .store-social-wrapper { + left: 20px !important; + right: auto !important; + } +} +@media (max-width: 1199px) { + .dokan-single-store .profile-frame .profile-info-box .profile-info-summery-wrapper .profile-info-summery .profile-info .dokan-store-info { + padding-right: 40px; + } + .dokan-single-store .profile-frame .profile-info-box .profile-info-summery-wrapper .profile-info-summery .profile-info .dokan-store-info li { + text-align: right !important; + } +} diff --git a/assets/css/style.css b/assets/css/style.css index c25e925a79..fd7bda3c1d 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -1732,6 +1732,66 @@ span.error { font-size: 2em; color: rgba(0, 0, 0, 0.75); } +.dokan-category-menu { + padding: 0; + border: 1px solid #ece7e7; +} +.dokan-category-menu h3.widget-title { + margin: 0; + padding: 10px 10px 10px 15px; + background: #eee; + border: 1px solid #eee; + color: #444; +} +.dokan-category-menu ul li { + border-bottom: none; +} +.dokan-category-menu #cat-drop-stack ul .children { + display: none; +} +.dokan-category-menu #cat-drop-stack ul li:last-child a { + border-bottom: none !important; +} +.dokan-category-menu #cat-drop-stack ul li:last-child.has-children a { + border-bottom: 1px solid #eee !important; +} +.dokan-category-menu #cat-drop-stack > ul { + padding: 0px; + margin: 0px; +} +.dokan-category-menu #cat-drop-stack > ul li { + padding: 0; +} +.dokan-category-menu #cat-drop-stack > ul li.parent-cat-wrap { + background: #fff; +} +.dokan-category-menu #cat-drop-stack > ul li.parent-cat-wrap a { + border-bottom: 1px solid #eee; + margin: 0px 15px; + text-decoration: none; +} +.dokan-category-menu #cat-drop-stack > ul li.parent-cat-wrap ul.level-0 { + background: #fafafa; +} +.dokan-category-menu #cat-drop-stack > ul li.parent-cat-wrap ul.level-0 li.has-children { + border-bottom: none; +} +.dokan-category-menu #cat-drop-stack > ul li a { + padding: 9px 0px; + display: block; + color: #3C3C3C; + position: relative; + font-size: 13px; + text-decoration: none; +} +.dokan-category-menu #cat-drop-stack > ul li a .caret-icon { + position: absolute; + right: -2px; + display: inline-block; + width: 20px; + vertical-align: middle; + text-align: center; +} .dokan-announcement-wrapper .dokan-no-announcement .annoument-no-wrapper { height: 100%; margin: 70px auto; @@ -2126,6 +2186,16 @@ div.media-sidebar a.edit-attachment { .dokan-dashboard .dokan-dashboard-content .dokan-page-help p { margin-bottom: 10px; } +.dokan-orders-content .dokan-orders-area .dokan-order-left-content { + margin-right: 3%; +} +.dokan-orders-content .dokan-orders-area .dokan-order-left-content .dokan-order-billing-address { + min-width: 49%; + margin-right: 2%; +} +.dokan-orders-content .dokan-orders-area .dokan-order-left-content .dokan-order-shipping-address { + min-width: 49%; +} .dokan-orders-content .dokan-orders-area .dokan-order-filter-serach { padding: 10px 7px; } @@ -2278,6 +2348,12 @@ div.media-sidebar a.edit-attachment { .dokan-product-listing .dokan-product-listing-area .product-listing-top span.dokan-add-product-link { width: 30%; } +.dokan-product-listing .dokan-product-listing-area form.dokan-product-search-form button[name="product_listing_search"] { + float: right; +} +.dokan-product-listing .dokan-product-listing-area form.dokan-product-search-form .dokan-form-group { + float: right; +} .dokan-product-listing .dokan-product-listing-area table.product-listing-table span.product-type:before { font-family: FontAwesome; content: "\f133"; @@ -3686,6 +3762,7 @@ div.media-sidebar a.edit-attachment { float: left; padding: 0 25px; color: #444; + width: 80%; } .dokan-single-store .profile-frame.profile-frame-no-banner .profile-layout-layout3 .profile-info-summery-wrapper .profile-info-summery .profile-info .store-name { margin-top: 5px; diff --git a/assets/js/dokan.js b/assets/js/dokan.js index 6208044197..b3edb9e7bf 100644 --- a/assets/js/dokan.js +++ b/assets/js/dokan.js @@ -1937,4 +1937,30 @@ jQuery(function($) { resize_dummy_image(); }); -})(jQuery); \ No newline at end of file +})(jQuery); + +;( function ( $ ) { + + $( '#cat-drop-stack li.has-children' ).on( 'click', '> a span.caret-icon', function ( e ) { + e.preventDefault(); + var self = $( this ), + liHasChildren = self.closest( 'li.has-children' ); + + if ( !liHasChildren.find( '> ul.children' ).is( ':visible' ) ) { + self.find( 'i.fa' ).addClass( 'fa-rotate-90' ); + if ( liHasChildren.find( '> ul.children' ).hasClass( 'level-0' ) ) { + self.closest( 'a' ).css( { 'borderBottom': 'none' } ); + } + } + + liHasChildren.find( '> ul.children' ).slideToggle( 'fast', function () { + if ( !$( this ).is( ':visible' ) ) { + self.find( 'i.fa' ).removeClass( 'fa-rotate-90' ); + + if ( liHasChildren.find( '> ul.children' ).hasClass( 'level-0' ) ) { + self.closest( 'a' ).css( { 'borderBottom': '1px solid #eee' } ); + } + } + } ); + } ); +} )( jQuery ); \ No newline at end of file diff --git a/assets/src/js/script.js b/assets/src/js/script.js index dace9168b6..30e46d027c 100755 --- a/assets/src/js/script.js +++ b/assets/src/js/script.js @@ -683,4 +683,30 @@ jQuery(function($) { resize_dummy_image(); }); -})(jQuery); \ No newline at end of file +})(jQuery); + +;( function ( $ ) { + + $( '#cat-drop-stack li.has-children' ).on( 'click', '> a span.caret-icon', function ( e ) { + e.preventDefault(); + var self = $( this ), + liHasChildren = self.closest( 'li.has-children' ); + + if ( !liHasChildren.find( '> ul.children' ).is( ':visible' ) ) { + self.find( 'i.fa' ).addClass( 'fa-rotate-90' ); + if ( liHasChildren.find( '> ul.children' ).hasClass( 'level-0' ) ) { + self.closest( 'a' ).css( { 'borderBottom': 'none' } ); + } + } + + liHasChildren.find( '> ul.children' ).slideToggle( 'fast', function () { + if ( !$( this ).is( ':visible' ) ) { + self.find( 'i.fa' ).removeClass( 'fa-rotate-90' ); + + if ( liHasChildren.find( '> ul.children' ).hasClass( 'level-0' ) ) { + self.closest( 'a' ).css( { 'borderBottom': '1px solid #eee' } ); + } + } + } ); + } ); +} )( jQuery ); \ No newline at end of file diff --git a/assets/src/less/general.less b/assets/src/less/general.less index 0bc4cdeb8b..2b43241264 100644 --- a/assets/src/less/general.less +++ b/assets/src/less/general.less @@ -172,3 +172,91 @@ span.error { font-size: 2em; color: rgba(0, 0, 0, .75) } + +.dokan-category-menu { + padding: 0; + border: 1px solid #ece7e7; + + h3.widget-title { + margin: 0; + padding: 10px 10px 10px 15px; + background: #eee; + border: 1px solid #eee; + color: #444; + } + + ul li { + border-bottom: none; + } + + #cat-drop-stack { + ul { + .children { + display: none; + } + + li { + &:last-child { + a { + border-bottom: none !important; + } + + &.has-children { + a { + border-bottom: 1px solid #eee !important; + } + } + } + } + } + + > ul { + padding: 0px; + margin: 0px; + + li { + padding:0; + + &.parent-cat-wrap { + background: #fff; + + a { + border-bottom: 1px solid #eee; + margin: 0px 15px; + text-decoration: none; + + } + + ul { + &.level-0 { + background: #fafafa; + li { + &.has-children { + border-bottom: none; + } + } + } + } + } + + a { + padding: 9px 0px; + display: block; + color: #3C3C3C; + position: relative; + font-size: 13px; + text-decoration: none; + + .caret-icon { + position: absolute; + right: -2px; + display: inline-block; + width: 20px; + vertical-align: middle; + text-align: center; + } + } + } + } + } +} \ No newline at end of file diff --git a/assets/src/less/orders.less b/assets/src/less/orders.less index 1fc437281d..73fdb409dc 100644 --- a/assets/src/less/orders.less +++ b/assets/src/less/orders.less @@ -2,6 +2,19 @@ .dokan-orders-area { + .dokan-order-left-content { + margin-right: 3%; + + .dokan-order-billing-address { + min-width: 49%; + margin-right:2%; + } + + .dokan-order-shipping-address { + min-width: 49%; + } + } + .dokan-order-filter-serach { padding:10px 7px; } diff --git a/assets/src/less/products.less b/assets/src/less/products.less index 9fd9998b42..3eb8912ec7 100644 --- a/assets/src/less/products.less +++ b/assets/src/less/products.less @@ -46,6 +46,16 @@ } } + form.dokan-product-search-form { + button[name="product_listing_search"] { + float: right; + } + + .dokan-form-group { + float: right; + } + } + table.product-listing-table { span.product-type:before { font-family: FontAwesome; diff --git a/assets/src/less/rtl.less b/assets/src/less/rtl.less new file mode 100644 index 0000000000..7402d9cb82 --- /dev/null +++ b/assets/src/less/rtl.less @@ -0,0 +1,389 @@ +.dokan-right { + float: left !important; +} + +.dokan-left { + float: right !important; +} + +.dokan-w1, .dokan-w2, .dokan-w3, .dokan-w4, .dokan-w5, .dokan-w6, .dokan-w7, .dokan-w8, .dokan-w9, .dokan-w10, .dokan-w11, .dokan-w12 { + float:right; +} + +.dokan-form-horizontal { + .dokan-control-label { + text-align: left; + padding-left: 15px; + } +} + +.dokan-form-group { + .checkbox { + input[type="checkbox"] { + float:right; + margin-left: 10px; + } + } + + .ajax_prev { + margin-right: 23% !important; + } +} + +.dokan-text-left { + text-align: right; +} + +#dokan-comments-table { + td.col-author, + th.col-author { + .dokan-author-img { + float: right !important; + margin-left: 5px !important; + } + + .dokan-author-meta { + float: right !important; + } + } + +} + +.dokan-dashboard { + + .dokan-dashboard-content { + padding: 0 25px 0 0; + + article.dashboard-content-area { + .dokan-dash-left { + padding-right: 0px; + padding-left: 15px; + } + .dashboard-widget { + .list-count { + .count { + float:left; + } + } + &.orders { + .content-half-part { + float: right; + } + } + } + } + + article.dokan-orders-area { + .dokan-order-left-content { + margin-right: 0; + margin-left: 3%; + + .dokan-order-billing-address { + min-width: 49%; + margin-right:0; + margin-left:2%; + } + + .dokan-order-shipping-address { + min-width: 49%; + } + } + } + + .dokan-product-listing-area { + .product-listing-top { + .dokan-listing-filter { + float: right !important; + } + + span.dokan-add-product-link { + a { + float: left !important; + } + } + } + + button[name="product_listing_search"] { + float: left !important; + margin-right: 5px; + } + + .dokan-product-date-filter { + .dokan-form-group { + float: right; + } + + button { + float: right; + margin-right: 5px; + } + } + } + } + + .dokan-dash-sidebar { + ul.dokan-dashboard-menu { + li { + &.active { + &:after { + left: 0px; + right: 93%; + border-width: 16px 0px 16px 16px; + } + } + + &.back { + a { + padding-left: 0px; + padding-right: 16px; + + i { + float: left; + } + } + } + + a { + i { + margin-top: 5px; + + &.fa-angle-right { + padding-top: 0px; + -webkit-transform: rotate( 180deg ); + -moz-transform: rotate( 180deg ); + -o-transform: rotate( 180deg ); + -ms-transform: rotate( 180deg ); + transform: rotate( 180deg ); + } + } + } + + &.dokan-common-links { + a { + padding: 5% 5%; + } + } + } + } + } + + .product-edit-new-container { + .dokan-edit-row { + .dokan-section-heading { + h2 { + float: right; + } + + p { + float: right; + margin-right: 8px; + } + } + + .dokan-section-toggle { + float: left; + } + } + .dokan-attribute-variation-options { + .dokan-product-attribute-wrapper { + ul { + padding-right: 0px; + margin-right: 0px; + + li.product-attribute-list { + .dokan-product-attribute-heading { + a.dokan-product-remove-attribute { + position: relative; + float: left; + right: 0px; + top:0px + } + + a.dokan-product-toggle-attribute { + left: 50px; + right: auto; + } + } + } + } + } + + .dokan-attribute-type { + select { + margin-right: 0px; + margin-left: 10px; + } + } + + .dokan-product-variation-wrapper { + .dokan-variations-container { + .dokan-product-variation-itmes { + h3.variation-topbar-heading { + strong { + float: right; + } + + select { + float: right; + } + } + + .actions { + left: 15px; + right: auto; + } + + .dokan-variable-attributes { + .thumbnail-checkbox-options { + .upload_image { + float: right; + } + .options { + float: right; + margin-right: 24px; + } + } + } + } + } + } + } + } +} + +#dokan-seller-listing-wrap { + ul.dokan-seller-wrap { + li { + .store-footer { + .seller-avatar { + left: 20px; + right: auto; + } + } + } + } +} + +.dokan-store-sidebar { + margin-right: 0 !important; + margin-left: 3%; +} + +.dokan-single-store { + .profile-frame { + .profile-info-box { + &.profile-layout-layout1 { + .profile-info-summery-wrapper { + .profile-info-summery { + .profile-info-head { + float:right; + } + .profile-info { + float:right; + .store-name { + margin: 10px 15px 25px 15px; + } + } + } + } + } + + &.profile-layout-layout3 { + .profile-info-summery-wrapper { + .profile-info-summery { + .profile-info-head { + float:right; + } + .profile-info { + float:right; + width: 80%; + + .dokan-store-info { + li { + float: right; + margin-left: 40px; + margin-right: 0px; + + &.dokan-store-rating { + float: none !important; + } + } + } + } + } + } + } + + .profile-info-summery-wrapper { + .profile-info-summery { + .profile-info-head { + .profile-img { + img { + float:none; + } + } + } + + .profile-info { + i { + float: right; + margin-right: -25px; + margin-left: 0; + } + } + } + } + } + } +} + +@media (min-width: 1200px) { + .dokan-single-store { + .profile-frame { + + .profile-info-box { + + .profile-info-summery-wrapper { + + .profile-info-summery { + + .profile-info { + + .store-social-wrapper { + left: 20px !important; + right: auto !important; + } + } + } + } + } + } + } +} + +@media (max-width: 1199px) { + .dokan-single-store { + .profile-frame { + + .profile-info-box { + + .profile-info-summery-wrapper { + + .profile-info-summery { + + .profile-info { + .dokan-store-info { + padding-right: 40px; + li { + text-align: right !important; + } + } + } + } + } + } + } + } +} + + diff --git a/assets/src/less/store.less b/assets/src/less/store.less index 5f24577647..8ac4693af4 100644 --- a/assets/src/less/store.less +++ b/assets/src/less/store.less @@ -258,6 +258,7 @@ float: left; padding: 0 25px; color: #444; + width: 80%; .store-name { margin-top: 5px; diff --git a/changelog.txt b/changelog.txt index 68d869eef9..d8d899d7bb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,17 @@ +v2.6.5 -> July 16, 2017 +--------------------- +- [new] Added IBAN and Routing number fields for vendor's Bank info section +- [new] Added settings in admin panel to disable Vendor Welcome Wizard +- [new] Added filter `dokan_seller_registration_required_fields` +- [new] Store Category widget design updated +- [new] Added Dokan logo as menu icon in admin dashboard +- [new] Dokan Store Sidebar widget area now available for all themes +- [fix] Store categories are not updating properly +- [fix] Showing store location widget if location is not set +- [fix] Withdraw not working for IP address with port number +- [tweak] Enahanced RTL support +- [tweak] Profile Completion progress filter args updated + v2.6.4 -> June 22, 2017 --------------------- - [fix] Store page product loop pagination not showing diff --git a/classes/email.php b/classes/email.php index f7608c157b..399ed08d70 100755 --- a/classes/email.php +++ b/classes/email.php @@ -146,7 +146,7 @@ function dokan_refund_seller_mail( $seller_mail, $order_id, $status, $amount, $r $order_id, $amount, $refund_reason, - home_url() . '?page=dokan-refund&status=pending', + dokan_get_navigation_url() . 'orders/?order_status=wc-refunded', $this->get_from_name(), home_url(), ); diff --git a/classes/installer.php b/classes/installer.php index 84a135aea3..b0dc3d441c 100755 --- a/classes/installer.php +++ b/classes/installer.php @@ -256,7 +256,7 @@ function create_withdraw_table() { `status` int(1) NOT NULL, `method` varchar(30) NOT NULL, `note` text NOT NULL, - `ip` varchar(15) NOT NULL, + `ip` varchar(25) NOT NULL, PRIMARY KEY (id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;"; diff --git a/classes/seller-setup-wizard.php b/classes/seller-setup-wizard.php index a9d227d03a..a969b68b3c 100644 --- a/classes/seller-setup-wizard.php +++ b/classes/seller-setup-wizard.php @@ -26,7 +26,12 @@ public function filter_woocommerce_registration_redirect( $var ) { $user = wp_get_current_user(); if ( in_array( 'seller', $user->roles ) ) { - $url = apply_filters( 'dokan_seller_setup_wizard_url', site_url( '?page=dokan-seller-setup' ) ); + + $url = dokan_get_navigation_url(); + + if ( dokan_get_option( 'disable_welcome_wizard', 'dokan_selling', 'off' ) === 'off' ) { + $url = apply_filters( 'dokan_seller_setup_wizard_url', site_url( '?page=dokan-seller-setup' ) ); + } } return $url; } @@ -443,11 +448,13 @@ public function dokan_setup_payment_save() { $bank = $_POST['settings']['bank']; $dokan_settings['payment']['bank'] = array( - 'ac_name' => sanitize_text_field( $bank['ac_name'] ), - 'ac_number' => sanitize_text_field( $bank['ac_number'] ), - 'bank_name' => sanitize_text_field( $bank['bank_name'] ), - 'bank_addr' => sanitize_text_field( $bank['bank_addr'] ), - 'swift' => sanitize_text_field( $bank['swift'] ), + 'ac_name' => sanitize_text_field( $bank['ac_name'] ), + 'ac_number' => sanitize_text_field( $bank['ac_number'] ), + 'bank_name' => sanitize_text_field( $bank['bank_name'] ), + 'bank_addr' => sanitize_text_field( $bank['bank_addr'] ), + 'routing_number' => sanitize_text_field( $bank['routing_number'] ), + 'iban' => sanitize_text_field( $bank['iban'] ), + 'swift' => sanitize_text_field( $bank['swift'] ), ); } diff --git a/classes/template-settings.php b/classes/template-settings.php index c8676d9a54..de39e2fce1 100755 --- a/classes/template-settings.php +++ b/classes/template-settings.php @@ -482,11 +482,13 @@ function insert_settings_info() { $bank = $_POST['settings']['bank']; $dokan_settings['payment']['bank'] = array( - 'ac_name' => sanitize_text_field( $bank['ac_name'] ), - 'ac_number' => sanitize_text_field( $bank['ac_number'] ), - 'bank_name' => sanitize_text_field( $bank['bank_name'] ), - 'bank_addr' => sanitize_text_field( $bank['bank_addr'] ), - 'swift' => sanitize_text_field( $bank['swift'] ), + 'ac_name' => sanitize_text_field( $bank['ac_name'] ), + 'ac_number' => sanitize_text_field( $bank['ac_number'] ), + 'bank_name' => sanitize_text_field( $bank['bank_name'] ), + 'bank_addr' => sanitize_text_field( $bank['bank_addr'] ), + 'routing_number' => sanitize_text_field( $bank['routing_number'] ), + 'iban' => sanitize_text_field( $bank['iban'] ), + 'swift' => sanitize_text_field( $bank['swift'] ), ); } @@ -694,8 +696,9 @@ function calculate_profile_completeness_value( $dokan_settings ) { } } - $track_val['next_todo'] = $next_add; - $track_val['progress'] = $profile_val; + $track_val['next_todo'] = $next_add; + $track_val['progress'] = $profile_val; + $track_val['progress_vals'] = $progress_values; return apply_filters( 'dokan_profile_completion_progress_value', $track_val ) ; } diff --git a/dokan.php b/dokan.php index e787964b57..cd29458438 100755 --- a/dokan.php +++ b/dokan.php @@ -1,11 +1,11 @@ ' ); + var isRtl = ''; var series = [ { label: "", @@ -434,7 +435,9 @@ function dokan_admin_report( $group_by = 'day', $year = '' ) { minTickSize: [1, ""], font: { color: "#aaa" - } + }, + transform: function (v) { return ( isRtl == '1' ) ? -v : v; }, + inverseTransform: function (v) { return ( isRtl == '1' ) ? -v : v; } }, yaxes: [ { diff --git a/includes/admin/admin.php b/includes/admin/admin.php index fabe978afd..0ec2e8e39f 100755 --- a/includes/admin/admin.php +++ b/includes/admin/admin.php @@ -226,7 +226,7 @@ function admin_menu() { $withdraw_text = sprintf( __( 'Withdraw %s', 'dokan-lite' ), '' . $withdraw['pending'] . '' ); } - $dashboard = add_menu_page( __( 'Dokan', 'dokan-lite' ), __( 'Dokan', 'dokan-lite' ), $capability, 'dokan', array( $this, 'dashboard'), 'dashicons-vault', $menu_position ); + $dashboard = add_menu_page( __( 'Dokan', 'dokan-lite' ), __( 'Dokan', 'dokan-lite' ), $capability, 'dokan', array( $this, 'dashboard'), 'data:image/svg+xml;base64,' . base64_encode( '' ), $menu_position ); add_submenu_page( 'dokan', __( 'Dokan Dashboard', 'dokan-lite' ), __( 'Dashboard', 'dokan-lite' ), $capability, 'dokan', array( $this, 'dashboard' ) ); add_submenu_page( 'dokan', __( 'Withdraw', 'dokan-lite' ), $withdraw_text, $capability, 'dokan-withdraw', array( $this, 'withdraw_page' ) ); add_submenu_page( 'dokan', __( 'PRO Features', 'dokan-lite' ), __( 'PRO Features', 'dokan-lite' ), $capability, 'dokan-pro-features', array( $this, 'pro_features' ) ); @@ -379,6 +379,13 @@ function get_settings_fields() { 'type' => 'checkbox', 'default' => 'off' ), + 'disable_welcome_wizard' => array( + 'name' => 'disable_welcome_wizard', + 'label' => __( 'Disable Welcome Wizard', 'dokan-lite' ), + 'desc' => __( 'Disable welcome wizard for newly registered vendors', 'dokan-lite' ), + 'type' => 'checkbox', + 'default' => 'off' + ), ), 'dokan_withdraw' => array( 'withdraw_methods' => array( diff --git a/includes/functions.php b/includes/functions.php index ee1b6e8b8b..9071f1e25c 100755 --- a/includes/functions.php +++ b/includes/functions.php @@ -1033,15 +1033,27 @@ function dokan_get_seller_bank_details( $seller_id ) { if ( isset( $payment['ac_name'] ) ) { $details[] = sprintf( __( 'Account Name: %s', 'dokan-lite' ), $payment['ac_name'] ); } + if ( isset( $payment['ac_number'] ) ) { $details[] = sprintf( __( 'Account Number: %s', 'dokan-lite' ), $payment['ac_number'] ); } + if ( isset( $payment['bank_name'] ) ) { $details[] = sprintf( __( 'Bank Name: %s', 'dokan-lite' ), $payment['bank_name'] ); } + if ( isset( $payment['bank_addr'] ) ) { $details[] = sprintf( __( 'Address: %s', 'dokan-lite' ), $payment['bank_addr'] ); } + + if ( isset( $payment['routing_number'] ) ) { + $details[] = sprintf( __( 'Routing Number: %s', 'dokan-lite' ), $payment['routing_number'] ); + } + + if ( isset( $payment['iban'] ) ) { + $details[] = sprintf( __( 'IBAN: %s', 'dokan-lite' ), $payment['iban'] ); + } + if ( isset( $payment['swift'] ) ) { $details[] = sprintf( __( 'SWIFT: %s', 'dokan-lite' ), $payment['swift'] ); } @@ -1830,3 +1842,5 @@ function dokan_set_is_home_false_on_store() { $wp_query->is_home = false; } } + +register_sidebar( array( 'name' => __( 'Dokan Store Sidebar', 'dokan-lite' ), 'id' => 'sidebar-store' ) ); \ No newline at end of file diff --git a/includes/reports.php b/includes/reports.php index ab0fad9d3a..2bcc94f4f0 100644 --- a/includes/reports.php +++ b/includes/reports.php @@ -331,6 +331,7 @@ function dokan_sales_overview_chart_data( $start_date, $end_date, $group_by ) { jQuery(function($) { var order_data = jQuery.parseJSON( '' ); + var isRtl = ''; var series = [ { label: "", @@ -385,7 +386,9 @@ function dokan_sales_overview_chart_data( $start_date, $end_date, $group_by ) { minTickSize: [1, ""], font: { color: "#aaa" - } + }, + transform: function (v) { return ( isRtl == '1' ) ? -v : v; }, + inverseTransform: function (v) { return ( isRtl == '1' ) ? -v : v; } }, yaxes: [ { diff --git a/includes/wc-functions.php b/includes/wc-functions.php index bc4f1597d3..ce106612f5 100755 --- a/includes/wc-functions.php +++ b/includes/wc-functions.php @@ -453,34 +453,35 @@ function dokan_sub_order_get_total_coupon( $order_id ) { * @param WP_Error $error * @return \WP_Error */ -function dokan_seller_registration_errors( $error ) { - $allowed_roles = apply_filters( 'dokan_register_user_role', array( 'customer', 'seller' ) ); +if ( !function_exists( 'dokan_seller_registration_errors' ) ) { - // is the role name allowed or user is trying to manipulate? - if ( isset( $_POST['role'] ) && !in_array( $_POST['role'], $allowed_roles ) ) { - return new WP_Error( 'role-error', __( 'Cheating, eh?', 'dokan-lite' ) ); - } + function dokan_seller_registration_errors( $error ) { + $allowed_roles = apply_filters( 'dokan_register_user_role', array( 'customer', 'seller' ) ); - $role = $_POST['role']; + // is the role name allowed or user is trying to manipulate? + if ( isset( $_POST['role'] ) && !in_array( $_POST['role'], $allowed_roles ) ) { + return new WP_Error( 'role-error', __( 'Cheating, eh?', 'dokan-lite' ) ); + } - if ( $role == 'seller' ) { + $role = $_POST['role']; - $first_name = trim( $_POST['fname'] ); - if ( empty( $first_name ) ) { - return new WP_Error( 'fname-error', __( 'Please enter your first name.', 'dokan-lite' ) ); - } + $required_fields = apply_filters( 'dokan_seller_registration_required_fields', array( + 'fname' => __( 'Please enter your first name.', 'dokan-lite' ), + 'lname' => __( 'Please enter your last name.', 'dokan-lite' ), + 'phone' => __( 'Please enter your phone number.', 'dokan-lite' ), + ) ); - $last_name = trim( $_POST['lname'] ); - if ( empty( $last_name ) ) { - return new WP_Error( 'lname-error', __( 'Please enter your last name.', 'dokan-lite' ) ); - } - $phone = trim( $_POST['phone'] ); - if ( empty( $phone ) ) { - return new WP_Error( 'phone-error', __( 'Please enter your phone number.', 'dokan-lite' ) ); + if ( $role == 'seller' ) { + foreach ( $required_fields as $field => $msg ) { + if ( empty( trim( $_POST[$field] ) ) ) { + return new WP_Error( "$field-error", $msg ); + } + } } - } - return $error; + return $error; + } + } add_filter( 'woocommerce_process_registration_errors', 'dokan_seller_registration_errors' ); @@ -1134,3 +1135,21 @@ function dokan_save_account_details(){ } add_action( 'template_redirect', 'dokan_save_account_details' ); + +add_action( 'trashed_post', 'dokan_clear_product_category_cache' ); +add_action( 'deleted_post', 'dokan_clear_product_category_cache' ); +add_action( 'dokan_new_product_added', 'dokan_clear_product_category_cache' ); +add_action( 'dokan_product_updated', 'dokan_clear_product_category_cache' ); + +function dokan_clear_product_category_cache( $post_id ) { + + $product = wc_get_product( $post_id ); + + if ( !$product ) { + return; + } + + $seller_id = get_post_field( 'post_author', $post_id ); + + delete_transient( 'dokan-store-category-' . $seller_id ); +} diff --git a/includes/widgets/menu-category.php b/includes/widgets/menu-category.php index 1792f25c6a..7d74dabeee 100755 --- a/includes/widgets/menu-category.php +++ b/includes/widgets/menu-category.php @@ -12,9 +12,9 @@ function start_lvl( &$output, $depth = 0, $args = array() ) { $indent = str_repeat( "\t", $depth ); if ( $depth == 0 ) { - $output .= $indent . '
' . "\n"; + $output .= $indent . '
\n"; + $output .= "$indent \n"; } else { $output .= "$indent\n"; } @@ -30,12 +30,14 @@ function end_lvl( &$output, $depth = 0, $args = array() ) { function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) { extract( $args ); - $indent = str_repeat( "\t", $depth ); + $indent = str_repeat( "\t\r", $depth ); - if ( $depth == 1 ) { - $output .= $indent . '
' . "\n\t" .'

' . $category->name . '

' . "\n"; + if ( $depth == 0 ) { + $caret = $args['has_children'] ? ' ' : ''; + $class_name = $args['has_children'] ? ' class="has-children parent-cat-wrap"' : ' class="parent-cat-wrap"'; + $output .= $indent . '' . $category->name . $caret . '' . "\n"; } else { - $caret = $args['has_children'] ? ' ' : ''; + $caret = $args['has_children'] ? ' ' : ''; $class_name = $args['has_children'] ? ' class="has-children"' : ''; $output .= $indent . '' . $category->name . $caret . ''; } @@ -45,7 +47,7 @@ function end_el( &$output, $category, $depth = 0, $args = array() ) { $indent = str_repeat( "\t", $depth ); if ( $depth == 1 ) { - $output .= "$indent
\n"; + $output .= "$indent\n"; } else { $output .= "$indent\n"; } diff --git a/includes/widgets/store-menu-category.php b/includes/widgets/store-menu-category.php index 4b10569e50..6f41597227 100755 --- a/includes/widgets/store-menu-category.php +++ b/includes/widgets/store-menu-category.php @@ -15,10 +15,12 @@ function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) { $url = $this->store_url . 'section/' . $category->term_id; - if ( $depth == 1 ) { - $output .= $indent . '
' . "\n\t" .'

' . $category->name . '

' . "\n"; + if ( $depth == 0 ) { + $caret = $args['has_children'] ? ' ' : ''; + $class_name = $args['has_children'] ? ' class="has-children parent-cat-wrap"' : ' class="parent-cat-wrap"'; + $output .= $indent . '' . "\n\t" .'' . $category->name . $caret . '' . "\n"; } else { - $caret = $args['has_children'] ? ' ' : ''; + $caret = $args['has_children'] ? ' ' : ''; $class_name = $args['has_children'] ? ' class="has-children"' : ''; $output .= $indent . '' . $category->name . $caret . ''; } diff --git a/includes/withdraw-functions.php b/includes/withdraw-functions.php index 6f143e4905..42f670866c 100755 --- a/includes/withdraw-functions.php +++ b/includes/withdraw-functions.php @@ -136,6 +136,8 @@ function dokan_withdraw_method_bank( $store_settings ) { $account_number = isset( $store_settings['payment']['bank']['ac_number'] ) ? esc_attr( $store_settings['payment']['bank']['ac_number'] ) : ''; $bank_name = isset( $store_settings['payment']['bank']['bank_name'] ) ? esc_attr( $store_settings['payment']['bank']['bank_name'] ) : ''; $bank_addr = isset( $store_settings['payment']['bank']['bank_addr'] ) ? esc_textarea( $store_settings['payment']['bank']['bank_addr'] ) : ''; + $routing_number = isset( $store_settings['payment']['bank']['routing_number'] ) ? esc_attr( $store_settings['payment']['bank']['routing_number'] ) : ''; + $iban = isset( $store_settings['payment']['bank']['iban'] ) ? esc_attr( $store_settings['payment']['bank']['iban'] ) : ''; $swift_code = isset( $store_settings['payment']['bank']['swift'] ) ? esc_attr( $store_settings['payment']['bank']['swift'] ) : ''; ?>
@@ -162,6 +164,18 @@ function dokan_withdraw_method_bank( $store_settings ) {
+
+
+ +
+
+ +
+
+ +
+
+
diff --git a/languages/dokan-lite.pot b/languages/dokan-lite.pot index 6845fd3c21..051c3b5f19 100644 --- a/languages/dokan-lite.pot +++ b/languages/dokan-lite.pot @@ -1,10 +1,10 @@ -# Copyright (C) 2017 Tareq Hasan +# Copyright (C) 2017 weDevs # This file is distributed under the GPL2. msgid "" msgstr "" -"Project-Id-Version: Dokan (Lite) - Multi-vendor Marketplace 2.6.4\n" +"Project-Id-Version: Dokan 2.6.5\n" "Report-Msgid-Bugs-To: http://wedevs.com/support/forum/theme-support/dokan/\n" -"POT-Creation-Date: 2017-06-22 05:37:03+00:00\n" +"POT-Creation-Date: 2017-07-16 06:48:47+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -17,7 +17,7 @@ msgstr "" msgid "1" msgstr "" -#: classes/admin-user-profile.php:67 classes/seller-setup-wizard.php:268 +#: classes/admin-user-profile.php:67 classes/seller-setup-wizard.php:273 msgid "Country" msgstr "" @@ -434,13 +434,13 @@ msgstr "" #: classes/installer.php:135 includes/admin/admin.php:322 #: includes/admin/setup-wizard.php:263 includes/admin-functions.php:52 -#: includes/admin-functions.php:559 includes/admin-functions.php:583 +#: includes/admin-functions.php:562 includes/admin-functions.php:586 #: includes/wc-template.php:14 templates/my-orders.php:31 msgid "Vendor" msgstr "" #: classes/installer.php:165 includes/admin/admin.php:230 -#: includes/admin/admin.php:403 includes/template-tags.php:302 +#: includes/admin/admin.php:410 includes/template-tags.php:302 msgid "Dashboard" msgstr "" @@ -448,126 +448,126 @@ msgstr "" msgid "Store List" msgstr "" -#: classes/installer.php:177 includes/admin/admin.php:409 +#: classes/installer.php:177 includes/admin/admin.php:416 #: templates/global/header-menu.php:46 msgid "My Orders" msgstr "" -#: classes/seller-setup-wizard.php:58 includes/admin/setup-wizard.php:78 +#: classes/seller-setup-wizard.php:63 includes/admin/setup-wizard.php:78 msgid "Introduction" msgstr "" -#: classes/seller-setup-wizard.php:63 includes/admin/setup-wizard.php:83 +#: classes/seller-setup-wizard.php:68 includes/admin/setup-wizard.php:83 #: includes/template-tags.php:343 msgid "Store" msgstr "" -#: classes/seller-setup-wizard.php:68 includes/template-tags.php:349 +#: classes/seller-setup-wizard.php:73 includes/template-tags.php:349 msgid "Payment" msgstr "" -#: classes/seller-setup-wizard.php:73 includes/admin/setup-wizard.php:98 +#: classes/seller-setup-wizard.php:78 includes/admin/setup-wizard.php:98 msgid "Ready!" msgstr "" -#: classes/seller-setup-wizard.php:107 +#: classes/seller-setup-wizard.php:112 msgid "Vendor › Setup Wizard" msgstr "" -#: classes/seller-setup-wizard.php:194 +#: classes/seller-setup-wizard.php:199 msgid "Return to the Marketplace" msgstr "" -#: classes/seller-setup-wizard.php:207 +#: classes/seller-setup-wizard.php:212 msgid "Welcome to the Marketplace!" msgstr "" -#: classes/seller-setup-wizard.php:208 +#: classes/seller-setup-wizard.php:213 msgid "" "Thank you for choosing The Marketplace to power your online store! This " "quick setup wizard will help you configure the basic settings. It’s " "completely optional and shouldn’t take longer than two minutes." msgstr "" -#: classes/seller-setup-wizard.php:209 +#: classes/seller-setup-wizard.php:214 msgid "" "No time right now? If you don’t want to go through the wizard, you can skip " "and return to the Store!" msgstr "" -#: classes/seller-setup-wizard.php:211 includes/admin/setup-wizard.php:248 +#: classes/seller-setup-wizard.php:216 includes/admin/setup-wizard.php:248 msgid "Let's Go!" msgstr "" -#: classes/seller-setup-wizard.php:212 includes/admin/setup-wizard.php:249 +#: classes/seller-setup-wizard.php:217 includes/admin/setup-wizard.php:249 msgid "Not right now" msgstr "" -#: classes/seller-setup-wizard.php:236 includes/admin/setup-wizard.php:267 +#: classes/seller-setup-wizard.php:241 includes/admin/setup-wizard.php:267 msgid "Store Setup" msgstr "" -#: classes/seller-setup-wizard.php:240 templates/settings/store-form.php:117 +#: classes/seller-setup-wizard.php:245 templates/settings/store-form.php:117 msgid "Store Product Per Page" msgstr "" -#: classes/seller-setup-wizard.php:246 +#: classes/seller-setup-wizard.php:251 msgid "Street" msgstr "" -#: classes/seller-setup-wizard.php:252 templates/settings/address-form.php:44 +#: classes/seller-setup-wizard.php:257 templates/settings/address-form.php:44 msgid "Street 2" msgstr "" -#: classes/seller-setup-wizard.php:258 templates/settings/address-form.php:60 +#: classes/seller-setup-wizard.php:263 templates/settings/address-form.php:60 msgid "City" msgstr "" -#: classes/seller-setup-wizard.php:263 +#: classes/seller-setup-wizard.php:268 msgid "Post/Zip Code" msgstr "" -#: classes/seller-setup-wizard.php:275 +#: classes/seller-setup-wizard.php:280 msgid "State" msgstr "" -#: classes/seller-setup-wizard.php:277 +#: classes/seller-setup-wizard.php:282 msgid "State Name" msgstr "" -#: classes/seller-setup-wizard.php:281 templates/settings/store-form.php:147 +#: classes/seller-setup-wizard.php:286 templates/settings/store-form.php:147 msgid "Email" msgstr "" -#: classes/seller-setup-wizard.php:284 templates/settings/store-form.php:152 +#: classes/seller-setup-wizard.php:289 templates/settings/store-form.php:152 msgid "Show email address in store" msgstr "" -#: classes/seller-setup-wizard.php:290 classes/seller-setup-wizard.php:424 +#: classes/seller-setup-wizard.php:295 classes/seller-setup-wizard.php:429 #: includes/admin/setup-wizard.php:293 includes/admin/setup-wizard.php:373 #: includes/admin/setup-wizard.php:459 msgid "Continue" msgstr "" -#: classes/seller-setup-wizard.php:291 classes/seller-setup-wizard.php:425 +#: classes/seller-setup-wizard.php:296 classes/seller-setup-wizard.php:430 #: includes/admin/setup-wizard.php:294 includes/admin/setup-wizard.php:374 #: includes/admin/setup-wizard.php:460 msgid "Skip this step" msgstr "" -#: classes/seller-setup-wizard.php:311 +#: classes/seller-setup-wizard.php:316 msgid "Select an option…" msgstr "" -#: classes/seller-setup-wizard.php:402 +#: classes/seller-setup-wizard.php:407 msgid "Payment Setup" msgstr "" -#: classes/seller-setup-wizard.php:479 +#: classes/seller-setup-wizard.php:486 msgid "Your Store is Ready!" msgstr "" -#: classes/seller-setup-wizard.php:484 +#: classes/seller-setup-wizard.php:491 msgid "Go to your Store Dashboard!" msgstr "" @@ -645,7 +645,7 @@ msgid "No product found !" msgstr "" #: classes/template-settings.php:70 classes/template-settings.php:74 -#: dokan.php:797 includes/admin/admin.php:236 includes/admin/admin.php:572 +#: dokan.php:805 includes/admin/admin.php:236 includes/admin/admin.php:579 #: includes/admin/welcome.php:20 msgid "Settings" msgstr "" @@ -683,55 +683,55 @@ msgstr "" msgid "Address field for %s is required" msgstr "" -#: classes/template-settings.php:566 +#: classes/template-settings.php:568 msgid "Add Profile Picture to gain %s%% progress" msgstr "" -#: classes/template-settings.php:585 includes/functions.php:1571 +#: classes/template-settings.php:587 includes/functions.php:1583 msgid "Facebook" msgstr "" -#: classes/template-settings.php:585 +#: classes/template-settings.php:587 msgid "Google+" msgstr "" -#: classes/template-settings.php:586 +#: classes/template-settings.php:588 msgid "Add %s profile link to gain %s%% progress" msgstr "" -#: classes/template-settings.php:600 +#: classes/template-settings.php:602 msgid "Add Phone to gain %s%% progress" msgstr "" -#: classes/template-settings.php:613 +#: classes/template-settings.php:615 msgid "Add Banner to gain %s%% progress" msgstr "" -#: classes/template-settings.php:625 +#: classes/template-settings.php:627 msgid "Add Store Name to gain %s%% progress" msgstr "" -#: classes/template-settings.php:637 +#: classes/template-settings.php:639 msgid "Add address to gain %s%% progress" msgstr "" -#: classes/template-settings.php:685 +#: classes/template-settings.php:687 msgid "Add a Payment method to gain %s%% progress" msgstr "" -#: classes/template-settings.php:693 +#: classes/template-settings.php:695 msgid "Add Map location to gain %s%% progress" msgstr "" -#: classes/template-settings.php:712 +#: classes/template-settings.php:715 msgid "Book" msgstr "" -#: classes/template-settings.php:713 +#: classes/template-settings.php:716 msgid "Dress" msgstr "" -#: classes/template-settings.php:714 +#: classes/template-settings.php:717 msgid "Electronic" msgstr "" @@ -808,17 +808,17 @@ msgid "" "20% discount on upgrades and add-on purchase." msgstr "" -#: classes/upgrade.php:75 includes/admin/admin.php:633 +#: classes/upgrade.php:75 includes/admin/admin.php:640 msgid "" "Dokan Data Update Required – We need to update your " "install to the latest version" msgstr "" -#: classes/upgrade.php:76 includes/admin/admin.php:634 +#: classes/upgrade.php:76 includes/admin/admin.php:641 msgid "Run the updater" msgstr "" -#: classes/upgrade.php:81 includes/admin/admin.php:639 +#: classes/upgrade.php:81 includes/admin/admin.php:646 msgid "" "It is strongly recommended that you backup your database before proceeding. " "Are you sure you wish to run the updater now?" @@ -836,225 +836,225 @@ msgstr "" msgid "Dokan requires %sWooCommerce%s to be installed & activated!" msgstr "" -#: dokan.php:296 +#: dokan.php:304 msgid "Available" msgstr "" -#: dokan.php:297 +#: dokan.php:305 msgid "Not Available" msgstr "" -#: dokan.php:299 +#: dokan.php:307 msgid "Are you sure?" msgstr "" -#: dokan.php:300 +#: dokan.php:308 msgid "Something went wrong. Please try again." msgstr "" -#: dokan.php:363 +#: dokan.php:371 msgid "Upload featured image" msgstr "" -#: dokan.php:364 +#: dokan.php:372 msgid "Choose a file" msgstr "" -#: dokan.php:365 +#: dokan.php:373 msgid "Add Images to Product Gallery" msgstr "" -#: dokan.php:366 +#: dokan.php:374 msgid "Set featured image" msgstr "" -#: dokan.php:367 includes/woo-views/html-product-download.php:17 +#: dokan.php:375 includes/woo-views/html-product-download.php:17 #: includes/woo-views/html-product-download.php:32 msgid "Insert file URL" msgstr "" -#: dokan.php:368 +#: dokan.php:376 msgid "Add to gallery" msgstr "" -#: dokan.php:369 +#: dokan.php:377 msgid "Sorry, this attribute option already exists, Try a different one." msgstr "" -#: dokan.php:370 +#: dokan.php:378 msgid "" "Warning! This product will not have any variations if this option is not " "checked." msgstr "" -#: dokan.php:371 +#: dokan.php:379 msgid "Enter a name for the new attribute term:" msgstr "" -#: dokan.php:372 +#: dokan.php:380 msgid "Remove this attribute?" msgstr "" -#: dokan.php:380 +#: dokan.php:388 msgid "" "Are you sure you want to link all variations? This will create a new " "variation for each and every possible combination of variation attributes " "(max %d per run)." msgstr "" -#: dokan.php:381 +#: dokan.php:389 msgid "Enter a value" msgstr "" -#: dokan.php:382 +#: dokan.php:390 msgid "Variation menu order (determines position in the list of variations)" msgstr "" -#: dokan.php:383 +#: dokan.php:391 msgid "Enter a value (fixed or %)" msgstr "" -#: dokan.php:384 +#: dokan.php:392 msgid "Are you sure you want to delete all variations? This cannot be undone." msgstr "" -#: dokan.php:385 +#: dokan.php:393 msgid "Last warning, are you sure?" msgstr "" -#: dokan.php:386 +#: dokan.php:394 msgid "Choose an image" msgstr "" -#: dokan.php:387 +#: dokan.php:395 msgid "Set variation image" msgstr "" -#: dokan.php:388 +#: dokan.php:396 msgid "variation added" msgstr "" -#: dokan.php:389 +#: dokan.php:397 msgid "variations added" msgstr "" -#: dokan.php:390 +#: dokan.php:398 msgid "No variations added" msgstr "" -#: dokan.php:391 +#: dokan.php:399 msgid "Are you sure you want to remove this variation?" msgstr "" -#: dokan.php:392 +#: dokan.php:400 msgid "Sale start date (YYYY-MM-DD format or leave blank)" msgstr "" -#: dokan.php:393 +#: dokan.php:401 msgid "Sale end date (YYYY-MM-DD format or leave blank)" msgstr "" -#: dokan.php:394 +#: dokan.php:402 msgid "Save changes before changing page?" msgstr "" -#: dokan.php:395 +#: dokan.php:403 msgid "%qty% variation" msgstr "" -#: dokan.php:396 +#: dokan.php:404 msgid "%qty% variations" msgstr "" -#: dokan.php:399 +#: dokan.php:407 msgid "Select and Crop" msgstr "" -#: dokan.php:400 +#: dokan.php:408 msgid "Choose Image" msgstr "" -#: dokan.php:401 +#: dokan.php:409 msgid "Product title is required" msgstr "" -#: dokan.php:402 +#: dokan.php:410 msgid "Product category is required" msgstr "" -#: dokan.php:435 +#: dokan.php:443 msgid "This field is required" msgstr "" -#: dokan.php:436 +#: dokan.php:444 msgid "Please fix this field." msgstr "" -#: dokan.php:437 +#: dokan.php:445 msgid "Please enter a valid email address." msgstr "" -#: dokan.php:438 +#: dokan.php:446 msgid "Please enter a valid URL." msgstr "" -#: dokan.php:439 +#: dokan.php:447 msgid "Please enter a valid date." msgstr "" -#: dokan.php:440 +#: dokan.php:448 msgid "Please enter a valid date (ISO)." msgstr "" -#: dokan.php:441 +#: dokan.php:449 msgid "Please enter a valid number." msgstr "" -#: dokan.php:442 +#: dokan.php:450 msgid "Please enter only digits." msgstr "" -#: dokan.php:443 +#: dokan.php:451 msgid "Please enter a valid credit card number." msgstr "" -#: dokan.php:444 +#: dokan.php:452 msgid "Please enter the same value again." msgstr "" -#: dokan.php:445 +#: dokan.php:453 msgid "Please enter no more than {0} characters." msgstr "" -#: dokan.php:446 +#: dokan.php:454 msgid "Please enter at least {0} characters." msgstr "" -#: dokan.php:447 +#: dokan.php:455 msgid "Please enter a value between {0} and {1} characters long." msgstr "" -#: dokan.php:448 +#: dokan.php:456 msgid "Please enter a value between {0} and {1}." msgstr "" -#: dokan.php:449 +#: dokan.php:457 msgid "Please enter a value less than or equal to {0}." msgstr "" -#: dokan.php:450 +#: dokan.php:458 msgid "Please enter a value greater than or equal to {0}." msgstr "" -#: dokan.php:762 +#: dokan.php:770 msgid "Page %s" msgstr "" -#: dokan.php:794 +#: dokan.php:802 msgid "Get Pro" msgstr "" -#: dokan.php:798 includes/admin/welcome.php:21 +#: dokan.php:806 includes/admin/welcome.php:21 msgid "Documentation" msgstr "" @@ -1089,7 +1089,7 @@ msgid "- select -" msgstr "" #: includes/admin/admin.php:223 includes/admin/admin.php:231 -#: includes/admin/admin.php:558 includes/admin/dashboard.php:72 +#: includes/admin/admin.php:565 includes/admin/dashboard.php:72 #: includes/admin/setup-wizard.php:93 includes/template-tags.php:321 #: templates/withdraw/header.php:11 msgid "Withdraw" @@ -1099,16 +1099,16 @@ msgstr "" msgid "Withdraw %s" msgstr "" -#: includes/admin/admin.php:229 includes/admin/admin.php:542 +#. Plugin Name of the plugin/theme msgid "Dokan" msgstr "" -#: includes/admin/admin.php:230 includes/admin/admin.php:551 +#: includes/admin/admin.php:230 includes/admin/admin.php:558 #: includes/admin/dashboard.php:96 msgid "Dokan Dashboard" msgstr "" -#: includes/admin/admin.php:232 includes/admin/admin.php:565 +#: includes/admin/admin.php:232 includes/admin/admin.php:572 msgid "PRO Features" msgstr "" @@ -1243,39 +1243,47 @@ msgstr "" msgid "Disable add new product in popup view" msgstr "" -#: includes/admin/admin.php:386 includes/admin/setup-wizard.php:414 +#: includes/admin/admin.php:384 +msgid "Disable Welcome Wizard" +msgstr "" + +#: includes/admin/admin.php:385 +msgid "Disable welcome wizard for newly registered vendors" +msgstr "" + +#: includes/admin/admin.php:393 includes/admin/setup-wizard.php:414 msgid "Withdraw Methods" msgstr "" -#: includes/admin/admin.php:387 +#: includes/admin/admin.php:394 msgid "Withdraw methods for vendors" msgstr "" -#: includes/admin/admin.php:394 includes/admin/setup-wizard.php:441 +#: includes/admin/admin.php:401 includes/admin/setup-wizard.php:441 msgid "Minimum Withdraw Limit" msgstr "" -#: includes/admin/admin.php:395 +#: includes/admin/admin.php:402 msgid "" "Minimum balance required to make a withdraw request. Leave blank to set no " "minimum limits." msgstr "" -#: includes/admin/admin.php:415 +#: includes/admin/admin.php:422 msgid "Terms and Conditions Page" msgstr "" -#: includes/admin/admin.php:423 +#: includes/admin/admin.php:430 msgid "Vendor Setup Wizard Logo" msgstr "" -#: includes/admin/admin.php:425 +#: includes/admin/admin.php:432 msgid "" "Recommended Logo size ( 270px X 90px ). If no logo is uploaded, site title " "is shown by default." msgstr "" -#: includes/admin/admin.php:429 +#: includes/admin/admin.php:436 msgid "Store Header Template" msgstr "" @@ -1580,29 +1588,29 @@ msgstr "" msgid "Toggle Sub-orders" msgstr "" -#: includes/admin-functions.php:374 includes/admin-functions.php:733 +#: includes/admin-functions.php:375 includes/admin-functions.php:736 msgid "Total Sales" msgstr "" -#: includes/admin-functions.php:381 includes/admin-functions.php:740 +#: includes/admin-functions.php:382 includes/admin-functions.php:743 msgid "Total: " msgstr "" -#: includes/admin-functions.php:384 includes/admin-functions.php:743 -#: includes/reports.php:346 +#: includes/admin-functions.php:385 includes/admin-functions.php:746 +#: includes/reports.php:347 msgid "Number of orders" msgstr "" -#: includes/admin-functions.php:391 includes/admin-functions.php:750 -#: includes/reports.php:353 +#: includes/admin-functions.php:392 includes/admin-functions.php:753 +#: includes/reports.php:354 msgid "sales" msgstr "" -#: includes/admin-functions.php:394 includes/admin-functions.php:753 +#: includes/admin-functions.php:395 includes/admin-functions.php:756 msgid "Commision" msgstr "" -#: includes/admin-functions.php:401 includes/admin-functions.php:760 +#: includes/admin-functions.php:402 includes/admin-functions.php:763 msgid "Commision: " msgstr "" @@ -1647,107 +1655,119 @@ msgstr "" msgid "Account Name: %s" msgstr "" -#: includes/functions.php:1037 +#: includes/functions.php:1038 msgid "Account Number: %s" msgstr "" -#: includes/functions.php:1040 +#: includes/functions.php:1042 msgid "Bank Name: %s" msgstr "" -#: includes/functions.php:1043 +#: includes/functions.php:1046 msgid "Address: %s" msgstr "" -#: includes/functions.php:1046 +#: includes/functions.php:1050 +msgid "Routing Number: %s" +msgstr "" + +#: includes/functions.php:1054 +msgid "IBAN: %s" +msgstr "" + +#: includes/functions.php:1058 msgid "SWIFT: %s" msgstr "" -#: includes/functions.php:1335 +#: includes/functions.php:1347 msgid "- Select a location -" msgstr "" -#: includes/functions.php:1339 includes/functions.php:1362 +#: includes/functions.php:1351 includes/functions.php:1374 msgid "Everywhere Else" msgstr "" -#: includes/functions.php:1358 +#: includes/functions.php:1370 msgid "- Select a State -" msgstr "" -#: includes/functions.php:1380 +#: includes/functions.php:1392 msgid "Ready to ship in..." msgstr "" -#: includes/functions.php:1381 +#: includes/functions.php:1393 msgid "1 business day" msgstr "" -#: includes/functions.php:1382 +#: includes/functions.php:1394 msgid "1-2 business day" msgstr "" -#: includes/functions.php:1383 +#: includes/functions.php:1395 msgid "1-3 business day" msgstr "" -#: includes/functions.php:1384 +#: includes/functions.php:1396 msgid "3-5 business day" msgstr "" -#: includes/functions.php:1385 +#: includes/functions.php:1397 msgid "1-2 weeks" msgstr "" -#: includes/functions.php:1386 +#: includes/functions.php:1398 msgid "2-3 weeks" msgstr "" -#: includes/functions.php:1387 +#: includes/functions.php:1399 msgid "3-4 weeks" msgstr "" -#: includes/functions.php:1388 +#: includes/functions.php:1400 msgid "4-6 weeks" msgstr "" -#: includes/functions.php:1389 +#: includes/functions.php:1401 msgid "6-8 weeks" msgstr "" -#: includes/functions.php:1489 +#: includes/functions.php:1501 msgid "All dates" msgstr "" -#: includes/functions.php:1502 +#: includes/functions.php:1514 #. translators: 1: month name, 2: 4-digit year msgid "%1$s %2$d" msgstr "" -#: includes/functions.php:1575 +#: includes/functions.php:1587 msgid "Google Plus" msgstr "" -#: includes/functions.php:1579 +#: includes/functions.php:1591 msgid "Twitter" msgstr "" -#: includes/functions.php:1583 +#: includes/functions.php:1595 msgid "LinkedIn" msgstr "" -#: includes/functions.php:1587 +#: includes/functions.php:1599 msgid "Youtube" msgstr "" -#: includes/functions.php:1591 +#: includes/functions.php:1603 msgid "Instagram" msgstr "" -#: includes/functions.php:1595 +#: includes/functions.php:1607 msgid "Flickr" msgstr "" +#: includes/functions.php:1846 +msgid "Dokan Store Sidebar" +msgstr "" + #: includes/order-functions.php:321 msgid "Mark parent order completed when all child orders are completed." msgstr "" @@ -1946,7 +1966,7 @@ msgstr "" msgid "Hidden" msgstr "" -#: includes/reports.php:336 +#: includes/reports.php:337 msgid "Sales total" msgstr "" @@ -2024,91 +2044,91 @@ msgstr "" msgid "Product SKU must be unique." msgstr "" -#: includes/wc-functions.php:461 +#: includes/wc-functions.php:463 msgid "Cheating, eh?" msgstr "" -#: includes/wc-functions.php:470 +#: includes/wc-functions.php:469 msgid "Please enter your first name." msgstr "" -#: includes/wc-functions.php:475 +#: includes/wc-functions.php:470 msgid "Please enter your last name." msgstr "" -#: includes/wc-functions.php:479 +#: includes/wc-functions.php:471 msgid "Please enter your phone number." msgstr "" -#: includes/wc-functions.php:929 +#: includes/wc-functions.php:930 msgid "No ratings found yet!" msgstr "" -#: includes/wc-functions.php:933 +#: includes/wc-functions.php:934 msgid "%s rating from %d review" msgid_plural "%s rating from %d reviews" msgstr[0] "" msgstr[1] "" -#: includes/wc-functions.php:934 +#: includes/wc-functions.php:935 msgid "Rated %s out of %d" msgstr "" -#: includes/wc-functions.php:973 +#: includes/wc-functions.php:974 msgid "Your {site_title} order receipt from {order_date}" msgstr "" -#: includes/wc-functions.php:974 +#: includes/wc-functions.php:975 msgid "Your {site_title} order from {order_date} is complete" msgstr "" -#: includes/wc-functions.php:1071 +#: includes/wc-functions.php:1072 #: templates/global/seller-registration-form.php:15 msgid "First Name" msgstr "" -#: includes/wc-functions.php:1072 +#: includes/wc-functions.php:1073 #: templates/global/seller-registration-form.php:20 msgid "Last Name" msgstr "" -#: includes/wc-functions.php:1073 templates/dashboard/edit-account.php:62 +#: includes/wc-functions.php:1074 templates/dashboard/edit-account.php:62 msgid "Email address" msgstr "" -#: includes/wc-functions.php:1078 +#: includes/wc-functions.php:1079 msgid "is a required field." msgstr "" -#: includes/wc-functions.php:1084 +#: includes/wc-functions.php:1085 msgid "Please provide a valid email address." msgstr "" -#: includes/wc-functions.php:1086 +#: includes/wc-functions.php:1087 msgid "This email address is already registered." msgstr "" -#: includes/wc-functions.php:1092 +#: includes/wc-functions.php:1093 msgid "Your current password is incorrect." msgstr "" -#: includes/wc-functions.php:1097 +#: includes/wc-functions.php:1098 msgid "Please fill out all password fields." msgstr "" -#: includes/wc-functions.php:1100 +#: includes/wc-functions.php:1101 msgid "Please enter your current password." msgstr "" -#: includes/wc-functions.php:1103 +#: includes/wc-functions.php:1104 msgid "Please re-enter your password." msgstr "" -#: includes/wc-functions.php:1106 +#: includes/wc-functions.php:1107 msgid "New passwords do not match." msgstr "" -#: includes/wc-functions.php:1127 +#: includes/wc-functions.php:1128 msgid "Account details changed successfully." msgstr "" @@ -2121,7 +2141,7 @@ msgid "Best Selling Product" msgstr "" #: includes/widgets/bestselling-product.php:62 -#: includes/widgets/menu-category.php:147 includes/widgets/store-contact.php:87 +#: includes/widgets/menu-category.php:149 includes/widgets/store-contact.php:87 #: includes/widgets/store-location.php:90 includes/widgets/store-menu.php:70 #: includes/widgets/top-rated-product.php:61 msgid "Title:" @@ -2137,11 +2157,11 @@ msgstr "" msgid "Show Product Rating" msgstr "" -#: includes/widgets/menu-category.php:70 +#: includes/widgets/menu-category.php:72 msgid "Dokan product category menu" msgstr "" -#: includes/widgets/menu-category.php:141 +#: includes/widgets/menu-category.php:143 msgid "Product Category" msgstr "" @@ -2209,23 +2229,31 @@ msgstr "" msgid "E-mail" msgstr "" -#: includes/withdraw-functions.php:143 +#: includes/withdraw-functions.php:145 msgid "Your bank account name" msgstr "" -#: includes/withdraw-functions.php:149 +#: includes/withdraw-functions.php:151 msgid "Your bank account number" msgstr "" -#: includes/withdraw-functions.php:155 +#: includes/withdraw-functions.php:157 msgid "Name of bank" msgstr "" -#: includes/withdraw-functions.php:161 +#: includes/withdraw-functions.php:163 msgid "Address of your bank" msgstr "" -#: includes/withdraw-functions.php:167 +#: includes/withdraw-functions.php:169 +msgid "Routing number" +msgstr "" + +#: includes/withdraw-functions.php:175 +msgid "IBAN" +msgstr "" + +#: includes/withdraw-functions.php:181 msgid "Swift code" msgstr "" @@ -3301,10 +3329,6 @@ msgstr "" msgid "Approved Requests" msgstr "" -#. Plugin Name of the plugin/theme -msgid "Dokan (Lite) - Multi-vendor Marketplace" -msgstr "" - #. Plugin URI of the plugin/theme msgid "https://wordpress.org/plugins/dokan-lite/" msgstr "" @@ -3316,11 +3340,11 @@ msgid "" msgstr "" #. Author of the plugin/theme -msgid "Tareq Hasan" +msgid "weDevs" msgstr "" #. Author URI of the plugin/theme -msgid "http://tareq.co/" +msgid "https://wedevs.com/" msgstr "" #: includes/admin/setup-wizard.php:40 diff --git a/package.json b/package.json index 3c8c4a1a23..aa52c1ef3f 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "dokan", - "version": "2.6.4", + "version": "2.6.5", "description": "A WordPress marketplace plugin", - "author": "Tareq Hasan", + "author": "weDevs", "license": "GPL", "private": true, "devDependencies": { diff --git a/readme.txt b/readme.txt index 510898ae40..6a0275a122 100644 --- a/readme.txt +++ b/readme.txt @@ -4,6 +4,8 @@ Donate Link: http://tareq.co/donate/ Tags: woocommerce, multivendor, multi-vendor, paypal, shop, vendor, seller, store, sell, online, amazon, dokan, ebay, Etsy, multi seller, multi store, multi vendor, multi vendors, multistore, multivendor, product vendor, product vendors, vendor, vendor system, vendors, wc market place, wc marketplace, wc vendors, woo vendors, woocommerce market place, woocommerce marketplace, woocommerce multi vendor, commission rate, e-commerce, ebay, ecommerce, yith, yithemes Requires at least: 4.4 Tested up to: 4.8 +WC requires at least: 2.6 +WC tested up to: 3.1.1 Stable tag: trunk License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -30,7 +32,7 @@ We regularly keep our version updated for flawless operation and integration wit **A really scalable market** -You can have unlimited vendors and vendors can create unlimited products. Currently 4 product types are supported eg. physical product, downloadable product, variable product and bookable products through the [Dokan WC Bookings](https://wedevs.com/products/plugins/dokan/woocommerce-booking-integration/) add on. +You can have unlimited vendors and vendors can create unlimited products. Currently 5 product types are supported eg. physical product, downloadable product, variable product, bookable products through the [Dokan WC Bookings](https://wedevs.com/products/plugins/dokan/woocommerce-booking-integration/) add on and auction products through the [Dokan Simple Auction](https://wedevs.com/products/plugins/dokan/dokan-simple-auctions/) add on. **Earn in many ways** @@ -178,6 +180,20 @@ A. Just install and activate the PRO version without deleting the free plugin. A == Changelog == +v2.6.5 -> July 16, 2017 +--------------------- +- [new] Added IBAN and Routing number fields for vendor's Bank info section +- [new] Added settings in admin panel to disable Vendor Welcome Wizard +- [new] Added filter `dokan_seller_registration_required_fields` +- [new] Store Category widget design updated +- [new] Added Dokan logo as menu icon in admin dashboard +- [new] Dokan Store Sidebar widget area now available for all themes +- [fix] Store categories are not updating properly +- [fix] Showing store location widget if location is not set +- [fix] Withdraw not working for IP address with port number +- [tweak] Enahanced RTL support +- [tweak] Profile Completion progress filter args updated + v2.6.4 -> June 22, 2017 --------------------- - [fix] Store page product loop pagination not showing diff --git a/templates/orders/details.php b/templates/orders/details.php index c8aecaff2c..c1b0460269 100755 --- a/templates/orders/details.php +++ b/templates/orders/details.php @@ -12,7 +12,7 @@ $order = new WC_Order( $order_id ); ?>
-
+
@@ -119,7 +119,7 @@ -
+
@@ -128,7 +128,7 @@
-
+
@@ -152,7 +152,7 @@
-
+
diff --git a/templates/products/listing-filter.php b/templates/products/listing-filter.php index 911c160711..034213f006 100644 --- a/templates/products/listing-filter.php +++ b/templates/products/listing-filter.php @@ -10,7 +10,7 @@ ?> -
+
@@ -45,13 +45,13 @@ - + - + -
+
diff --git a/templates/store.php b/templates/store.php index 74d4f04c12..a62343e037 100644 --- a/templates/store.php +++ b/templates/store.php @@ -33,7 +33,7 @@ if ( class_exists( 'Dokan_Store_Location' ) ) { the_widget( 'Dokan_Store_Category_Menu', array( 'title' => __( 'Store Category', 'dokan-lite' ) ), $args ); - if ( dokan_get_option( 'store_map', 'dokan_general', 'on' ) == 'on' ) { + if ( dokan_get_option( 'store_map', 'dokan_general', 'on' ) == 'on' && !empty( $map_location ) ) { the_widget( 'Dokan_Store_Location', array( 'title' => __( 'Store Location', 'dokan-lite' ) ), $args ); }