WordPress.org
Get WordPress

Plugin Directory

Changeset 2167342


Ignore:
Timestamp:
10/03/2019 05:24:04 AM (6 years ago)
Author:
sabbir1991
Message:

Deploy version v2.9.22

Location:
dokan-lite/trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed

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

    r2162312 r2167342  
    22712271"use strict";
    22722272/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_admin_components_ColorPicker_vue__ = __webpack_require__(12);
    2273 //
    2274 //
    2275 //
    2276 //
    2277 //
    2278 //
    2279 //
    2280 //
    2281 //
    2282 //
    22832273//
    22842274//
    … …  
    49964986        : _vm._e(),
    49974987      _vm._v(" "),
    4998       "number" == _vm.fieldData.type && "admin_percentage" !== _vm.id
    4999         ? [
    5000             _c("th", { attrs: { scope: "row" } }, [
    5001               _c(
    5002                 "label",
    5003                 {
    5004                   attrs: { for: _vm.sectionId + "[" + _vm.fieldData.name + "]" }
    5005                 },
    5006                 [_vm._v(_vm._s(_vm.fieldData.label))]
    5007               )
    5008             ]),
    5009             _vm._v(" "),
    5010             _c("td", [
    5011               _c("input", {
    5012                 directives: [
    5013                   {
    5014                     name: "model",
    5015                     rawName: "v-model",
    5016                     value: _vm.fieldValue[_vm.fieldData.name],
    5017                     expression: "fieldValue[fieldData.name]"
    5018                   }
    5019                 ],
    5020                 staticClass: "regular-text",
    5021                 attrs: {
    5022                   type: "number",
    5023                   min: _vm.fieldData.min,
    5024                   max: _vm.fieldData.max,
    5025                   step: _vm.fieldData.step,
    5026                   id: _vm.sectionId + "[" + _vm.fieldData.name + "]",
    5027                   name: _vm.sectionId + "[" + _vm.fieldData.name + "]"
    5028                 },
    5029                 domProps: { value: _vm.fieldValue[_vm.fieldData.name] },
    5030                 on: {
    5031                   input: function($event) {
    5032                     if ($event.target.composing) {
    5033                       return
    5034                     }
    5035                     _vm.$set(
    5036                       _vm.fieldValue,
    5037                       _vm.fieldData.name,
    5038                       $event.target.value
    5039                     )
    5040                   }
    5041                 }
    5042               }),
    5043               _vm._v(" "),
    5044               _c("p", {
    5045                 staticClass: "description",
    5046                 domProps: { innerHTML: _vm._s(_vm.fieldData.desc) }
    5047               })
    5048             ])
    5049           ]
    5050         : _vm._e(),
    5051       _vm._v(" "),
    50524988      "textarea" == _vm.fieldData.type
    50534989        ? [

  • dokan-lite/trunk/dokan.php

    r2162664 r2167342  
    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.21
     6Version: 2.9.22
    77Author: weDevs
    88Author URI: https://wedevs.com/
    … …  
    7979     * @var string
    8080     */
    81     public $version = '2.9.21';
     81    public $version = '2.9.22';
    8282
    8383    /**

  • dokan-lite/trunk/includes/class-api-manager.php

    r2162312 r2167342  
    159159     * @param array $data
    160160     *
    161      * @since DOKAN_LITE_SINCE
     161     * @since 2.9.21
    162162     *
    163163     * @return array

  • dokan-lite/trunk/includes/class-commission.php

    r2162312 r2167342  
    88 * Dokan Commission Class
    99 *
    10  * @since DOKAN_LITE_SINCE
     10 * @since 2.9.21
    1111 */
    1212class Dokan_Commission {
    … …  
    1616     * Order id holder
    1717     *
    18      * @since DOKAN_LITE_SINCE
     18     * @since 2.9.21
    1919     *
    2020     * @var integer
    … …  
    2525     * Order quantity holder
    2626     *
    27      * @since DOKAN_LITE_SINCE
     27     * @since 2.9.21
    2828     *
    2929     * @var integer
    … …  
    3434     * Boot method
    3535     *
    36      * @since  DOKAN_LITE_SINCE
     36     * @since  2.9.21
    3737     *
    3838     * @return void
    … …  
    4545     * Init hooks
    4646     *
    47      * @since  DOKAN_LITE_SINCE
     47     * @since  2.9.21
    4848     *
    4949     * @return void
    … …  
    5656     * Hide extra meta data
    5757     *
    58      * @since  DOKAN_LITE_SINCE
     58     * @since  2.9.21
    5959     *
    6060     * @param  array
    … …  
    7878     * Set order id
    7979     *
    80      * @since  DOKAN_LITE_SINCE
     80     * @since  2.9.21
    8181     *
    8282     * @param  int $id
    … …  
    9191     * Get order id
    9292     *
    93      * @since  DOKAN_LITE_SINCE
     93     * @since  2.9.21
    9494     *
    9595     * @return int
    … …  
    102102     * Set order quantity
    103103     *
    104      * @since  DOKAN_LITE_SINCE
     104     * @since  2.9.21
    105105     *
    106106     * @param  int $number
    … …  
    115115     * Get order quantity
    116116     *
    117      * @since  DOKAN_LITE_SINCE
     117     * @since  2.9.21
    118118     *
    119119     * @return int
    … …  
    126126     * Get earning by product
    127127     *
    128      * @since  DOKAN_LITE_SINCE
     128     * @since  2.9.21
    129129     *
    130130     * @param  int|WC_Product $product
    … …  
    155155     * Get earning by order
    156156     *
    157      * @since  DOKAN_LITE_SINCE
     157     * @since  2.9.21
    158158     *
    159159     * @param  int|WC_Order $order
    … …  
    180180
    181181        if ( $saved_admin_fee != '' ) {
    182             return apply_filters( 'dokan_order_admin_commission', $saved_admin_fee, $order );
     182            $saved_fee = ( 'seller' == $context ) ? $order->get_total() - $saved_admin_fee : $saved_admin_fee;
     183            return apply_filters( 'dokan_order_admin_commission', $saved_fee, $order );
    183184        }
    184185
    … …  
    220221        }
    221222
    222         return apply_filters_deprecated( 'dokan_order_admin_commission', array( $earning, $order, $context ), 'DOKAN_LITE_SINCE', 'dokan_get_earning_by_order' );
     223        return apply_filters_deprecated( 'dokan_order_admin_commission', array( $earning, $order, $context ), '2.9.21', 'dokan_get_earning_by_order' );
    223224    }
    224225
    … …  
    226227     * Get global rate
    227228     *
    228      * @since  DOKAN_LITE_SINCE
     229     * @since  2.9.21
    229230     *
    230231     * @return float
    … …  
    237238     * Get vendor wise commission rate
    238239     *
    239      * @since  DOKAN_LITE_SINCE
     240     * @since  2.9.21
    240241     *
    241242     * @param  int $vendor_id
    … …  
    250251     * Get product wise commission rate
    251252     *
    252      * @since  DOKAN_LITE_SINCE
     253     * @since  2.9.21
    253254     *
    254255     * @param  int $product_id
    … …  
    263264     * Validate product id (if it's a variable product, return it's parent id)
    264265     *
    265      * @since  DOKAN_LITE_SINCE
     266     * @since  2.9.21
    266267     *
    267268     * @param  int $product_id
    … …  
    279280     * Get category wise commission rate
    280281     *
    281      * @since  DOKAN_LITE_SINCE
     282     * @since  2.9.21
    282283     *
    283284     * @param  int $product_id
    … …  
    301302     * Get global commission type
    302303     *
    303      * @since  DOKAN_LITE_SINCE
     304     * @since  2.9.21
    304305     *
    305306     * @return string
    … …  
    312313     * Get vendor wise commission type
    313314     *
    314      * @since  DOKAN_LITE_SINCE
     315     * @since  2.9.21
    315316     *
    316317     * @param  int $vendor_id
    … …  
    325326     * Get category wise commission type
    326327     *
    327      * @since  DOKAN_LITE_SINCE
     328     * @since  2.9.21
    328329     *
    329330     * @param  int $product_id
    … …  
    341342     * Get product wise commission type
    342343     *
    343      * @since  DOKAN_LITE_SINCE
     344     * @since  2.9.21
    344345     *
    345346     * @param  int $product_id
    … …  
    354355     * Validate commission rate
    355356     *
    356      * @since  DOKAN_LITE_SINCE
     357     * @since  2.9.21
    357358     *
    358359     * @param  float $rate
    … …  
    371372     * Get global earning
    372373     *
    373      * @since  DOKAN_LITE_SINCE
     374     * @since  2.9.21
    374375     *
    375376     * @param  float $product_price
    … …  
    384385     * Get vendor wise earning
    385386     *
    386      * @since  DOKAN_LITE_SINCE
     387     * @since  2.9.21
    387388     *
    388389     * @param  int $vendor_id
    … …  
    398399     * Get category wise earning
    399400     *
    400      * @since  DOKAN_LITE_SINCE
     401     * @since  2.9.21
    401402     *
    402403     * @param  int $product_id
    … …  
    412413     * Get product wise earning
    413414     *
    414      * @since  DOKAN_LITE_SINCE
     415     * @since  2.9.21
    415416     *
    416417     * @param  int $product_id
    … …  
    426427     * Prepare for calculation
    427428     *
    428      * @since  DOKAN_LITE_SINCE
     429     * @since  2.9.21
    429430     *
    430431     * @param  function $callable
    … …  
    540541     * Get product wise additional fee
    541542     *
    542      * @since  DOKAN_LITE_SINCE
     543     * @since  2.9.21
    543544     *
    544545     * @param  int $product_id
    … …  
    553554     * Get global wise additional fee
    554555     *
    555      * @since  DOKAN_LITE_SINCE
     556     * @since  2.9.21
    556557     *
    557558     * @param  int $product_id
    … …  
    566567     * Get vendor wise additional fee
    567568     *
    568      * @since  DOKAN_LITE_SINCE
     569     * @since  2.9.21
    569570     *
    570571     * @param  int $vendor_id
    … …  
    579580     * Get category wise additional fee
    580581     *
    581      * @since  DOKAN_LITE_SINCE
     582     * @since  2.9.21
    582583     *
    583584     * @param  int $product_id
    … …  
    601602     * Get earning from order table
    602603     *
    603      * @since  DOKAN_LITE_SINCE
     604     * @since  2.9.21
    604605     *
    605606     * @param  int $order_id
    … …  
    636637     * Get shipping fee recipient
    637638     *
    638      * @since  DOKAN_LITE_SINCE
     639     * @since  2.9.21
    639640     *
    640641     * @param  int $order_id
    … …  
    658659     * Get tax fee recipient
    659660     *
    660      * @since  DOKAN_LITE_SINCE
     661     * @since  2.9.21
    661662     *
    662663     * @param  int $order_id
    … …  
    680681     * Calculate commission (commission priority [1.product, 2.category, 3.vendor, 4.global] wise)
    681682     *
    682      * @since  DOKAN_LITE_SINCE
     683     * @since  2.9.21
    683684     *
    684685     * @param  int $product_id

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

    r2162312 r2167342  
    27982798 */
    27992799function dokan_get_earning_by_product( $product_id, $seller_id ) {
    2800     wc_deprecated_function( 'dokan_get_earning_by_product', 'DOKAN_LITE_SINCE', 'Dokan_Commission::get_earning_by_product()' );
     2800    wc_deprecated_function( 'dokan_get_earning_by_product', '2.9.21', 'Dokan_Commission::get_earning_by_product()' );
    28012801
    28022802    return dokan()->commission->get_earning_by_product( $product_id );
    … …  
    33463346function dokan_get_variable_product_earning( $product_id, $formated = true, $deprecated = false ) {
    33473347    if ( $deprecated ) {
    3348         wc_deprecated_argument( 'seller_id', 'DOKAN_LITE_SINCE', 'dokan_get_variable_product_earning() does not require a seller_id anymore.' );
     3348        wc_deprecated_argument( 'seller_id', '2.9.21', 'dokan_get_variable_product_earning() does not require a seller_id anymore.' );
    33493349    }
    33503350
    … …  
    34863486 * Dokan commission types
    34873487 *
    3488  * @since DOKAN_LITE_SINCE
     3488 * @since 2.9.21
    34893489 *
    34903490 * @return array
    … …  
    35423542 * Backward compatibile settings option map
    35433543 *
    3544  * @since DOKAN_LITE_SINCE
     3544 * @since 2.9.21
    35453545 *
    35463546 * @param string $option
    … …  
    35913591 * Add item in specefic position of an array
    35923592 *
    3593  * @since DOKAN_LITE_SINCE
     3593 * @since 2.9.21
    35943594 *
    35953595 * @param array $array

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

    r2162312 r2167342  
    670670function dokan_get_admin_commission_by( $order, $context ) {
    671671    $context = 'seller' === $context ? $context : 'admin';
    672     wc_deprecated_function( 'dokan_get_admin_commission_by', 'DOKAN_LITE_SINCE', 'Dokan_Commission::get_earning_by_order()' );
     672    wc_deprecated_function( 'dokan_get_admin_commission_by', '2.9.21', 'Dokan_Commission::get_earning_by_order()' );
    673673
    674674    return dokan()->commission->get_earning_by_order( $order, $context );

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

    r2129956 r2167342  
    599599 * Get translated product stock status
    600600 *
    601  * @since DOKAN_LITE_SINCE
     601 * @since 2.9.21
    602602 *
    603603 * @param  mix $stock

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

    r2075290 r2167342  
    115115    if ( isset( $data['attribute_names'] ) && is_array( $data['attribute_names'] ) && isset( $data['attribute_values'] ) && is_array( $data['attribute_values'] ) ) {
    116116        $attribute_names  = array_map( 'wc_clean', $data['attribute_names'] );
    117 
    118         $attribute_values = array();
    119 
    120         foreach ( $data['attribute_values'] as $values ) {
    121             $attribute_values[] = $values;
    122         }
     117        $attribute_values = array_map( function( $value ) {
     118            return $value;
     119        }, $data['attribute_values'] );
    123120
    124121        if ( isset( $data['attribute_visibility'] ) ) {

  • dokan-lite/trunk/includes/wc-template.php

    r2129956 r2167342  
    367367 * Remove store avatar set by ultimate member from store and store listing page
    368368 *
    369  * @since DOKAN_LITE_SINCE
     369 * @since 2.9.21
    370370 */
    371371add_action( 'pre_get_avatar', function() {

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

    r2162312 r2167342  
    1 # Copyright (C) 2019 weDevs, LLC
     1# Copyright (C) 2019 weDevs
    22# This file is distributed under the GPL2.
    33msgid ""
    44msgstr ""
    5 "Project-Id-Version: Dokan 2.9.21\n"
     5"Project-Id-Version: Dokan 2.9.22\n"
    66"Report-Msgid-Bugs-To: https://wedevs.com/contact/\n"
    7 "POT-Creation-Date: 2019-09-24 15:48:45+00:00\n"
     7"POT-Creation-Date: 2019-10-03 04:15:27+00:00\n"
    88"MIME-Version: 1.0\n"
    99"Content-Type: text/plain; charset=utf-8\n"
    … …  
    41944194msgstr ""
    41954195
    4196 #: includes/wc-functions.php:758
     4196#: includes/wc-functions.php:755
    41974197msgid "Your {site_title} order receipt from {order_date}"
    41984198msgstr ""
    41994199
    4200 #: includes/wc-functions.php:759
     4200#: includes/wc-functions.php:756
    42014201msgid "Your {site_title} order from {order_date} is complete"
    42024202msgstr ""
    42034203
    4204 #: includes/wc-functions.php:860 templates/account/vendor-registration.php:9
     4204#: includes/wc-functions.php:857 templates/account/vendor-registration.php:9
    42054205#: templates/global/seller-registration-form.php:15
    42064206msgid "First Name"
    42074207msgstr ""
    42084208
    4209 #: includes/wc-functions.php:861 templates/account/vendor-registration.php:14
     4209#: includes/wc-functions.php:858 templates/account/vendor-registration.php:14
    42104210#: templates/global/seller-registration-form.php:20
    42114211msgid "Last Name"
    42124212msgstr ""
    42134213
    4214 #: includes/wc-functions.php:862 templates/account/vendor-registration.php:27
     4214#: includes/wc-functions.php:859 templates/account/vendor-registration.php:27
    42154215#: templates/dashboard/edit-account.php:65
    42164216msgid "Email address"
    42174217msgstr ""
    42184218
    4219 #: includes/wc-functions.php:867
     4219#: includes/wc-functions.php:864
    42204220msgid "is a required field."
    42214221msgstr ""
    42224222
    4223 #: includes/wc-functions.php:873
     4223#: includes/wc-functions.php:870
    42244224msgid "Please provide a valid email address."
    42254225msgstr ""
    42264226
    4227 #: includes/wc-functions.php:875
     4227#: includes/wc-functions.php:872
    42284228msgid "This email address is already registered."
    42294229msgstr ""
    42304230
    4231 #: includes/wc-functions.php:881
     4231#: includes/wc-functions.php:878
    42324232msgid "Your current password is incorrect."
    42334233msgstr ""
    42344234
     4235#: includes/wc-functions.php:883
     4236msgid "Please fill out all password fields."
     4237msgstr ""
     4238
    42354239#: includes/wc-functions.php:886
    4236 msgid "Please fill out all password fields."
     4240msgid "Please enter your current password."
    42374241msgstr ""
    42384242
    42394243#: includes/wc-functions.php:889
    4240 msgid "Please enter your current password."
     4244msgid "Please re-enter your password."
    42414245msgstr ""
    42424246
    42434247#: includes/wc-functions.php:892
    4244 msgid "Please re-enter your password."
    4245 msgstr ""
    4246 
    4247 #: includes/wc-functions.php:895
    42484248msgid "New passwords do not match."
    42494249msgstr ""
    42504250
    4251 #: includes/wc-functions.php:916
     4251#: includes/wc-functions.php:913
    42524252msgid "Account details changed successfully."
    42534253msgstr ""
    42544254
    4255 #: includes/wc-functions.php:1004
     4255#: includes/wc-functions.php:1001
    42564256msgid "More Products"
    42574257msgstr ""
    42584258
    4259 #: includes/wc-functions.php:1055
     4259#: includes/wc-functions.php:1052
    42604260msgid "No product has been found!"
    42614261msgstr ""
    … …  
    44604460msgstr ""
    44614461
    4462 #: src/admin/components/Fields.vue:200
     4462#: src/admin/components/Fields.vue:190
    44634463msgid "Active"
    44644464msgstr ""
    44654465
    4466 #: src/admin/components/Fields.vue:204 src/admin/pages/Settings.vue:155
     4466#: src/admin/components/Fields.vue:194 src/admin/pages/Settings.vue:155
    44674467msgid "Select"
    44684468msgstr ""
    … …  
    59845984
    59855985#. Author of the plugin/theme
    5986 msgid "weDevs, LLC"
     5986msgid "weDevs"
    59875987msgstr ""
    59885988

  • dokan-lite/trunk/lib/class.category-walker.php

    r2162312 r2167342  
    4545        } else {
    4646            $commission_val = dokan()->commission->get_earning_by_product( $this->post_id );
     47
     48            if ( is_wp_error( $commission_val ) ) {
     49                $commission_val = 0;
     50            }
    4751        }
    4852

  • dokan-lite/trunk/lib/class.taxonomy-walker.php

    r2162312 r2167342  
    5353        } else {
    5454            $commission_val = dokan()->commission->get_earning_by_product( $this->post_id );
     55
     56            if ( is_wp_error( $commission_val ) ) {
     57                $commission_val = 0;
     58            }
    5559        }
    5660

  • dokan-lite/trunk/readme.txt

    r2162664 r2167342  
    1818= DOKAN MULTIVENDOR MARKETPLACE PLUGIN FOR WORDPRESS =
    1919
    20 👉 Official Free Demo Link: [Official Demo](https://wedevs.com/in/dokandemo)
     20👉 Official Free Demo Link: [Official Demo](https://wedevs.com/dokan/demo)
    2121👉 Learn More About Dokan(PRO): [All The Features of Dokan](https://wedevs.com/dokan/features/)
    2222
    … …  
    285285== Changelog ==
    286286
     287v2.9.22 -> October 03, 2019
     288-----------------------------------
     289-   **fix***   Remove duplicate inpute filed in dokan admin settings form
     290-   **fix***   Make commissison value to 0 if no product found
     291-   **fix***   Attribute value's are swapped after changing the order of the attributes
     292
    287293v2.9.21 -> September 24, 2019
    288294-----------------------------------
Note: See TracChangeset for help on using the changeset viewer.