Skip to content

Commit

Permalink
Version bump, changelog updated, Generate pot file
Browse files Browse the repository at this point in the history
  • Loading branch information
sabbir1991 committed Jan 21, 2018
1 parent 6a5563d commit dfc20f3
Show file tree
Hide file tree
Showing 8 changed files with 430 additions and 333 deletions.
47 changes: 35 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Dokan Multivendor Marketplace #
**Contributors:** [tareq1988](https://profiles.wordpress.org/tareq1988), [wedevs](https://profiles.wordpress.org/wedevs), [rafsuntaskin](https://profiles.wordpress.org/rafsuntaskin), [sabbir1991](https://profiles.wordpress.org/sabbir1991)
**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.9.1
**WC requires at least:** 2.6
**WC tested up to:** 3.2.5
**Requires PHP:** 5.6
**Stable tag:** trunk
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html
**Contributors:** [tareq1988](https://profiles.wordpress.org/tareq1988), [wedevs](https://profiles.wordpress.org/wedevs), [sabbir1991](https://profiles.wordpress.org/sabbir1991), [rafsuntaskin](https://profiles.wordpress.org/rafsuntaskin)
**Donate Link:** http://tareq.co/donate/
**Tags:** woocommerce, multivendor, multi-vendor, vendor, multishop, paypal , 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.9.2
**WC requires at least:** 2.6
**WC tested up to:** 3.2.6
**Requires PHP:** 5.6
**Stable tag:** trunk
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html

The pioneer multi-vendor plugin for WordPress. Start your own marketplace in minutes!

Expand Down Expand Up @@ -156,7 +156,8 @@ A. Obviously, you can use this on a single seller site to give them a nice front

### Q. How to upgrade to the Pro version?
A. Just install and activate the PRO version without deleting the free plugin. All your data will be safe on the database and some extra features will be added. If you feel something may go wrong, please consult with our [support](https://wedevs.com/contact/) staff first.
###

###
## Screenshots ##

1. Admin Dashboard
Expand All @@ -181,6 +182,28 @@ A. Just install and activate the PRO version without deleting the free plugin. A

## Changelog ##

v2.7.3 -> Jan 21, 2018
---------------------
- [new] Added permissions for vendors
- [new] Separate the vendor registration form through Shortcode
- [new] Added different class for vendor address is fixed
- [new] Product upload is now available on the backend for vendor
- [new] Added filter `dokan_get_seller_percentage`
- [fix] Can't withdraw full fractional amount from vendor withdraw
- [fix] Internal server error while placing order from multiple vendors
- [fix] Sync order is still working even if we change admin commission fee
- [fix] Slider js issue fixed
- [fix] Product pageview counting issue
- [fix] Vendors wp-admin bar does not showing
- [fix] A vendor is supposed to have backend access to see his orders instead all vendors order is shown
- [tweak] Added admin fee as a order meta for better experience

v2.7.2 -> Dec 18, 2017
---------------------
- [fix] Product attributes not saving properly
- [fix] missing text domains updated
- [tweak] Disabled withdraw request if no withdraw method is set

v2.7.1 -> Dec 13, 2017
---------------------
- [fix] Added Order shipping track security nonce
Expand Down
10 changes: 5 additions & 5 deletions classes/pageviews.php
Original file line number Diff line number Diff line change
Expand Up @@ -105,25 +105,25 @@ public function vendor_registration_shortcode() {

<?php if ( 'no' === get_option( 'woocommerce_registration_generate_username' ) ) : ?>
<p class="form-row form-group form-row-wide">
<label for="reg_username"><?php _e( 'Username', 'dokan-theme' ); ?> <span class="required">*</span></label>
<label for="reg_username"><?php _e( 'Username', 'dokan-lite' ); ?> <span class="required">*</span></label>
<input type="text" class="input-text form-control" name="username" id="reg_username" value="<?php if ( ! empty( $_POST['username'] ) ) esc_attr( $_POST['username'] ); ?>" required="required" />
</p>
<?php endif; ?>

<p class="form-row form-group form-row-wide">
<label for="reg_email"><?php _e( 'Email address', 'dokan-theme' ); ?> <span class="required">*</span></label>
<label for="reg_email"><?php _e( 'Email address', 'dokan-lite' ); ?> <span class="required">*</span></label>
<input type="email" class="input-text form-control" name="email" id="reg_email" value="<?php if ( ! empty( $_POST['email'] ) ) esc_attr($_POST['email']); ?>" required="required" />
<label generated="true" class="reg_email_error"></label>
</p>

<?php if ( 'no' === get_option( 'woocommerce_registration_generate_password' ) ) : ?>
<p class="form-row form-group form-row-wide">
<label for="reg_password"><?php _e( 'Password', 'dokan-theme' ); ?> <span class="required">*</span></label>
<label for="reg_password"><?php _e( 'Password', 'dokan-lite' ); ?> <span class="required">*</span></label>
<input type="password" class="input-text form-control" name="password" id="reg_password" value="<?php if ( ! empty( $_POST['password'] ) ) esc_attr( $_POST['password'] ); ?>" required="required" minlength="6" />
</p>
<?php endif; ?>
<!-- Spam Trap -->
<div style="left:-999em; position:absolute;"><label for="trap"><?php _e( 'Anti-spam', 'dokan-theme' ); ?></label><input type="text" name="email_2" id="trap" tabindex="-1" /></div>
<div style="left:-999em; position:absolute;"><label for="trap"><?php _e( 'Anti-spam', 'dokan-lite' ); ?></label><input type="text" name="email_2" id="trap" tabindex="-1" /></div>

<div class="split-row form-row-wide">
<p class="form-row form-group">
Expand Down Expand Up @@ -173,7 +173,7 @@ public function vendor_registration_shortcode() {
<?php do_action( 'register_form' ); ?>
<p class="form-row">
<?php wp_nonce_field( 'woocommerce-register', '_wpnonce' ); ?>
<input type="submit" class="dokan-btn dokan-btn-theme" name="register" value="<?php _e( 'Register', 'dokan-theme' ); ?>" />
<input type="submit" class="dokan-btn dokan-btn-theme" name="register" value="<?php _e( 'Register', 'dokan-lite' ); ?>" />
</p>
<?php do_action( 'woocommerce_register_form_end' ); ?>
</form>
Expand Down
2 changes: 1 addition & 1 deletion dokan.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Plugin Name: Dokan
Plugin URI: https://wordpress.org/plugins/dokan-lite/
Description: An e-commerce marketplace plugin for WordPress. Powered by WooCommerce and weDevs.
Version: 2.7.2
Version: 2.7.3
Author: weDevs
Author URI: https://wedevs.com/
Text Domain: dokan-lite
Expand Down
Loading

0 comments on commit dfc20f3

Please sign in to comment.