Skip to content

Commit

Permalink
chore: version bump, changelog updated, generate pot files
Browse files Browse the repository at this point in the history
  • Loading branch information
sabbir1991 committed Jan 29, 2019
1 parent ec93b4b commit bc32fc4
Show file tree
Hide file tree
Showing 8 changed files with 367 additions and 321 deletions.
15 changes: 13 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
**Donate Link:** http://tareq.co/donate/
**Tags:** WooCommerce multivendor marketplace, multi vendor marketplace, multi seller store, product vendors, woocommerce vendor, commission rate, e-commerce, ebay, ecommerce, yith, yithemes
**Requires at least:** 4.4
**Tested up to:** 5.0
**Tested up to:** 5.0.3
**WC requires at least:** 3.0
**WC tested up to:** 3.5.3
**WC tested up to:** 3.5.4
**Requires PHP:** 5.6
**Stable tag:** trunk
**License:** GPLv2 or later
Expand Down Expand Up @@ -274,6 +274,17 @@ A. Just install and activate the PRO version without deleting the free plugin. A

## Changelog ##

v2.9.9 -> Jan 29, 2019
------------------------
-**Fix** Send order email to admin, vendor & customer when an order is created via REST API
-**Fix** Show error message when there is an error in vendor settings page
-**Fix** Product attributes title saved with extra dash in vendor product edit page
-**Fix** Show vendor full address when a vendor wants to in vendor store page
-**Fix** Pyapal mass payment is not generating all the info in admin dashboard
-**Fix** Withdraw request amount in approved & cancelled email is broken
-**Fix** Page is not redirecting correctly when a vendor edit his account
-**Tweak** add filter to modify wp_editor args in vendor dashboard

v2.9.8 -> Jan 14, 2019
-------------------------
-**Fix** Show net sales of a month in admin dashboard
Expand Down
7 changes: 5 additions & 2 deletions assets/js/vue-admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,7 @@ let Currency = dokan_get_lib('Currency');
cancelled: 0
},
notFound: this.__('No requests found.', 'dokan-lite'),
massPayment: this.__('Paypal Mass Payment File is Generated.', 'dokan-lite'),
showCb: true,
loading: false,
columns: {
Expand Down Expand Up @@ -706,6 +707,8 @@ let Currency = dokan_get_lib('Currency');
},

onBulkAction(action, items) {
let self = this;

if (_.contains(['delete', 'approved', 'cancelled', 'pending'], action)) {

let jsonData = {};
Expand Down Expand Up @@ -773,8 +776,8 @@ let Currency = dokan_get_lib('Currency');
}
}

if (response && !response.success) {
alert(response.data);
if (response) {
alert(self.massPayment);
return;
}
});
Expand Down
11 changes: 11 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
v2.9.9 -> Jan 29, 2019
------------------------
-**Fix** Send order email to admin, vendor & customer when an order is created via REST API
-**Fix** Show error message when there is an error in vendor settings page
-**Fix** Product attributes title saved with extra dash in vendor product edit page
-**Fix** Show vendor full address when a vendor wants to in vendor store page
-**Fix** Pyapal mass payment is not generating all the info in admin dashboard
-**Fix** Withdraw request amount in approved & cancelled email is broken
-**Fix** Page is not redirecting correctly when a vendor edit his account
-**Tweak** add filter to modify wp_editor args in vendor dashboard

v2.9.8 -> Jan 14, 2019
------------------------
-**Fix** Show net sales of a month in admin dashboard
Expand Down
6 changes: 3 additions & 3 deletions dokan.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
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.9.8
Version: 2.9.9
Author: weDevs, LLC
Author URI: https://wedevs.com/
Text Domain: dokan-lite
WC requires at least: 3.0
WC tested up to: 3.5.3
WC tested up to: 3.5.4
Domain Path: /languages/
License: GPL2
*/
Expand Down Expand Up @@ -78,7 +78,7 @@ final class WeDevs_Dokan {
*
* @var string
*/
public $version = '2.9.8';
public $version = '2.9.9';

/**
* Minimum PHP version required
Expand Down
1 change: 1 addition & 0 deletions languages/dokan-lite.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
__( 'Update Note', 'dokan-lite' ),
__( '(no name)', 'dokan-lite' ),
__( 'No requests found.', 'dokan-lite' ),
__( 'Paypal Mass Payment File is Generated.', 'dokan-lite' ),
__( 'Vendor', 'dokan-lite' ),
__( 'Amount', 'dokan-lite' ),
__( 'Status', 'dokan-lite' ),
Expand Down
Loading

0 comments on commit bc32fc4

Please sign in to comment.