WordPress.org
Get WordPress

Plugin Directory

Changeset 2144282


Ignore:
Timestamp:
08/23/2019 09:57:21 AM (7 years ago)
Author:
sabbir1991
Message:

Deploy version v2.9.20

Location:
dokan-lite/trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • dokan-lite/trunk/assets/js/vue-admin.js

    r2129956 r2144282  
    25372537            let settings = this.allSettingsValues;
    25382538
    2539             if ('dokan_general' in settings && 'gmap_api_key' in settings.dokan_general) {
    2540                 return settings.dokan_general.gmap_api_key;
     2539            if ('dokan_appearance' in settings && 'gmap_api_key' in settings.dokan_appearance) {
     2540                return settings.dokan_appearance.gmap_api_key;
    25412541            }
    25422542        }

  • dokan-lite/trunk/classes/template-dashboard.php

    r1995740 r2144282  
    7979        }
    8080
     81        if ( ! (array) $this->orders_count ) {
     82            return;
     83        }
     84
    8185        dokan_get_template_part( 'dashboard/big-counter-widget', '', array(
    8286            'pageviews'      => $this->pageviews,
    … …  
    99103        }
    100104
     105        if ( ! (array) $this->orders_count ) {
     106            return;
     107        }
     108
    101109        $order_data = array(
    102110            array(

  • dokan-lite/trunk/dokan.php

    r2129956 r2144282  
    44Plugin URI: https://wordpress.org/plugins/dokan-lite/
    55Description: An e-commerce marketplace plugin for WordPress. Powered by WooCommerce and weDevs.
    6 Version: 2.9.19
     6Version: 2.9.20
    77Author: weDevs, LLC
    88Author URI: https://wedevs.com/
    99Text Domain: dokan-lite
    1010WC requires at least: 3.0
    11 WC tested up to: 3.6.5
     11WC tested up to: 3.7.0
    1212Domain Path: /languages/
    1313License: GPL2
    … …  
    7979     * @var string
    8080     */
    81     public $version = '2.9.19';
     81    public $version = '2.9.20';
    8282
    8383    /**
    … …  
    145145     * @param $prop
    146146     *
    147      * @return mixed
     147     * @return Class Instance
    148148     */
    149149    public function __get( $prop ) {
    … …  
    151151            return $this->container[ $prop ];
    152152        }
    153 
    154         return $this->{$prop};
    155153    }
    156154

  • dokan-lite/trunk/includes/functions.php

    r2129956 r2144282  
    20092009    }
    20102010
    2011     $vendor      = dokan()->vendor->get( $user->ID );
     2011    $vendor = dokan()->vendor;
     2012
     2013    if ( ! $vendor ) {
     2014        return $url;
     2015    }
     2016
     2017    $vendor      = $vendor->get( $user->ID );
    20122018    $gravatar_id = $vendor->get_avatar_id();
    20132019

  • dokan-lite/trunk/languages/dokan-lite.pot

    r2129956 r2144282  
    33msgid ""
    44msgstr ""
    5 "Project-Id-Version: Dokan 2.9.19\n"
     5"Project-Id-Version: Dokan 2.9.20\n"
    66"Report-Msgid-Bugs-To: https://wedevs.com/contact/\n"
    7 "POT-Creation-Date: 2019-07-29 05:14:28+00:00\n"
     7"POT-Creation-Date: 2019-08-23 09:48:15+00:00\n"
    88"MIME-Version: 1.0\n"
    99"Content-Type: text/plain; charset=utf-8\n"
    … …  
    445445msgstr ""
    446446
    447 #: classes/template-dashboard.php:105 includes/admin/setup-wizard.php:535
     447#: classes/template-dashboard.php:113 includes/admin/setup-wizard.php:535
    448448#: includes/order-functions.php:497 templates/dashboard/orders-widget.php:26
    449449msgid "Completed"
    450450msgstr ""
    451451
    452 #: classes/template-dashboard.php:110 templates/dashboard/orders-widget.php:31
     452#: classes/template-dashboard.php:118 templates/dashboard/orders-widget.php:31
    453453msgid "Pending"
    454454msgstr ""
    455455
    456 #: classes/template-dashboard.php:115 includes/admin/setup-wizard.php:541
     456#: classes/template-dashboard.php:123 includes/admin/setup-wizard.php:541
    457457#: includes/order-functions.php:512 templates/dashboard/orders-widget.php:36
    458458#: templates/orders/listing.php:137
    … …  
    460460msgstr ""
    461461
    462 #: classes/template-dashboard.php:120 includes/order-functions.php:522
     462#: classes/template-dashboard.php:128 includes/order-functions.php:522
    463463#: templates/dashboard/orders-widget.php:41
    464464msgid "Cancelled"
    465465msgstr ""
    466466
    467 #: classes/template-dashboard.php:125 includes/order-functions.php:517
     467#: classes/template-dashboard.php:133 includes/order-functions.php:517
    468468#: templates/dashboard/orders-widget.php:46
    469469msgid "Refunded"
    470470msgstr ""
    471471
    472 #: classes/template-dashboard.php:130
     472#: classes/template-dashboard.php:138
    473473msgid "On Hold"
    474474msgstr ""
    … …  
    520520
    521521#: classes/template-settings.php:70 classes/template-settings.php:74
    522 #: dokan.php:493 includes/admin/class-admin.php:146
     522#: dokan.php:491 includes/admin/class-admin.php:146
    523523#: includes/admin/class-admin.php:207 includes/template-tags.php:354
    524524#: src/admin/pages/Settings.vue:3
    … …  
    675675msgstr ""
    676676
    677 #: dokan.php:212
     677#: dokan.php:210
    678678msgid ""
    679679"The Minimum PHP Version Requirement for <b>Dokan</b> is %s. You are Running "
    … …  
    681681msgstr ""
    682682
    683 #: dokan.php:490
     683#: dokan.php:488
    684684msgid "Get Pro"
    685685msgstr ""
    686686
    687 #: dokan.php:494
     687#: dokan.php:492
    688688msgid "Documentation"
    689689msgstr ""
    690690
    691 #: dokan.php:525
     691#: dokan.php:523
    692692msgid ""
    693693"Dokan requires WooCommerce to be installed and active. You can activate %s "
    … …  
    10551055msgstr ""
    10561056
    1057 #: includes/admin/class-settings.php:502 includes/functions.php:3463
     1057#: includes/admin/class-settings.php:502 includes/functions.php:3469
    10581058msgid ""
    10591059"Your personal data will be used to support your experience throughout this "
    … …  
    29922992msgstr ""
    29932993
    2994 #: includes/class-dokan-privacy.php:195 includes/functions.php:2324
     2994#: includes/class-dokan-privacy.php:195 includes/functions.php:2330
    29952995msgid "Facebook"
    29962996msgstr ""
    29972997
    2998 #: includes/class-dokan-privacy.php:196 includes/functions.php:2328
     2998#: includes/class-dokan-privacy.php:196 includes/functions.php:2334
    29992999msgid "Google Plus"
    30003000msgstr ""
    30013001
    3002 #: includes/class-dokan-privacy.php:197 includes/functions.php:2332
     3002#: includes/class-dokan-privacy.php:197 includes/functions.php:2338
    30033003msgid "Twitter"
    30043004msgstr ""
    30053005
    3006 #: includes/class-dokan-privacy.php:198 includes/functions.php:2336
     3006#: includes/class-dokan-privacy.php:198 includes/functions.php:2342
    30073007msgid "Pinterest"
    30083008msgstr ""
    … …  
    30123012msgstr ""
    30133013
    3014 #: includes/class-dokan-privacy.php:200 includes/functions.php:2344
     3014#: includes/class-dokan-privacy.php:200 includes/functions.php:2350
    30153015msgid "Youtube"
    30163016msgstr ""
    30173017
    3018 #: includes/class-dokan-privacy.php:201 includes/functions.php:2348
     3018#: includes/class-dokan-privacy.php:201 includes/functions.php:2354
    30193019msgid "Instagram"
    30203020msgstr ""
    30213021
    3022 #: includes/class-dokan-privacy.php:202 includes/functions.php:2352
     3022#: includes/class-dokan-privacy.php:202 includes/functions.php:2358
    30233023msgid "Flickr"
    30243024msgstr ""
    … …  
    34953495msgstr ""
    34963496
    3497 #: includes/functions.php:2060
     3497#: includes/functions.php:2066
    34983498msgid "- Select a location -"
    34993499msgstr ""
    35003500
    3501 #: includes/functions.php:2064 includes/functions.php:2087
     3501#: includes/functions.php:2070 includes/functions.php:2093
    35023502msgid "Everywhere Else"
    35033503msgstr ""
    35043504
    3505 #: includes/functions.php:2083
     3505#: includes/functions.php:2089
    35063506msgid "- Select a State -"
    35073507msgstr ""
    35083508
    3509 #: includes/functions.php:2105
     3509#: includes/functions.php:2111
    35103510msgid "Ready to ship in..."
    35113511msgstr ""
    35123512
    3513 #: includes/functions.php:2106
     3513#: includes/functions.php:2112
    35143514msgid "1 business day"
    35153515msgstr ""
    35163516
    3517 #: includes/functions.php:2107
     3517#: includes/functions.php:2113
    35183518msgid "1-2 business day"
    35193519msgstr ""
    35203520
    3521 #: includes/functions.php:2108
     3521#: includes/functions.php:2114
    35223522msgid "1-3 business day"
    35233523msgstr ""
    35243524
    3525 #: includes/functions.php:2109
     3525#: includes/functions.php:2115
    35263526msgid "3-5 business day"
    35273527msgstr ""
    35283528
    3529 #: includes/functions.php:2110
     3529#: includes/functions.php:2116
    35303530msgid "1-2 weeks"
    35313531msgstr ""
    35323532
    3533 #: includes/functions.php:2111
     3533#: includes/functions.php:2117
    35343534msgid "2-3 weeks"
    35353535msgstr ""
    35363536
    3537 #: includes/functions.php:2112
     3537#: includes/functions.php:2118
    35383538msgid "3-4 weeks"
    35393539msgstr ""
    35403540
    3541 #: includes/functions.php:2113
     3541#: includes/functions.php:2119
    35423542msgid "4-6 weeks"
    35433543msgstr ""
    35443544
    3545 #: includes/functions.php:2114
     3545#: includes/functions.php:2120
    35463546msgid "6-8 weeks"
    35473547msgstr ""
    35483548
    3549 #: includes/functions.php:2233
     3549#: includes/functions.php:2239
    35503550msgid "All dates"
    35513551msgstr ""
    35523552
    3553 #: includes/functions.php:2248
     3553#: includes/functions.php:2254
    35543554#. translators: 1: month name, 2: 4-digit year
    35553555msgid "%1$s %2$d"
    35563556msgstr ""
    35573557
    3558 #: includes/functions.php:2340
     3558#: includes/functions.php:2346
    35593559msgid "LinkedIn"
    35603560msgstr ""
    35613561
    3562 #: includes/functions.php:2618
     3562#: includes/functions.php:2624
    35633563msgid "Dokan Store Sidebar"
    35643564msgstr ""
    35653565
    3566 #: includes/functions.php:2884
     3566#: includes/functions.php:2890
    35673567msgid "View sales overview"
    35683568msgstr ""
    35693569
    3570 #: includes/functions.php:2885
     3570#: includes/functions.php:2891
    35713571msgid "View sales report chart"
    35723572msgstr ""
    35733573
    3574 #: includes/functions.php:2886
     3574#: includes/functions.php:2892
    35753575msgid "View announcement"
    35763576msgstr ""
    35773577
    3578 #: includes/functions.php:2887
     3578#: includes/functions.php:2893
    35793579msgid "View order report"
    35803580msgstr ""
    35813581
    3582 #: includes/functions.php:2888
     3582#: includes/functions.php:2894
    35833583msgid "View review report"
    35843584msgstr ""
    35853585
    3586 #: includes/functions.php:2889
     3586#: includes/functions.php:2895
    35873587msgid "View product status report"
    35883588msgstr ""
    35893589
    3590 #: includes/functions.php:2892
     3590#: includes/functions.php:2898
    35913591msgid "View overview report"
    35923592msgstr ""
    35933593
    3594 #: includes/functions.php:2893
     3594#: includes/functions.php:2899
    35953595msgid "View daily sales report"
    35963596msgstr ""
    35973597
    3598 #: includes/functions.php:2894
     3598#: includes/functions.php:2900
    35993599msgid "View top selling report"
    36003600msgstr ""
    36013601
    3602 #: includes/functions.php:2895
     3602#: includes/functions.php:2901
    36033603msgid "View top earning report"
    36043604msgstr ""
    36053605
    3606 #: includes/functions.php:2896
     3606#: includes/functions.php:2902
    36073607msgid "View statement report"
    36083608msgstr ""
    36093609
    3610 #: includes/functions.php:2899
     3610#: includes/functions.php:2905
    36113611msgid "View order"
    36123612msgstr ""
    36133613
    3614 #: includes/functions.php:2900
     3614#: includes/functions.php:2906
    36153615msgid "Manage order"
    36163616msgstr ""
    36173617
    3618 #: includes/functions.php:2901
     3618#: includes/functions.php:2907
    36193619msgid "Manage order note"
    36203620msgstr ""
    36213621
    3622 #: includes/functions.php:2902
     3622#: includes/functions.php:2908
    36233623msgid "Manage refund"
    36243624msgstr ""
    36253625
    3626 #: includes/functions.php:2906
     3626#: includes/functions.php:2912
    36273627msgid "Add coupon"
    36283628msgstr ""
    36293629
    3630 #: includes/functions.php:2907
     3630#: includes/functions.php:2913
    36313631msgid "Edit coupon"
    36323632msgstr ""
    36333633
    3634 #: includes/functions.php:2908
     3634#: includes/functions.php:2914
    36353635msgid "Delete coupon"
    36363636msgstr ""
    36373637
    3638 #: includes/functions.php:2911
     3638#: includes/functions.php:2917
    36393639msgid "View reviews"
    36403640msgstr ""
    36413641
    3642 #: includes/functions.php:2912
     3642#: includes/functions.php:2918
    36433643msgid "Manage reviews"
    36443644msgstr ""
    36453645
    3646 #: includes/functions.php:2916
     3646#: includes/functions.php:2922
    36473647msgid "Manage withdraw"
    36483648msgstr ""
    36493649
    3650 #: includes/functions.php:2919
     3650#: includes/functions.php:2925
    36513651msgid "Add product"
    36523652msgstr ""
    36533653
    3654 #: includes/functions.php:2920
     3654#: includes/functions.php:2926
    36553655msgid "Edit product"
    36563656msgstr ""
    36573657
    3658 #: includes/functions.php:2921
     3658#: includes/functions.php:2927
    36593659msgid "Delete product"
    36603660msgstr ""
    36613661
    3662 #: includes/functions.php:2922
     3662#: includes/functions.php:2928
    36633663msgid "View product"
    36643664msgstr ""
    36653665
    3666 #: includes/functions.php:2923
     3666#: includes/functions.php:2929
    36673667msgid "Duplicate product"
    36683668msgstr ""
    36693669
    3670 #: includes/functions.php:2924
     3670#: includes/functions.php:2930
    36713671msgid "Import product"
    36723672msgstr ""
    36733673
    3674 #: includes/functions.php:2925
     3674#: includes/functions.php:2931
    36753675msgid "Export product"
    36763676msgstr ""
    36773677
    3678 #: includes/functions.php:2928
     3678#: includes/functions.php:2934
    36793679msgid "View overview menu"
    36803680msgstr ""
    36813681
    3682 #: includes/functions.php:2929
     3682#: includes/functions.php:2935
    36833683msgid "View product menu"
    36843684msgstr ""
    36853685
    3686 #: includes/functions.php:2930
     3686#: includes/functions.php:2936
    36873687msgid "View order menu"
    36883688msgstr ""
    36893689
    3690 #: includes/functions.php:2931
     3690#: includes/functions.php:2937
    36913691msgid "View coupon menu"
    36923692msgstr ""
    36933693
    3694 #: includes/functions.php:2932
     3694#: includes/functions.php:2938
    36953695msgid "View report menu"
    36963696msgstr ""
    36973697
    3698 #: includes/functions.php:2933
     3698#: includes/functions.php:2939
    36993699msgid "Vuew review menu"
    37003700msgstr ""
    37013701
    3702 #: includes/functions.php:2934
     3702#: includes/functions.php:2940
    37033703msgid "View withdraw menu"
    37043704msgstr ""
    37053705
    3706 #: includes/functions.php:2935
     3706#: includes/functions.php:2941
    37073707msgid "View store settings menu"
    37083708msgstr ""
    37093709
    3710 #: includes/functions.php:2936
     3710#: includes/functions.php:2942
    37113711msgid "View payment settings menu"
    37123712msgstr ""
    37133713
    3714 #: includes/functions.php:2937
     3714#: includes/functions.php:2943
    37153715msgid "View shipping settings menu"
    37163716msgstr ""
    37173717
    3718 #: includes/functions.php:2938
     3718#: includes/functions.php:2944
    37193719msgid "View social settings menu"
    37203720msgstr ""
    37213721
    3722 #: includes/functions.php:2939
     3722#: includes/functions.php:2945
    37233723msgid "View seo settings menu"
    37243724msgstr ""
    37253725
    3726 #: includes/functions.php:3116
     3726#: includes/functions.php:3122
    37273727msgid "Saturday"
    37283728msgstr ""
    37293729
    3730 #: includes/functions.php:3119
     3730#: includes/functions.php:3125
    37313731msgid "Sunday"
    37323732msgstr ""
    37333733
    3734 #: includes/functions.php:3122
     3734#: includes/functions.php:3128
    37353735msgid "Monday"
    37363736msgstr ""
    37373737
    3738 #: includes/functions.php:3125
     3738#: includes/functions.php:3131
    37393739msgid "Tuesday"
    37403740msgstr ""
    37413741
    3742 #: includes/functions.php:3128
     3742#: includes/functions.php:3134
    37433743msgid "Wednesday"
    37443744msgstr ""
    37453745
    3746 #: includes/functions.php:3131
     3746#: includes/functions.php:3137
    37473747msgid "Thursday"
    37483748msgstr ""
    37493749
    3750 #: includes/functions.php:3134
     3750#: includes/functions.php:3140
    37513751msgid "Friday"
    37523752msgstr ""
    37533753
    3754 #: includes/functions.php:3137
     3754#: includes/functions.php:3143
    37553755msgid "Off Day"
    37563756msgstr ""
    37573757
    3758 #: includes/functions.php:3444
     3758#: includes/functions.php:3450
    37593759msgid "privacy policy"
    37603760msgstr ""
    37613761
    3762 #: includes/functions.php:3484
     3762#: includes/functions.php:3490
    37633763msgid "Please Login to Continue"
    37643764msgstr ""

  • dokan-lite/trunk/readme.txt

    r2129956 r2144282  
    66Tested up to: 5.2.2
    77WC requires at least: 3.0
    8 WC tested up to: 3.6.5
     8WC tested up to: 3.7.0
    99Requires PHP: 5.6
    1010Stable tag: trunk
    … …  
    285285== Changelog ==
    286286
     287v2.9.20 -> August 23, 2019
     288------------------------------------
     289-   **Fix***   Geolocation map settings value is not saving
     290-   **Fix***   Fix warning in vendor dashboard widget when seller setup wizard is not run
     291-   **Fix***   Store banner height in vendor settings page it not honouring the saved settings
     292-   **Fix***   Conflict with avada theme fution builder
     293-   **Tweak*** Use WordPress backend date format while printing date in approved and cancelled withdraw request
     294
    287295v2.9.19 -> July 29, 2019
    288296------------------------------------

  • dokan-lite/trunk/templates/settings/store-form.php

    r2129956 r2144282  
    8484                        $general_settings = get_option( 'dokan_general', [] );
    8585                        $banner_width     = dokan_get_option( 'store_banner_width', 'dokan_appearance', 625 );
    86                         $banner_height    = dokan_get_option( 'store_banner_width', 'dokan_appearance', 625 );
     86                        $banner_height    = dokan_get_option( 'store_banner_height', 'dokan_appearance', 300 );
    8787
    8888                        $help_text = sprintf(

  • dokan-lite/trunk/templates/withdraw/approved-request-listing.php

    r1994959 r2144282  
    2323            <td><?php echo wc_price( $row->amount ); ?></td>
    2424            <td><?php echo esc_html( dokan_withdraw_get_method_title( $row->method ) ); ?></td>
    25             <td><?php echo esc_html( date_i18n( 'M j, Y g:ia', strtotime( $row->date ) ) ); ?></td>
     25            <td><?php echo esc_html( date_i18n( get_option( 'date_format' ), strtotime( $row->date ) ) ); ?></td>
    2626        </tr>
    2727    <?php } ?>

  • dokan-lite/trunk/templates/withdraw/cancelled-request-listing.php

    r1994959 r2144282  
    2424            <td><?php echo wc_price( $row->amount ); ?></td>
    2525            <td><?php echo esc_html( dokan_withdraw_get_method_title( $row->method ) ); ?></td>
    26             <td><?php echo esc_html( date_i18n( 'M j, Y g:ia', strtotime( $row->date ) ) ); ?></td>
     26            <td><?php echo esc_html( date_i18n( get_option( 'date_format' ), strtotime( $row->date ) ) ); ?></td>
    2727            <td><?php echo wp_kses_post( $row->note ); ?></td>
    2828        </tr>
Note: See TracChangeset for help on using the changeset viewer.