From 5994b89777e61a3ddc86817a1fa0b465ee9e1067 Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@users.noreply.github.com>
Date: Tue, 19 May 2020 16:53:18 +0530
Subject: [PATCH 01/18] Add logic for WC Vendors functionality, PFWMA-125

---
 ...rce-multi-account-management-list-data.php |  11 +-
 ...mmerce-multi-account-management-vendor.php | 145 ++++++++++++++++++
 ...r-woocommerce-multi-account-management.php |  10 +-
 3 files changed, 162 insertions(+), 4 deletions(-)
 create mode 100644 includes/class-paypal-for-woocommerce-multi-account-management-vendor.php

diff --git a/includes/class-paypal-for-woocommerce-multi-account-management-list-data.php b/includes/class-paypal-for-woocommerce-multi-account-management-list-data.php
index 888a792..28268dc 100644
--- a/includes/class-paypal-for-woocommerce-multi-account-management-list-data.php
+++ b/includes/class-paypal-for-woocommerce-multi-account-management-list-data.php
@@ -36,7 +36,14 @@ function column_default($item, $column_name) {
                 $user_info = '';
                 if ($condition_user) {
                     if ($condition_user != 'all') {
-                        $user_info = '<p class="description">' . sprintf('When User ID is %s', $condition_user) . '</p>';
+                        $user = get_user_by( 'id', $condition_user );
+                        $user_string = sprintf(
+                                esc_html__( '%1$s (#%2$s   %3$s)', 'woocommerce' ),
+                                $user->display_name,
+                                absint( $user->ID ),
+                                $user->user_email
+                        );
+                        $user_info = '<p class="description">' . sprintf('When Author is %s', $user_string) . '</p>';
                     }
                 }
                 $other_condition = '';
@@ -76,7 +83,7 @@ function column_default($item, $column_name) {
 
                 add_thickbox();
                 $product_text = '';
-                if (!empty($product_ids)) {
+                if (!empty($product_ids) && is_array($product_ids)) {
                     $products = $product_ids;
                     $product_text .= '<a href="#TB_inline?width=600&height=550&inlineId=modal-window-' . esc_attr($item['ID']) . '" class="thickbox" title="Products added in Trigger Condition">Products</a>';
                     $product_text .= '<div id="modal-window-' . esc_attr($item['ID']) . '" style="display:none;">';
diff --git a/includes/class-paypal-for-woocommerce-multi-account-management-vendor.php b/includes/class-paypal-for-woocommerce-multi-account-management-vendor.php
new file mode 100644
index 0000000..7179102
--- /dev/null
+++ b/includes/class-paypal-for-woocommerce-multi-account-management-vendor.php
@@ -0,0 +1,145 @@
+<?php
+
+/**
+ * This class defines all code necessary to run during the plugin's activation.
+ *
+ * @since      1.0.0
+ * @package    Paypal_For_Woocommerce_Multi_Account_Management
+ * @subpackage Paypal_For_Woocommerce_Multi_Account_Management/includes
+ * @author     Angell EYE <service@angelleye.com>
+ */
+class Paypal_For_Woocommerce_Multi_Account_Management_Vendor {
+
+    private $plugin_name;
+    private $version;
+
+    public function __construct($plugin_name, $version) {
+        $this->plugin_name = $plugin_name;
+        $this->version = $version;
+    }
+
+    public function angelleye_paypal_for_woocommerce_multi_account_rule_save($vendor_id) {
+        if (!class_exists('WCV_Vendors')) {
+            return false;
+        }
+        if (!WCV_Vendors::is_pending($vendor_id) && !WCV_Vendors::is_vendor($vendor_id)) {
+            return;
+        }
+
+        $post_id = $this->angelleye_is_vendor_account_exist($vendor_id);
+
+        if ($post_id != false) {
+
+            $user = get_user_by('id', $vendor_id);
+
+            $email = get_user_meta($vendor_id, 'pv_paypal', true);
+            if (empty($email)) {
+                $email = get_user_meta($vendor_id, 'billing_email', true);
+            }
+            if (empty($email)) {
+                $email = $user->user_email;
+            }
+
+            if (!empty($email)) {
+                update_post_meta($post_id, 'woocommerce_paypal_express_sandbox_email', $email);
+                update_post_meta($post_id, 'woocommerce_paypal_express_email', $email);
+            }
+
+            $user_string = sprintf(
+                    esc_html__('%1$s (#%2$s   %3$s)', 'woocommerce'), $user->display_name, absint($user->ID), $user->user_email
+            );
+
+            $woocommerce_paypal_express_account_name = get_post_meta($post_id, 'woocommerce_paypal_express_account_name', true);
+
+            if (empty($woocommerce_paypal_express_account_name)) {
+                update_post_meta($post_id, 'woocommerce_paypal_express_account_name', $user_string);
+            }
+        } else {
+
+            $user = get_user_by('id', $vendor_id);
+            $user_string = sprintf(
+                    esc_html__('%1$s (#%2$s   %3$s)', 'woocommerce'), $user->display_name, absint($user->ID), $user->user_email
+            );
+
+
+            $my_post = array(
+                'post_title' => $user_string,
+                'post_content' => '',
+                'post_status' => 'publish',
+                'post_author' => $vendor_id,
+                'post_type' => 'microprocessing'
+            );
+
+            $post_id = wp_insert_post($my_post);
+
+            $email = get_user_meta($vendor_id, 'pv_paypal', true);
+            if (empty($email)) {
+                $email = get_user_meta($vendor_id, 'billing_email', true);
+            }
+            if (empty($email)) {
+                $user = get_user_by('id', $vendor_id);
+                $email = $user->user_email;
+            }
+
+            $microprocessing_key_array = array(
+                'woocommerce_paypal_express_enable' => 'on',
+                'woocommerce_paypal_express_testmode' => 'on',
+                'woocommerce_paypal_express_account_name' => $user_string,
+                'woocommerce_paypal_express_sandbox_email' => $email,
+                'woocommerce_paypal_express_sandbox_merchant_id' => '',
+                'woocommerce_paypal_express_sandbox_api_username' => '',
+                'woocommerce_paypal_express_sandbox_api_password' => '',
+                'woocommerce_paypal_express_sandbox_api_signature' => '',
+                'woocommerce_paypal_express_email' => $email,
+                'woocommerce_paypal_express_merchant_id' => '',
+                'woocommerce_paypal_express_api_username' => '',
+                'woocommerce_paypal_express_api_password' => '',
+                'woocommerce_paypal_express_api_signature' => '',
+                'woocommerce_paypal_express_api_condition_field' => 'transaction_amount',
+                'woocommerce_paypal_express_api_condition_sign' => 'greaterthan',
+                'woocommerce_paypal_express_api_condition_value' => '0',
+                'woocommerce_paypal_express_api_user_role' => 'all',
+                'woocommerce_paypal_express_api_user' => $vendor_id,
+                'woocommerce_paypal_express_api_product_ids' => 'a:0:{}',
+                'product_categories' => '',
+                'product_tags' => '',
+                'buyer_countries' => '',
+                'woocommerce_priority' => '',
+                'angelleye_multi_account_choose_payment_gateway' => 'paypal_express',
+                'store_countries' => '',
+                'shipping_class' => 'all',
+                'currency_code' => '',
+                'ec_site_owner_commission' => '',
+                'ec_site_owner_commission_label' => ''
+            );
+
+            foreach ($microprocessing_key_array as $key => $value) {
+                update_post_meta($post_id, $key, $value);
+            }
+
+            update_post_meta($post_id, 'vendor_id', $vendor_id);
+        }
+    }
+
+    public function angelleye_is_vendor_account_exist($vendor_id) {
+        $args = array(
+            'post_type' => 'microprocessing',
+            'meta_query' => array(
+                array(
+                    'key' => 'vendor_id',
+                    'value' => $vendor_id
+                )
+            ),
+            'fields' => 'ids'
+        );
+        $query = new WP_Query($args);
+        $duplicates = $query->posts;
+        if (!empty($duplicates)) {
+            if (!empty($query->posts[0])) {
+                return $query->posts[0];
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/includes/class-paypal-for-woocommerce-multi-account-management.php b/includes/class-paypal-for-woocommerce-multi-account-management.php
index 685afae..737a2fe 100644
--- a/includes/class-paypal-for-woocommerce-multi-account-management.php
+++ b/includes/class-paypal-for-woocommerce-multi-account-management.php
@@ -107,6 +107,7 @@ private function load_dependencies() {
         require_once plugin_dir_path(dirname(__FILE__)) . 'includes/class-paypal-for-woocommerce-multi-account-management-wp-list-table.php';
         require_once plugin_dir_path(dirname(__FILE__)) . 'includes/class-paypal-for-woocommerce-multi-account-management-list-data.php';
         require_once plugin_dir_path(dirname(__FILE__)) . 'includes/angelleye-multi-account-function.php';
+        require_once plugin_dir_path(dirname(__FILE__)) . 'includes/class-paypal-for-woocommerce-multi-account-management-vendor.php';
 
 
 
@@ -181,8 +182,13 @@ private function define_admin_hooks() {
         //$this->loader->add_filter('woocommerce_paypal_args', $paypal, 'angelleye_woocommerce_paypal_args', 10, 2);
         $this->loader->add_action('woocommerce_create_refund', $express_checkout, 'own_woocommerce_create_refund', 10, 2);
         $this->loader->add_filter('angelleye_multi_account_need_shipping', $express_checkout, 'own_angelleye_multi_account_need_shipping', 10, 3);
- 
-
+        
+        $vendor = new Paypal_For_Woocommerce_Multi_Account_Management_Vendor($this->get_plugin_name(), $this->get_version());
+        $this->loader->add_action('personal_options_update', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+        $this->loader->add_action('edit_user_profile_update', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+        $this->loader->add_action('user_register', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+        $this->loader->add_action('profile_update', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+        $this->loader->add_action('wcv_pro_store_settings_saved', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
     }
 
     /**

From 09e35739a7f921bf30272130867a1651c317705c Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@users.noreply.github.com>
Date: Tue, 19 May 2020 18:39:48 +0530
Subject: [PATCH 02/18] Dokan compatibility, PFWMA-125

---
 ...mmerce-multi-account-management-vendor.php | 283 ++++++++++++------
 1 file changed, 188 insertions(+), 95 deletions(-)

diff --git a/includes/class-paypal-for-woocommerce-multi-account-management-vendor.php b/includes/class-paypal-for-woocommerce-multi-account-management-vendor.php
index 7179102..bac1c53 100644
--- a/includes/class-paypal-for-woocommerce-multi-account-management-vendor.php
+++ b/includes/class-paypal-for-woocommerce-multi-account-management-vendor.php
@@ -18,106 +18,199 @@ public function __construct($plugin_name, $version) {
         $this->version = $version;
     }
 
-    public function angelleye_paypal_for_woocommerce_multi_account_rule_save($vendor_id) {
-        if (!class_exists('WCV_Vendors')) {
-            return false;
-        }
-        if (!WCV_Vendors::is_pending($vendor_id) && !WCV_Vendors::is_vendor($vendor_id)) {
-            return;
-        }
-
-        $post_id = $this->angelleye_is_vendor_account_exist($vendor_id);
-
-        if ($post_id != false) {
-
-            $user = get_user_by('id', $vendor_id);
-
-            $email = get_user_meta($vendor_id, 'pv_paypal', true);
-            if (empty($email)) {
-                $email = get_user_meta($vendor_id, 'billing_email', true);
-            }
-            if (empty($email)) {
-                $email = $user->user_email;
-            }
-
-            if (!empty($email)) {
-                update_post_meta($post_id, 'woocommerce_paypal_express_sandbox_email', $email);
-                update_post_meta($post_id, 'woocommerce_paypal_express_email', $email);
-            }
-
-            $user_string = sprintf(
-                    esc_html__('%1$s (#%2$s   %3$s)', 'woocommerce'), $user->display_name, absint($user->ID), $user->user_email
-            );
-
-            $woocommerce_paypal_express_account_name = get_post_meta($post_id, 'woocommerce_paypal_express_account_name', true);
-
-            if (empty($woocommerce_paypal_express_account_name)) {
-                update_post_meta($post_id, 'woocommerce_paypal_express_account_name', $user_string);
+    public function angelleye_paypal_for_woocommerce_multi_account_rule_save_dokan($vendor_id) {
+        try {
+            if (function_exists('dokan')) {
+                if (!dokan_is_user_seller($vendor_id)) {
+                    return;
+                }
+                $post_id = $this->angelleye_is_vendor_account_exist($vendor_id);
+                if ($post_id != false) {
+                    $user = get_user_by('id', $vendor_id);
+                    $dokan_profile_settings = get_user_meta($vendor_id, 'dokan_profile_settings', true);
+                    if( !empty($dokan_profile_settings['payment']['paypal']['email'])) {
+                        $email = $dokan_profile_settings['payment']['paypal']['email'];
+                    }
+                    if (empty($email)) {
+                        $email = get_user_meta($vendor_id, 'billing_email', true);
+                    }
+                    if (empty($email)) {
+                        $email = $user->user_email;
+                    }
+                    if (!empty($email)) {
+                        update_post_meta($post_id, 'woocommerce_paypal_express_sandbox_email', $email);
+                        update_post_meta($post_id, 'woocommerce_paypal_express_email', $email);
+                    }
+                    $user_string = sprintf(
+                            esc_html__('%1$s (#%2$s   %3$s)', 'woocommerce'), $user->display_name, absint($user->ID), $user->user_email
+                    );
+                    $woocommerce_paypal_express_account_name = get_post_meta($post_id, 'woocommerce_paypal_express_account_name', true);
+                    if (empty($woocommerce_paypal_express_account_name)) {
+                        update_post_meta($post_id, 'woocommerce_paypal_express_account_name', $user_string);
+                    }
+                } else {
+                    $user = get_user_by('id', $vendor_id);
+                    $user_string = sprintf(
+                            esc_html__('%1$s (#%2$s   %3$s)', 'woocommerce'), $user->display_name, absint($user->ID), $user->user_email
+                    );
+                    $my_post = array(
+                        'post_title' => $user_string,
+                        'post_content' => '',
+                        'post_status' => 'publish',
+                        'post_author' => $vendor_id,
+                        'post_type' => 'microprocessing'
+                    );
+                    $post_id = wp_insert_post($my_post);
+                    $email = get_user_meta($vendor_id, 'pv_paypal', true);
+                    if (empty($email)) {
+                        $email = get_user_meta($vendor_id, 'billing_email', true);
+                    }
+                    if (empty($email)) {
+                        $user = get_user_by('id', $vendor_id);
+                        $email = $user->user_email;
+                    }
+                    $microprocessing_key_array = array(
+                        'woocommerce_paypal_express_enable' => 'on',
+                        'woocommerce_paypal_express_testmode' => 'on',
+                        'woocommerce_paypal_express_account_name' => $user_string,
+                        'woocommerce_paypal_express_sandbox_email' => $email,
+                        'woocommerce_paypal_express_sandbox_merchant_id' => '',
+                        'woocommerce_paypal_express_sandbox_api_username' => '',
+                        'woocommerce_paypal_express_sandbox_api_password' => '',
+                        'woocommerce_paypal_express_sandbox_api_signature' => '',
+                        'woocommerce_paypal_express_email' => $email,
+                        'woocommerce_paypal_express_merchant_id' => '',
+                        'woocommerce_paypal_express_api_username' => '',
+                        'woocommerce_paypal_express_api_password' => '',
+                        'woocommerce_paypal_express_api_signature' => '',
+                        'woocommerce_paypal_express_api_condition_field' => 'transaction_amount',
+                        'woocommerce_paypal_express_api_condition_sign' => 'greaterthan',
+                        'woocommerce_paypal_express_api_condition_value' => '0',
+                        'woocommerce_paypal_express_api_user_role' => 'all',
+                        'woocommerce_paypal_express_api_user' => $vendor_id,
+                        'woocommerce_paypal_express_api_product_ids' => 'a:0:{}',
+                        'product_categories' => '',
+                        'product_tags' => '',
+                        'buyer_countries' => '',
+                        'woocommerce_priority' => '',
+                        'angelleye_multi_account_choose_payment_gateway' => 'paypal_express',
+                        'store_countries' => '',
+                        'shipping_class' => 'all',
+                        'currency_code' => '',
+                        'ec_site_owner_commission' => '',
+                        'ec_site_owner_commission_label' => ''
+                    );
+                    foreach ($microprocessing_key_array as $key => $value) {
+                        update_post_meta($post_id, $key, $value);
+                    }
+                    update_post_meta($post_id, 'vendor_id', $vendor_id);
+                }
             }
-        } else {
-
-            $user = get_user_by('id', $vendor_id);
-            $user_string = sprintf(
-                    esc_html__('%1$s (#%2$s   %3$s)', 'woocommerce'), $user->display_name, absint($user->ID), $user->user_email
-            );
-
-
-            $my_post = array(
-                'post_title' => $user_string,
-                'post_content' => '',
-                'post_status' => 'publish',
-                'post_author' => $vendor_id,
-                'post_type' => 'microprocessing'
-            );
-
-            $post_id = wp_insert_post($my_post);
+        } catch (Exception $ex) {
+            
+        }
+    }
 
-            $email = get_user_meta($vendor_id, 'pv_paypal', true);
-            if (empty($email)) {
-                $email = get_user_meta($vendor_id, 'billing_email', true);
+    public function angelleye_paypal_for_woocommerce_multi_account_rule_save_wc_vendor($vendor_id) {
+        try {
+            if (class_exists('WCV_Vendors')) {
+                if (!WCV_Vendors::is_pending($vendor_id) && !WCV_Vendors::is_vendor($vendor_id)) {
+                    return;
+                }
+                $post_id = $this->angelleye_is_vendor_account_exist($vendor_id);
+                if ($post_id != false) {
+                    $user = get_user_by('id', $vendor_id);
+                    $email = get_user_meta($vendor_id, 'pv_paypal', true);
+                    if (empty($email)) {
+                        $email = get_user_meta($vendor_id, 'billing_email', true);
+                    }
+                    if (empty($email)) {
+                        $email = $user->user_email;
+                    }
+                    if (!empty($email)) {
+                        update_post_meta($post_id, 'woocommerce_paypal_express_sandbox_email', $email);
+                        update_post_meta($post_id, 'woocommerce_paypal_express_email', $email);
+                    }
+                    $user_string = sprintf(
+                            esc_html__('%1$s (#%2$s   %3$s)', 'woocommerce'), $user->display_name, absint($user->ID), $user->user_email
+                    );
+                    $woocommerce_paypal_express_account_name = get_post_meta($post_id, 'woocommerce_paypal_express_account_name', true);
+                    if (empty($woocommerce_paypal_express_account_name)) {
+                        update_post_meta($post_id, 'woocommerce_paypal_express_account_name', $user_string);
+                    }
+                } else {
+                    $user = get_user_by('id', $vendor_id);
+                    $user_string = sprintf(
+                            esc_html__('%1$s (#%2$s   %3$s)', 'woocommerce'), $user->display_name, absint($user->ID), $user->user_email
+                    );
+                    $my_post = array(
+                        'post_title' => $user_string,
+                        'post_content' => '',
+                        'post_status' => 'publish',
+                        'post_author' => $vendor_id,
+                        'post_type' => 'microprocessing'
+                    );
+                    $post_id = wp_insert_post($my_post);
+                    $email = get_user_meta($vendor_id, 'pv_paypal', true);
+                    if (empty($email)) {
+                        $email = get_user_meta($vendor_id, 'billing_email', true);
+                    }
+                    if (empty($email)) {
+                        $user = get_user_by('id', $vendor_id);
+                        $email = $user->user_email;
+                    }
+                    $microprocessing_key_array = array(
+                        'woocommerce_paypal_express_enable' => 'on',
+                        'woocommerce_paypal_express_testmode' => 'on',
+                        'woocommerce_paypal_express_account_name' => $user_string,
+                        'woocommerce_paypal_express_sandbox_email' => $email,
+                        'woocommerce_paypal_express_sandbox_merchant_id' => '',
+                        'woocommerce_paypal_express_sandbox_api_username' => '',
+                        'woocommerce_paypal_express_sandbox_api_password' => '',
+                        'woocommerce_paypal_express_sandbox_api_signature' => '',
+                        'woocommerce_paypal_express_email' => $email,
+                        'woocommerce_paypal_express_merchant_id' => '',
+                        'woocommerce_paypal_express_api_username' => '',
+                        'woocommerce_paypal_express_api_password' => '',
+                        'woocommerce_paypal_express_api_signature' => '',
+                        'woocommerce_paypal_express_api_condition_field' => 'transaction_amount',
+                        'woocommerce_paypal_express_api_condition_sign' => 'greaterthan',
+                        'woocommerce_paypal_express_api_condition_value' => '0',
+                        'woocommerce_paypal_express_api_user_role' => 'all',
+                        'woocommerce_paypal_express_api_user' => $vendor_id,
+                        'woocommerce_paypal_express_api_product_ids' => 'a:0:{}',
+                        'product_categories' => '',
+                        'product_tags' => '',
+                        'buyer_countries' => '',
+                        'woocommerce_priority' => '',
+                        'angelleye_multi_account_choose_payment_gateway' => 'paypal_express',
+                        'store_countries' => '',
+                        'shipping_class' => 'all',
+                        'currency_code' => '',
+                        'ec_site_owner_commission' => '',
+                        'ec_site_owner_commission_label' => ''
+                    );
+                    foreach ($microprocessing_key_array as $key => $value) {
+                        update_post_meta($post_id, $key, $value);
+                    }
+                    update_post_meta($post_id, 'vendor_id', $vendor_id);
+                }
             }
-            if (empty($email)) {
-                $user = get_user_by('id', $vendor_id);
-                $email = $user->user_email;
-            }
-
-            $microprocessing_key_array = array(
-                'woocommerce_paypal_express_enable' => 'on',
-                'woocommerce_paypal_express_testmode' => 'on',
-                'woocommerce_paypal_express_account_name' => $user_string,
-                'woocommerce_paypal_express_sandbox_email' => $email,
-                'woocommerce_paypal_express_sandbox_merchant_id' => '',
-                'woocommerce_paypal_express_sandbox_api_username' => '',
-                'woocommerce_paypal_express_sandbox_api_password' => '',
-                'woocommerce_paypal_express_sandbox_api_signature' => '',
-                'woocommerce_paypal_express_email' => $email,
-                'woocommerce_paypal_express_merchant_id' => '',
-                'woocommerce_paypal_express_api_username' => '',
-                'woocommerce_paypal_express_api_password' => '',
-                'woocommerce_paypal_express_api_signature' => '',
-                'woocommerce_paypal_express_api_condition_field' => 'transaction_amount',
-                'woocommerce_paypal_express_api_condition_sign' => 'greaterthan',
-                'woocommerce_paypal_express_api_condition_value' => '0',
-                'woocommerce_paypal_express_api_user_role' => 'all',
-                'woocommerce_paypal_express_api_user' => $vendor_id,
-                'woocommerce_paypal_express_api_product_ids' => 'a:0:{}',
-                'product_categories' => '',
-                'product_tags' => '',
-                'buyer_countries' => '',
-                'woocommerce_priority' => '',
-                'angelleye_multi_account_choose_payment_gateway' => 'paypal_express',
-                'store_countries' => '',
-                'shipping_class' => 'all',
-                'currency_code' => '',
-                'ec_site_owner_commission' => '',
-                'ec_site_owner_commission_label' => ''
-            );
+        } catch (Exception $ex) {
+            
+        }
+    }
 
-            foreach ($microprocessing_key_array as $key => $value) {
-                update_post_meta($post_id, $key, $value);
+    public function angelleye_paypal_for_woocommerce_multi_account_rule_save($vendor_id) {
+        try {
+            $dokan_profile_settings = get_user_meta($vendor_id, 'dokan_profile_settings', true);
+            if (!empty($dokan_profile_settings)) {
+                $this->angelleye_paypal_for_woocommerce_multi_account_rule_save_dokan($vendor_id);
+            } else {
+                $this->angelleye_paypal_for_woocommerce_multi_account_rule_save_wc_vendor($vendor_id);
             }
-
-            update_post_meta($post_id, 'vendor_id', $vendor_id);
+        } catch (Exception $ex) {
+            
         }
     }
 

From 49d8fb95641363ca9594f76e3f6eeab08c42cb3c Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@users.noreply.github.com>
Date: Wed, 20 May 2020 12:17:22 +0530
Subject: [PATCH 03/18] add new hooks for dokan plugin, PFWMA-125

---
 .../class-paypal-for-woocommerce-multi-account-management.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/includes/class-paypal-for-woocommerce-multi-account-management.php b/includes/class-paypal-for-woocommerce-multi-account-management.php
index 737a2fe..0fe4e15 100644
--- a/includes/class-paypal-for-woocommerce-multi-account-management.php
+++ b/includes/class-paypal-for-woocommerce-multi-account-management.php
@@ -189,6 +189,9 @@ private function define_admin_hooks() {
         $this->loader->add_action('user_register', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
         $this->loader->add_action('profile_update', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
         $this->loader->add_action('wcv_pro_store_settings_saved', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+        $this->loader->add_action('dokan_new_seller_created', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+        $this->loader->add_action('dokan_store_profile_saved', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+         
     }
 
     /**

From 92ae5c1dc8fc7e491f23f01c7089d0552e0c7ae8 Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@users.noreply.github.com>
Date: Fri, 22 May 2020 14:24:46 +0530
Subject: [PATCH 04/18] Add tab, PFWMA-130

---
 ...ommerce-multi-account-management-admin.php | 283 +++++++++---------
 ...rce-multi-account-management-list-data.php |   4 +-
 ...r-woocommerce-multi-account-management.php |  50 +++-
 3 files changed, 195 insertions(+), 142 deletions(-)

diff --git a/admin/class-paypal-for-woocommerce-multi-account-management-admin.php b/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
index a792d93..5e777ef 100644
--- a/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
+++ b/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
@@ -31,6 +31,7 @@ class Paypal_For_Woocommerce_Multi_Account_Management_Admin {
     private $version;
     public $final_associate_account;
     public $gateway_key;
+    public $message;
 
     /**
      * Initialize the class and set its properties.
@@ -114,7 +115,6 @@ public function angelleye_display_multi_account_list() {
             $microprocessing_key_array = array('woocommerce_paypal_express_enable', 'woocommerce_paypal_express_testmode', 'woocommerce_paypal_express_account_name', 'woocommerce_paypal_express_sandbox_email', 'woocommerce_paypal_express_sandbox_merchant_id', 'woocommerce_paypal_express_sandbox_api_username', 'woocommerce_paypal_express_sandbox_api_password', 'woocommerce_paypal_express_sandbox_api_signature', 'woocommerce_paypal_express_email', 'woocommerce_paypal_express_merchant_id', 'woocommerce_paypal_express_api_username', 'woocommerce_paypal_express_api_password', 'woocommerce_paypal_express_api_signature', 'woocommerce_paypal_express_api_condition_field', 'woocommerce_paypal_express_api_condition_sign', 'woocommerce_paypal_express_api_condition_value', 'woocommerce_paypal_express_api_user_role', 'woocommerce_paypal_express_api_user', 'woocommerce_paypal_express_api_product_ids', 'product_categories', 'product_tags', 'buyer_countries', 'woocommerce_priority', 'angelleye_multi_account_choose_payment_gateway', 'store_countries', 'shipping_class', 'currency_code', 'ec_site_owner_commission', 'ec_site_owner_commission_label');
             foreach ($microprocessing_key_array as $key => $value) {
                 $microprocessing_new[$value] = isset($microprocessing[$value]) ? $microprocessing[$value] : array();
-                
             }
             $microprocessing = $microprocessing_new;
             foreach ($microprocessing as $microprocessing_key => $microprocessing_value) {
@@ -161,7 +161,7 @@ public function angelleye_display_multi_account_list() {
                     case 'ec_site_owner_commission':
                         echo sprintf('<tr><th scope="row" class="titledesc"><label for="ec_site_owner_commission">%1$s</label></th><td class="forminp"><fieldset><input type="number" placeholder="0" name="ec_site_owner_commission" min="0" max="100" step="0.01" value="%2$s" id="ec_site_owner_commission"></fieldset></td></tr>', __('Site Owner Commission %', 'paypal-for-woocommerce-multi-account-management'), !empty($microprocessing_value[0]) ? $microprocessing_value[0] : '');
                         break;
-                     case 'ec_site_owner_commission_label':
+                    case 'ec_site_owner_commission_label':
                         echo sprintf('<tr><th scope="row" class="titledesc"><label for="ec_site_owner_commission_label">%1$s</label></th><td class="forminp"><fieldset><input type="text" class="input-text regular-input width460" name="ec_site_owner_commission_label" value="%2$s" id="ec_site_owner_commission_label" placeholder="Commission"></fieldset></td></tr>', __('Site Owner Commission Item Label', 'paypal-for-woocommerce-multi-account-management'), !empty($microprocessing_value[0]) ? $microprocessing_value[0] : '');
                         break;
                     case 'woocommerce_paypal_express_api_user_role':
@@ -349,24 +349,21 @@ public function angelleye_display_multi_account_list() {
             }
         }
         $option_five .= '</select>';
-        
+
         $option_five_one = '<p class="description">' . __('Select Author', 'paypal-for-woocommerce-multi-account-management') . '</p>';
         $option_five_one .= '<select class="wc-enhanced-select smart_forwarding_field" name="woocommerce_paypal_express_api_user">';
         $option_five_one .= '<option value="all">' . __('All', 'paypal-for-woocommerce-multi-account-management') . '</option>';
-                        
-        $users = get_users( [ 'role__not_in' => [ 'subscriber' ] ] );                        
-        if( !empty($users)) {
+
+        $users = get_users(['role__not_in' => ['subscriber']]);
+        if (!empty($users)) {
             foreach ($users as $user) {
                 $user_string = sprintf(
-                        esc_html__( '%1$s (#%2$s   %3$s)', 'woocommerce' ),
-                        $user->display_name,
-                        absint( $user->ID ),
-                        $user->user_email
+                        esc_html__('%1$s (#%2$s   %3$s)', 'woocommerce'), $user->display_name, absint($user->ID), $user->user_email
                 );
                 if ($selected_user == $user->ID) {
-                    $option_five_one .= "<option selected='selected' value='" . esc_attr($user->ID) . "'>".htmlspecialchars( wp_kses_post( $user_string ) )."</option>";
+                    $option_five_one .= "<option selected='selected' value='" . esc_attr($user->ID) . "'>" . htmlspecialchars(wp_kses_post($user_string)) . "</option>";
                 } else {
-                    $option_five_one .= "<option value='" . esc_attr($user->ID) . "'>".htmlspecialchars( wp_kses_post( $user_string ) )."</option>";
+                    $option_five_one .= "<option value='" . esc_attr($user->ID) . "'>" . htmlspecialchars(wp_kses_post($user_string)) . "</option>";
                 }
             }
         }
@@ -374,10 +371,10 @@ public function angelleye_display_multi_account_list() {
         $option_ten = '<p class="description">' . __('Select Priority', 'paypal-for-woocommerce-multi-account-management') . '</p>';
         $option_ten .= '<select class="wc-enhanced-select smart_forwarding_field" name="woocommerce_priority">';
         for ($x = 0; $x <= 100; $x++) {
-            if($x == 0) {
-                $woocommerce_priority_text = $x .' - Lowest';
-            } elseif($x == 100) {
-                $woocommerce_priority_text = $x .' - Highest';
+            if ($x == 0) {
+                $woocommerce_priority_text = $x . ' - Lowest';
+            } elseif ($x == 100) {
+                $woocommerce_priority_text = $x . ' - Highest';
             } else {
                 $woocommerce_priority_text = $x;
             }
@@ -395,7 +392,7 @@ public function angelleye_display_multi_account_list() {
         $option_seven = '<p class="description">' . __('Buyer country', 'paypal-for-woocommerce-multi-account-management') . '</p>';
         $option_seven .= '<select id="buyer_countries" name="buyer_countries[]" style="width: 78%;"  class="wc-enhanced-select" multiple="multiple" data-placeholder="' . __("All countries", "paypal-for-woocommerce-multi-account-management") . '">';
         $countries = WC()->countries->get_countries();
-        if(!isset($buyer_countries)) {
+        if (!isset($buyer_countries)) {
             $buyer_countries = array();
         }
         if ($countries) {
@@ -413,13 +410,13 @@ public function angelleye_display_multi_account_list() {
                 $option_fourteen .= '<option value="' . esc_attr($country_key) . '"' . wc_selected($country_key, $store_countries) . '>' . esc_html($country_full_name) . '</option>';
             }
         }
-        
+
         $option_fourteen .= '</select>';
-        
+
         $option_fifteen = '<p class="description">' . __('Shipping Class', 'paypal-for-woocommerce-multi-account-management') . '</p>';
         $option_fifteen .= '<select id="pfwst_shipping_class" name="shipping_class" style="width: 78%;"  class="wc-enhanced-select" data-placeholder="' . __("All Shipping Class", "paypal-for-woocommerce-multi-account-management") . '">';
-        $classes = get_terms( 'product_shipping_class', array( 'hide_empty' => 1 ) );
-        $shipping_classes_array = ! is_wp_error( $classes ) ? $classes : array();
+        $classes = get_terms('product_shipping_class', array('hide_empty' => 1));
+        $shipping_classes_array = !is_wp_error($classes) ? $classes : array();
         if ($shipping_classes_array) {
             $shipping_class = !empty($shipping_class) ? $shipping_class : '';
             $option_fifteen .= '<option value="0">All Shipping Class</option>';
@@ -428,22 +425,21 @@ public function angelleye_display_multi_account_list() {
             }
         }
         $option_fifteen .= '</select>';
-        
-        $option_eight = '<p class="description"> ' . apply_filters('angelleye_multi_account_display_category_label',__('Product categories', 'paypal-for-woocommerce-multi-account-management')) . '</p>';
+
+        $option_eight = '<p class="description"> ' . apply_filters('angelleye_multi_account_display_category_label', __('Product categories', 'paypal-for-woocommerce-multi-account-management')) . '</p>';
         $option_eight .= '<select id="product_categories" name="product_categories[]" style="width: 78%;"  class="wc-enhanced-select" multiple="multiple" data-placeholder="' . __('Any category', 'paypal-for-woocommerce-multi-account-management') . '">';
-        $categories = get_terms(apply_filters('angelleye_get_product_categories', 
-                                    array('product_cat')), array(
-					'hide_empty' => 1,
-					'orderby'    => 'name',
-				));
-        if(!isset($product_categories)) {
+        $categories = get_terms(apply_filters('angelleye_get_product_categories', array('product_cat')), array(
+            'hide_empty' => 1,
+            'orderby' => 'name',
+        ));
+        if (!isset($product_categories)) {
             $product_categories = array();
         }
         if ($categories) {
             foreach ($categories as $cat) {
                 $category_lable = '';
-                $taxonomy_obj = get_taxonomy( $cat->taxonomy );
-                if(isset($taxonomy_obj->label) & !empty($taxonomy_obj->label)) {
+                $taxonomy_obj = get_taxonomy($cat->taxonomy);
+                if (isset($taxonomy_obj->label) & !empty($taxonomy_obj->label)) {
                     $category_lable = $cat->name . ' (' . $taxonomy_obj->label . ')';
                 } else {
                     $category_lable = $cat->name;
@@ -454,7 +450,7 @@ public function angelleye_display_multi_account_list() {
         $option_eight .= '</select>';
         $option_nine = '<p class="description">' . __('Product tags', 'paypal-for-woocommerce-multi-account-management') . '</p>';
         $option_nine .= '<select id="product_tags" name="product_tags[]" style="width: 78%;"  class="wc-enhanced-select" multiple="multiple" data-placeholder="' . __('Any tag', 'paypal-for-woocommerce-multi-account-management') . '">';
-        if( empty($product_categories) ) {
+        if (empty($product_categories)) {
             $tags = get_terms('product_tag', 'orderby=name&hide_empty=1');
             if ($tags) {
                 foreach ($tags as $tag) {
@@ -462,16 +458,16 @@ public function angelleye_display_multi_account_list() {
                 }
             }
         } else {
-            if( !empty($product_tags)) {
+            if (!empty($product_tags)) {
                 foreach ($product_tags as $key => $value) {
                     $term_object = get_term_by('id', $value, 'product_tag');
-                    if(!empty($term_object->name)) {
+                    if (!empty($term_object->name)) {
                         $option_nine .= '<option value="' . esc_attr($value) . '" selected>' . esc_html($term_object->name) . '</option>';
                     }
                 }
             }
         }
-        if(!isset($product_categories)) {
+        if (!isset($product_categories)) {
             $product_categories = array();
         }
         $option_nine .= '</select>';
@@ -522,7 +518,7 @@ public function angelleye_display_multi_account_list() {
         echo sprintf('<tr style="display: table-row;" valign="top">
                                 <th scope="row" class="titledesc">
                                     <input name="is_edit" class="button-primary woocommerce-save-button" type="hidden" value="%1$s" />
-                                    <input name="microprocessing_save" class="button-primary woocommerce-save-button" type="submit" value="%2$s" />
+                                    <input name="microprocessing_save" class="button-primary" type="submit" value="%2$s" />
                                     <a href="?page=wc-settings&tab=multi_account_management" class="button-primary button">%3$s</a>
                                     %4$s
                                 </th>
@@ -531,47 +527,61 @@ public function angelleye_display_multi_account_list() {
         $this->angelleye_multi_account_tooltip_box();
     }
 
-    public function angelleye_multi_account_tooltip_box() {
+    public function angelleye_multi_account_settings_fields() {
+        if (!empty($_POST['global_commission_microprocessing_save'])) {
+            update_option('global_ec_site_owner_commission', wc_clean($_POST['global_ec_site_owner_commission']));
+            update_option('global_ec_site_owner_commission_label', wc_clean($_POST['global_ec_site_owner_commission_label']));
+            $this->message = __('Your settings have been saved.', 'paypal-for-woocommerce-multi-account-management');
+        }
+        if (!empty($this->message)) {
+            echo '<div id="message" class="updated inline is-dismissible"><p><strong>' . esc_html($this->message) . '</strong></p></div>';
+        }
         $global_ec_site_owner_commission = get_option('global_ec_site_owner_commission', '');
         $global_ec_site_owner_commission_label = get_option('global_ec_site_owner_commission_label', '');
         ?>
-        <div class="angelleye_multi_global_commission_right angelleye_multi_account_paypal_express_field">
+        <div class="angelleye_multi_account_paypal_express_field">
             <form method="post" id="mainform" action="" enctype="multipart/form-data">
                 <table class="form-table">
-                <tr class="angelleye_multi_account_paypal_express_field">
-                    <th scope="row" class="titledesc">
-                        <label for="woocommerce_paypal_express_api_signature_microprocessing" class="commission"><?php echo __('Global Site Owner Commission %', 'paypal-for-woocommerce-multi-account-management'); ?></label>
-                    </th>
-                    <td class="forminp">
-                        <fieldset>
-                            <input type="number" name="global_ec_site_owner_commission" min="0" max="100" step="0.01" placeholder="0" class="commission" value="<?php echo !empty($global_ec_site_owner_commission) ? $global_ec_site_owner_commission : ''; ?>">
-                        </fieldset>
-                    </td>
-                </tr>
-                <tr class="angelleye_multi_account_paypal_express_field">
-                    <th scope="row" class="titledesc">
-                        <label for="woocommerce_paypal_express_api_signature_microprocessing" class="commission"><?php echo __('Global Site Owner Commission Item Label', 'paypal-for-woocommerce-multi-account-management'); ?></label>
-                    </th>
-                    <td class="forminp">
-                        <fieldset>
-                            <input type="text" class="input-text regular-input commission" name="global_ec_site_owner_commission_label" placeholder="Commission" value="<?php echo !empty($global_ec_site_owner_commission_label) ? $global_ec_site_owner_commission_label : ''; ?>">
-                        </fieldset>
-                    </td>
-                </tr>
-                <tr>
-                    <th scope="row" class="titledesc">
-                    </th>
-                    <td class="forminp">
-                        <fieldset>
-                            <input name="global_commission_microprocessing_save" class="button-primary woocommerce-save-button" type="submit" value="<?php esc_attr_e('Save Changes', 'paypal-for-woocommerce-multi-account-management'); ?>" />
-                            <a href="?page=wc-settings&tab=multi_account_management" class="button-primary button"><?php esc_attr_e('Cancel', 'paypal-for-woocommerce-multi-account-management'); ?></a>
-                            <?php wp_nonce_field('microprocessing_save'); ?>
-                        </fieldset>
-                    </td>
-                </tr>
-            </table>
+                    <tr class="angelleye_multi_account_paypal_express_field">
+                        <th scope="row" class="titledesc">
+                            <label for="woocommerce_paypal_express_api_signature_microprocessing" class="commission"><?php echo __('Global Site Owner Commission %', 'paypal-for-woocommerce-multi-account-management'); ?></label>
+                        </th>
+                        <td class="forminp">
+                            <fieldset>
+                                <input type="number" name="global_ec_site_owner_commission" min="0" max="100" step="0.01" placeholder="0" class="commission" value="<?php echo!empty($global_ec_site_owner_commission) ? $global_ec_site_owner_commission : ''; ?>">
+                            </fieldset>
+                        </td>
+                    </tr>
+                    <tr class="angelleye_multi_account_paypal_express_field">
+                        <th scope="row" class="titledesc">
+                            <label for="woocommerce_paypal_express_api_signature_microprocessing" class="commission"><?php echo __('Global Site Owner Commission Item Label', 'paypal-for-woocommerce-multi-account-management'); ?></label>
+                        </th>
+                        <td class="forminp">
+                            <fieldset>
+                                <input type="text" class="input-text regular-input commission" name="global_ec_site_owner_commission_label" placeholder="Commission" value="<?php echo!empty($global_ec_site_owner_commission_label) ? $global_ec_site_owner_commission_label : ''; ?>">
+                            </fieldset>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th scope="row" class="titledesc">
+                        </th>
+                        <td class="forminp">
+                            <fieldset>
+                                <input name="global_commission_microprocessing_save" class="button-primary" type="submit" value="<?php esc_attr_e('Save Changes', 'paypal-for-woocommerce-multi-account-management'); ?>" />
+                                <a href="?page=wc-settings&tab=multi_account_management" class="button-primary button"><?php esc_attr_e('Cancel', 'paypal-for-woocommerce-multi-account-management'); ?></a>
+                                <?php wp_nonce_field('microprocessing_save'); ?>
+                            </fieldset>
+                        </td>
+                    </tr>
+                </table>
             </form>
         </div>
+        <?php
+    }
+
+    public function angelleye_multi_account_tooltip_box() {
+        ?>
+
         <div class="angelleye_multi_account_right">
             <h3><?php echo __('Account Setup', 'paypal-for-woocommerce-multi-account-management'); ?></h3>
             <ul class="angelleye_pfwma_tips">
@@ -592,10 +602,14 @@ public function angelleye_multi_account_tooltip_box() {
     }
 
     public function angelleye_multi_account_ui() {
-        if (!empty($_POST['global_commission_microprocessing_save'])) {
-            update_option('global_ec_site_owner_commission', wc_clean($_POST['global_ec_site_owner_commission']));
-            update_option('global_ec_site_owner_commission_label', wc_clean($_POST['global_ec_site_owner_commission_label']));
-            echo sprintf('<div class="notice notice-success is-dismissible"><p>%1$s</p></div>', __('Your settings have been saved.', 'paypal-for-woocommerce-multi-account-management'));
+        if (!empty($_GET['success'])) {
+            $this->message = __('Your settings have been saved.', 'paypal-for-woocommerce-multi-account-management');
+        }
+        if (!empty($_GET['deleted'])) {
+            $this->message = __('Account permanently deleted.', 'paypal-for-woocommerce-multi-account-management');
+        }
+        if (!empty($this->message)) {
+            echo '<div id="message" class="updated inline is-dismissible"><p><strong>' . esc_html($this->message) . '</strong></p></div>';
         }
         if (!empty($_POST['angelleye_multi_account_choose_payment_gateway']) && $_POST['angelleye_multi_account_choose_payment_gateway'] == 'paypal_pro_payflow') {
             $this->angelleye_save_multi_account_data_paypal_pro_payflow();
@@ -606,13 +620,8 @@ public function angelleye_multi_account_ui() {
         if (!empty($_POST['angelleye_multi_account_choose_payment_gateway']) && $_POST['angelleye_multi_account_choose_payment_gateway'] == 'paypal') {
             $this->angelleye_save_multi_account_data_paypal();
         }
+
         if (empty($_GET['action'])) {
-            if (!empty($_GET['success'])) {
-                echo sprintf('<div class=" notice notice-success is-dismissible"><p>%1$s</p></div>', __('Your settings have been saved.', 'paypal-for-woocommerce-multi-account-management'));
-            }
-            if (!empty($_GET['deleted'])) {
-                echo sprintf('<div class=" notice notice-success is-dismissible"><p>%1$s</p></div>', __('Account permanently deleted.', 'paypal-for-woocommerce-multi-account-management'));
-            }
             ?>
             <br/>
             <div class="angelleye_multi_account_left">
@@ -626,7 +635,7 @@ public function angelleye_multi_account_ui() {
                             <?php echo $this->angelleye_multi_account_condition_ui(); ?>
                             <tr style="display: table-row;" valign="top">
                                 <th scope="row" class="titledesc">
-                                    <input name="microprocessing_save" class="button-primary woocommerce-save-button" type="submit" value="<?php esc_attr_e('Save Changes', 'paypal-for-woocommerce-multi-account-management'); ?>" />
+                                    <input name="microprocessing_save" class="button-primary" type="submit" value="<?php esc_attr_e('Save Changes', 'paypal-for-woocommerce-multi-account-management'); ?>" />
                                     <a href="?page=wc-settings&tab=multi_account_management" class="button-primary button"><?php esc_attr_e('Cancel', 'paypal-for-woocommerce-multi-account-management'); ?></a>
                                     <?php wp_nonce_field('microprocessing_save'); ?>
                                 </th>
@@ -643,9 +652,7 @@ public function angelleye_multi_account_ui() {
         ?>
         <br/><br/>
         <div>
-            <?php
-            $this->angelleye_multi_account_list();
-            ?>
+
         </div>
         <?php
         $woocommerce_paypal_express_settings = get_option('woocommerce_paypal_express_settings');
@@ -655,6 +662,11 @@ public function angelleye_multi_account_ui() {
     }
 
     public function angelleye_multi_account_list() {
+        ?>
+        <br>
+        <h1 class="wp-heading-inline"><?php echo __('Accounts', ''); ?></h1>
+        <a href="<?php echo esc_url(admin_url('admin.php?page=wc-settings&tab=multi_account_management&section=add_edit_account')); ?>" class="page-title-action">Add New</a>
+        <?php
         if (class_exists('Paypal_For_Woocommerce_Multi_Account_Management_List_Data')) {
             $table = new Paypal_For_Woocommerce_Multi_Account_Management_List_Data();
             $table->prepare_items();
@@ -789,15 +801,15 @@ public function angelleye_save_multi_account_data() {
             ?>
             <?php
             if (!empty($_POST['is_edit'])) {
-                $redirect_url = remove_query_arg(array('action', 'ID'));
-                wp_redirect(add_query_arg('success', true, $redirect_url));
+                $this->message = __('Your settings have been saved.', 'paypal-for-woocommerce-multi-account-management');
+                wp_redirect(add_query_arg(array('action' => 'edit', 'ID' => $post_id, 'success' => true)));
                 exit();
             } else {
-                echo sprintf('<div class=" notice notice-success is-dismissible"><p>%1$s</p></div>', __('Your settings have been saved.', 'paypal-for-woocommerce-multi-account-management'));
+                $this->message = __('Your settings have been saved.', 'paypal-for-woocommerce-multi-account-management');
+                wp_redirect(add_query_arg(array('action' => 'edit', 'ID' => $post_id, 'success' => true)));
+                exit();
             }
         }
-         
-        
     }
 
     public function angelleye_save_multi_account_data_paypal_pro_payflow() {
@@ -1001,7 +1013,7 @@ public function angelleye_save_multi_account_data_paypal_pro_payflow() {
                 wp_redirect(add_query_arg('success', true, $redirect_url));
                 exit();
             } else {
-                echo sprintf('<div class=" notice notice-success is-dismissible"><p>%1$s</p></div>', __('Your settings have been saved.', 'paypal-for-woocommerce-multi-account-management'));
+                $this->message = __('Your settings have been saved.', 'paypal-for-woocommerce-multi-account-management');
             }
         }
     }
@@ -1056,6 +1068,12 @@ public function angelleye_paypal_for_woocommerce_general_settings_tab() {
         ?>
         <a href="?page=wc-settings&tab=multi_account_management" class="nav-tab <?php echo $gateway == 'paypal_for_wooCommerce_for_multi_account_management' ? 'nav-tab-active' : ''; ?>"><?php echo __('Multi-Account Management', 'paypal-for-woocommerce-multi-account-management'); ?></a> <?php
     }
+    
+    public function display_admin_notice() {
+        if (!empty($this->message)) {
+            echo '<div id="message" class="updated inline is-dismissible"><p><strong>' . esc_html($this->message) . '</strong></p></div>';
+        }
+    }
 
     public function angelleye_paypal_for_woocommerce_general_settings_tab_content() {
         wp_enqueue_style('woocommerce_admin_styles', WC()->plugin_url() . '/assets/css/admin.css', array(), WC_VERSION);
@@ -1091,27 +1109,25 @@ public function angelleye_get_product_tag_by_product_cat() {
             'fields' => 'ids',
             'post_status' => 'publish',
             'tax_query' => array(
-                
                 array(
                     'taxonomy' => 'product_type',
                     'field' => 'slug',
                     'terms' => array('grouped', 'external'),
                     'operator' => 'NOT IN',
                 )
-                
             )
         );
-        if( isset($_POST['author']) && $_POST['author'] != 'all' ) {
+        if (isset($_POST['author']) && $_POST['author'] != 'all') {
             $args['author'] = $_POST['author'];
         }
-        if( isset($_POST['shipping_class']) && $_POST['shipping_class'] != 'all' ) {
-           $args['tax_query'][] = array(
+        if (isset($_POST['shipping_class']) && $_POST['shipping_class'] != 'all') {
+            $args['tax_query'][] = array(
                 'taxonomy' => 'product_shipping_class',
                 'terms' => $_POST['shipping_class'],
                 'operator' => 'IN',
             );
         }
-        if( !empty($_POST['categories_list'])) {
+        if (!empty($_POST['categories_list'])) {
             $args['tax_query'][] = array(
                 'taxonomy' => 'product_cat',
                 'terms' => $_POST['categories_list'],
@@ -1155,22 +1171,21 @@ public function angelleye_get_product_by_product_tags() {
                     'terms' => array('grouped', 'external'),
                     'operator' => 'NOT IN',
                 )
-                
             )
         );
-        
-        if( isset($_POST['author']) && $_POST['author'] != 'all' ) {
+
+        if (isset($_POST['author']) && $_POST['author'] != 'all') {
             $args['author'] = $_POST['author'];
         }
-        
-        if( isset($_POST['shipping_class']) && $_POST['shipping_class'] != 'all' ) {
-           $args['tax_query'][] = array(
+
+        if (isset($_POST['shipping_class']) && $_POST['shipping_class'] != 'all') {
+            $args['tax_query'][] = array(
                 'taxonomy' => 'product_shipping_class',
                 'terms' => $_POST['shipping_class'],
                 'operator' => 'IN',
             );
         }
-        
+
         if (!empty($_POST['tag_list']) || !empty($_POST['categories_list'])) {
             if (!empty($_POST['tag_list'])) {
                 $args['tax_query'][] = array(
@@ -1520,10 +1535,10 @@ public function angelleye_multi_account_condition_ui() {
                     <select class="wc-enhanced-select smart_forwarding_field" name="woocommerce_priority">
                         <?php
                         for ($x = 0; $x <= 100; $x++) {
-                            if($x == 0) {
-                                $woocommerce_priority_text = $x .' - Lowest';
-                            } elseif($x == 100) {
-                                $woocommerce_priority_text = $x .' - Highest';
+                            if ($x == 0) {
+                                $woocommerce_priority_text = $x . ' - Lowest';
+                            } elseif ($x == 100) {
+                                $woocommerce_priority_text = $x . ' - Highest';
                             } else {
                                 $woocommerce_priority_text = $x;
                             }
@@ -1546,16 +1561,13 @@ public function angelleye_multi_account_condition_ui() {
                     <select id="pfwst_author" class="wc-enhanced-select smart_forwarding_field" name="woocommerce_paypal_express_api_user">
                         <option value="all"><?php _e('All', 'paypal-for-woocommerce-multi-account-management'); ?></option>
                         <?php
-                        $blogusers = get_users( [ 'role__not_in' => [ 'subscriber' ] ] );
-                        if( !empty($blogusers)) {
+                        $blogusers = get_users(['role__not_in' => ['subscriber']]);
+                        if (!empty($blogusers)) {
                             foreach ($blogusers as $user) {
                                 $user_string = sprintf(
-                                        esc_html__( '%1$s (#%2$s   %3$s)', 'woocommerce' ),
-                                        $user->display_name,
-                                        absint( $user->ID ),
-                                        $user->user_email
+                                        esc_html__('%1$s (#%2$s   %3$s)', 'woocommerce'), $user->display_name, absint($user->ID), $user->user_email
                                 );
-                                echo "\n\t<option value='" . esc_attr($user->ID) . "'>".htmlspecialchars( wp_kses_post( $user_string ) )."</option>";
+                                echo "\n\t<option value='" . esc_attr($user->ID) . "'>" . htmlspecialchars(wp_kses_post($user_string)) . "</option>";
                             }
                         }
                         ?>
@@ -1586,35 +1598,34 @@ public function angelleye_multi_account_condition_ui() {
                         }
                         ?>
                     </select>
-                    <?php if(wc_shipping_enabled()) { ?>
-                    <p class="description"><?php _e('Shipping Class', 'paypal-for-woocommerce-multi-account-management'); ?></p>
-                    <select id="pfwst_shipping_class" name="shipping_class" style="width: 78%;"  class="wc-enhanced-select" data-placeholder="<?php esc_attr_e('All Shipping Class', 'paypal-for-woocommerce-multi-account-management'); ?>">
-                        <?php
-                        $classes = get_terms( 'product_shipping_class', array( 'hide_empty' => 1 ) );
-                        $shipping_classes = ! is_wp_error( $classes ) ? $classes : array();
-                        echo '<option value="all">All Shipping Class</option>';
-                        if (!empty($shipping_classes)) {
-                            foreach ($shipping_classes as $key => $shipping_classes_name) {
-                                echo '<option value="' . esc_attr($shipping_classes_name->term_id) . '">' . esc_html($shipping_classes_name->name) . '</option>';
+                    <?php if (wc_shipping_enabled()) { ?>
+                        <p class="description"><?php _e('Shipping Class', 'paypal-for-woocommerce-multi-account-management'); ?></p>
+                        <select id="pfwst_shipping_class" name="shipping_class" style="width: 78%;"  class="wc-enhanced-select" data-placeholder="<?php esc_attr_e('All Shipping Class', 'paypal-for-woocommerce-multi-account-management'); ?>">
+                            <?php
+                            $classes = get_terms('product_shipping_class', array('hide_empty' => 1));
+                            $shipping_classes = !is_wp_error($classes) ? $classes : array();
+                            echo '<option value="all">All Shipping Class</option>';
+                            if (!empty($shipping_classes)) {
+                                foreach ($shipping_classes as $key => $shipping_classes_name) {
+                                    echo '<option value="' . esc_attr($shipping_classes_name->term_id) . '">' . esc_html($shipping_classes_name->name) . '</option>';
+                                }
                             }
-                        }
-                        ?>
-                    </select>
+                            ?>
+                        </select>
                     <?php } ?>
                     <p class="description"><?php echo apply_filters('angelleye_multi_account_display_category_label', __('Product categories', 'paypal-for-woocommerce-multi-account-management')); ?></p>
                     <select id="product_categories" name="product_categories[]" style="width: 78%;"  class="wc-enhanced-select" multiple="multiple" data-placeholder="<?php esc_attr_e('Any category', 'paypal-for-woocommerce-multi-account-management'); ?>">
                         <?php
                         $category_ids = array();
-                        $categories = get_terms(apply_filters('angelleye_get_product_categories', array('product_cat')), 
-                                            array(
-                                                'hide_empty' => 1,
-                                                'orderby'    => 'name',
-                                            ));
+                        $categories = get_terms(apply_filters('angelleye_get_product_categories', array('product_cat')), array(
+                            'hide_empty' => 1,
+                            'orderby' => 'name',
+                        ));
                         if ($categories) {
                             foreach ($categories as $cat) {
                                 $category_lable = '';
-                                $taxonomy_obj = get_taxonomy( $cat->taxonomy );
-                                if(isset($taxonomy_obj->label) & !empty($taxonomy_obj->label)) {
+                                $taxonomy_obj = get_taxonomy($cat->taxonomy);
+                                if (isset($taxonomy_obj->label) & !empty($taxonomy_obj->label)) {
                                     $category_lable = $cat->name . ' (' . $taxonomy_obj->label . ')';
                                 } else {
                                     $category_lable = $cat->name;
@@ -1734,7 +1745,7 @@ public function angelleye_get_list_product_using_tag_cat($tag_list, $categories_
                 'operator' => 'NOT IN',
             );
         }
-        
+
         $loop = new WP_Query(apply_filters('angelleye_get_products_by_product_cat_and_tags', $args));
         $all_products = array();
         if (!empty($loop->posts)) {
@@ -2085,7 +2096,7 @@ public function angelleye_save_multi_account_data_paypal() {
                 wp_redirect(add_query_arg('success', true, $redirect_url));
                 exit();
             } else {
-                echo sprintf('<div class=" notice notice-success is-dismissible"><p>%1$s</p></div>', __('Your settings have been saved.', 'paypal-for-woocommerce-multi-account-management'));
+                $this->message = __('Your settings have been saved.', 'paypal-for-woocommerce-multi-account-management');
             }
         }
     }
diff --git a/includes/class-paypal-for-woocommerce-multi-account-management-list-data.php b/includes/class-paypal-for-woocommerce-multi-account-management-list-data.php
index 888a792..19f03f4 100644
--- a/includes/class-paypal-for-woocommerce-multi-account-management-list-data.php
+++ b/includes/class-paypal-for-woocommerce-multi-account-management-list-data.php
@@ -116,7 +116,7 @@ function column_default($item, $column_name) {
     }
 
     function column_title($item) {
-        $edit_params = array('page' => $_REQUEST['page'], 'action' => 'edit', 'ID' => $item['ID']);
+        $edit_params = array('section' => 'add_edit_account', 'page' => $_REQUEST['page'], 'action' => 'edit', 'ID' => $item['ID']);
         $delete_params = array('page' => $_REQUEST['page'], 'action' => 'delete', 'ID' => $item['ID']);
         $actions = array(
             'edit' => sprintf('<a href="%s">Edit</a>', esc_url(add_query_arg($edit_params))),
@@ -169,11 +169,13 @@ function process_bulk_action() {
                 }
                 $redirect_url = remove_query_arg(array('action', 'ID'));
                 wp_redirect(add_query_arg('deleted', true, $redirect_url));
+                $this->message = __('Account permanently deleted.', 'paypal-for-woocommerce-multi-account-management');
                 exit();
             }
             if (!empty($_GET['action']) && 'delete' == $_GET['action'] && !empty($_GET['ID'])) {
                 wp_delete_post($_GET['ID'], true);
                 $redirect_url = remove_query_arg(array('action', 'ID'));
+                $this->message = __('Account permanently deleted.', 'paypal-for-woocommerce-multi-account-management');
                 wp_redirect(add_query_arg('deleted', true, $redirect_url));
                 exit();
             }
diff --git a/includes/class-paypal-for-woocommerce-multi-account-management.php b/includes/class-paypal-for-woocommerce-multi-account-management.php
index 685afae..93158a4 100644
--- a/includes/class-paypal-for-woocommerce-multi-account-management.php
+++ b/includes/class-paypal-for-woocommerce-multi-account-management.php
@@ -45,6 +45,7 @@ class Paypal_For_Woocommerce_Multi_Account_Management {
     protected $version;
     protected $plugin_screen_hook_suffix = null;
     public $plugin_admin;
+    public $message;
 
     /**
      * Define the core functionality of the plugin.
@@ -163,7 +164,7 @@ private function define_admin_hooks() {
         $this->loader->add_action('angelleye_set_multi_account', $plugin_admin, 'angelleye_set_multi_account', 10, 2);
         $this->loader->add_filter('set-screen-option', $plugin_admin, 'angelleye_set_screen_option', 10, 3);
         $this->loader->add_action('load-settings_page_paypal-for-woocommerce', $plugin_admin, 'angelleye_add_screen_option', 10);
-        
+
 
         $express_checkout = new Paypal_For_Woocommerce_Multi_Account_Management_Admin_Express_Checkout($this->get_plugin_name(), $this->get_version());
         $paypal_payflow = new Paypal_For_Woocommerce_Multi_Account_Management_Admin_PayPal_Payflow($this->get_plugin_name(), $this->get_version());
@@ -181,8 +182,6 @@ private function define_admin_hooks() {
         //$this->loader->add_filter('woocommerce_paypal_args', $paypal, 'angelleye_woocommerce_paypal_args', 10, 2);
         $this->loader->add_action('woocommerce_create_refund', $express_checkout, 'own_woocommerce_create_refund', 10, 2);
         $this->loader->add_filter('angelleye_multi_account_need_shipping', $express_checkout, 'own_angelleye_multi_account_need_shipping', 10, 3);
- 
-
     }
 
     /**
@@ -263,9 +262,50 @@ public function display_plugin_admin_page() {
             'title_li' => $title,
             'hide_empty' => $empty
         );
-
         $product_cats = get_categories($args);
-        $this->plugin_admin->angelleye_paypal_for_woocommerce_general_settings_tab_content();
+        $this->display_plugin_admin_page_submenu();
+        echo '<style> .button-primary.woocommerce-save-button { display: none; } </style>';
+        $this->plugin_admin->display_admin_notice();
+        if (empty($_GET['section'])) {
+             $this->plugin_admin->angelleye_multi_account_list();
+        } elseif (!empty($_GET['section']) && $_GET['section'] === 'add_edit_account') {
+            $this->plugin_admin->angelleye_paypal_for_woocommerce_general_settings_tab_content();
+        } elseif (!empty($_GET['section']) && $_GET['section'] === 'settings') {
+            $this->plugin_admin->angelleye_multi_account_settings_fields();
+        }
+        
+        
+    }
+
+    public function display_plugin_admin_page_submenu() {
+        ?>
+        </form>
+        <div class="wrap">
+            <ul class="subsubsub">
+                <li><a href="<?php echo esc_url(admin_url('admin.php?page=wc-settings&tab=multi_account_management&section=')); ?>" class="<?php
+                    if (empty($_GET['section'])) {
+                        echo 'current';
+                    }
+                    ?>"><?php echo __('All PayPal Acounts', 'angelleye-paypal-shipment-tracking-woocommerce'); ?></a> |</li>
+                <li><a href="<?php echo esc_url(admin_url('admin.php?page=wc-settings&tab=multi_account_management&section=add_edit_account')); ?>" class="<?php
+                    if ($_GET['section'] == 'add_edit_account') {
+                        echo 'current';
+                    }
+                    ?>"><?php echo __('Add Acounts', 'angelleye-paypal-shipment-tracking-woocommerce'); ?></a> | </li>
+                <li><a href="<?php echo esc_url(admin_url('admin.php?page=wc-settings&tab=multi_account_management&section=settings')); ?>" class="<?php
+                    if ($_GET['section'] == 'settings') {
+                        echo 'current';
+                    }
+                    ?>"><?php echo __('Settings', 'angelleye-paypal-shipment-tracking-woocommerce'); ?></a>  </li>
+            </ul>
+            <br class="clear">
+            <?php
+            if (!empty($this->message)) {
+                echo '<div id="message" class="updated inline is-dismissible"><p><strong>' . esc_html($this->message) . '</strong></p></div>';
+            }
+            ?>
+        </div>
+        <?php
     }
 
     public function angelleye_woocommerce_settings_tabs_array($settings_tabs) {

From 754a21a8762e6db15221a093f6cd7fc63eda57c3 Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@users.noreply.github.com>
Date: Fri, 22 May 2020 14:26:41 +0530
Subject: [PATCH 05/18] convert to 3 tabs, PFWMA-130

---
 .../class-paypal-for-woocommerce-multi-account-management.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/class-paypal-for-woocommerce-multi-account-management.php b/includes/class-paypal-for-woocommerce-multi-account-management.php
index 93158a4..f1706dd 100644
--- a/includes/class-paypal-for-woocommerce-multi-account-management.php
+++ b/includes/class-paypal-for-woocommerce-multi-account-management.php
@@ -291,7 +291,7 @@ public function display_plugin_admin_page_submenu() {
                     if ($_GET['section'] == 'add_edit_account') {
                         echo 'current';
                     }
-                    ?>"><?php echo __('Add Acounts', 'angelleye-paypal-shipment-tracking-woocommerce'); ?></a> | </li>
+                    ?>"><?php echo __('Add / Edit Acounts', 'angelleye-paypal-shipment-tracking-woocommerce'); ?></a> | </li>
                 <li><a href="<?php echo esc_url(admin_url('admin.php?page=wc-settings&tab=multi_account_management&section=settings')); ?>" class="<?php
                     if ($_GET['section'] == 'settings') {
                         echo 'current';

From bdc28fed314901fef5c973217acec9259aa16d0a Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@users.noreply.github.com>
Date: Fri, 22 May 2020 14:57:31 +0530
Subject: [PATCH 06/18] Add vendor plugin option, PFWMA-131

---
 ...ommerce-multi-account-management-admin.php | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/admin/class-paypal-for-woocommerce-multi-account-management-admin.php b/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
index 5e777ef..2b7a290 100644
--- a/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
+++ b/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
@@ -544,7 +544,7 @@ public function angelleye_multi_account_settings_fields() {
                 <table class="form-table">
                     <tr class="angelleye_multi_account_paypal_express_field">
                         <th scope="row" class="titledesc">
-                            <label for="woocommerce_paypal_express_api_signature_microprocessing" class="commission"><?php echo __('Global Site Owner Commission %', 'paypal-for-woocommerce-multi-account-management'); ?></label>
+                            <label for="global_ec_site_owner_commission" class="commission"><?php echo __('Global Site Owner Commission %', 'paypal-for-woocommerce-multi-account-management'); ?></label>
                         </th>
                         <td class="forminp">
                             <fieldset>
@@ -554,7 +554,7 @@ public function angelleye_multi_account_settings_fields() {
                     </tr>
                     <tr class="angelleye_multi_account_paypal_express_field">
                         <th scope="row" class="titledesc">
-                            <label for="woocommerce_paypal_express_api_signature_microprocessing" class="commission"><?php echo __('Global Site Owner Commission Item Label', 'paypal-for-woocommerce-multi-account-management'); ?></label>
+                            <label for="global_ec_site_owner_commission_label" class="commission"><?php echo __('Global Site Owner Commission Item Label', 'paypal-for-woocommerce-multi-account-management'); ?></label>
                         </th>
                         <td class="forminp">
                             <fieldset>
@@ -562,6 +562,28 @@ public function angelleye_multi_account_settings_fields() {
                             </fieldset>
                         </td>
                     </tr>
+                    <tr class="angelleye_multi_account_paypal_express_field" valign="top">
+                        <th scope="row" class="titledesc">
+                            <label for="global_automatic_rule_creation_enable">Enable / Disable</label>
+                        </th>
+                        <td class="forminp">
+                            <fieldset>
+                                <label for="global_automatic_rule_creation_enable">
+                                    <input class="global_automatic_rule_creation_enable" name="global_automatic_rule_creation_enable" id="global_automatic_rule_creation_enable" type="checkbox"><?php echo __('Enable Automatic Rule Creation', ''); ?> </label><br>
+                            </fieldset>
+                        </td>
+                    </tr>
+                    <tr class="angelleye_multi_account_paypal_express_field" valign="top">
+                        <th scope="row" class="titledesc">
+                            <label for="global_automatic_rule_creation_testmode">PayPal Sandbox</label>
+                        </th>
+                        <td class="forminp">
+                            <fieldset>
+                                <label for="global_automatic_rule_creation_testmode">
+                                    <input class="global_automatic_rule_creation_testmode" name="global_automatic_rule_creation_testmode" id="global_automatic_rule_creation_testmode" type="checkbox"><?php echo __('Enable PayPal Sandbox for Automatic Rule Creation', '') ; ?></label><br>
+                            </fieldset>
+                        </td>
+                    </tr>
                     <tr>
                         <th scope="row" class="titledesc">
                         </th>
@@ -1068,7 +1090,7 @@ public function angelleye_paypal_for_woocommerce_general_settings_tab() {
         ?>
         <a href="?page=wc-settings&tab=multi_account_management" class="nav-tab <?php echo $gateway == 'paypal_for_wooCommerce_for_multi_account_management' ? 'nav-tab-active' : ''; ?>"><?php echo __('Multi-Account Management', 'paypal-for-woocommerce-multi-account-management'); ?></a> <?php
     }
-    
+
     public function display_admin_notice() {
         if (!empty($this->message)) {
             echo '<div id="message" class="updated inline is-dismissible"><p><strong>' . esc_html($this->message) . '</strong></p></div>';

From e5f4baaf83bb97b488b0bf9d0ec9b9fcaad5c5a6 Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@users.noreply.github.com>
Date: Fri, 22 May 2020 15:17:12 +0530
Subject: [PATCH 07/18] Add vendor plugin option, PFWMA-131

---
 ...-woocommerce-multi-account-management-admin.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/admin/class-paypal-for-woocommerce-multi-account-management-admin.php b/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
index 2b7a290..4c8a4e4 100644
--- a/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
+++ b/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
@@ -531,6 +531,8 @@ public function angelleye_multi_account_settings_fields() {
         if (!empty($_POST['global_commission_microprocessing_save'])) {
             update_option('global_ec_site_owner_commission', wc_clean($_POST['global_ec_site_owner_commission']));
             update_option('global_ec_site_owner_commission_label', wc_clean($_POST['global_ec_site_owner_commission_label']));
+            update_option('global_automatic_rule_creation_enable', wc_clean($_POST['global_automatic_rule_creation_enable']));
+            update_option('global_automatic_rule_creation_testmode', wc_clean($_POST['global_automatic_rule_creation_testmode']));
             $this->message = __('Your settings have been saved.', 'paypal-for-woocommerce-multi-account-management');
         }
         if (!empty($this->message)) {
@@ -538,6 +540,8 @@ public function angelleye_multi_account_settings_fields() {
         }
         $global_ec_site_owner_commission = get_option('global_ec_site_owner_commission', '');
         $global_ec_site_owner_commission_label = get_option('global_ec_site_owner_commission_label', '');
+        $global_automatic_rule_creation_enable = get_option('global_automatic_rule_creation_enable', '');
+        $global_automatic_rule_creation_testmode = get_option('global_automatic_rule_creation_testmode', '');
         ?>
         <div class="angelleye_multi_account_paypal_express_field">
             <form method="post" id="mainform" action="" enctype="multipart/form-data">
@@ -562,28 +566,30 @@ public function angelleye_multi_account_settings_fields() {
                             </fieldset>
                         </td>
                     </tr>
+                    <?php if (function_exists('dokan') || class_exists('WCV_Vendors')) { ?>
                     <tr class="angelleye_multi_account_paypal_express_field" valign="top">
                         <th scope="row" class="titledesc">
-                            <label for="global_automatic_rule_creation_enable">Enable / Disable</label>
+                            <label for="global_automatic_rule_creation_enable"><?php echo __('Enable / Disable', ''); ?></label>
                         </th>
                         <td class="forminp">
                             <fieldset>
                                 <label for="global_automatic_rule_creation_enable">
-                                    <input class="global_automatic_rule_creation_enable" name="global_automatic_rule_creation_enable" id="global_automatic_rule_creation_enable" type="checkbox"><?php echo __('Enable Automatic Rule Creation', ''); ?> </label><br>
+                                    <input class="global_automatic_rule_creation_enable" name="global_automatic_rule_creation_enable" id="global_automatic_rule_creation_enable" type="checkbox" <?php echo ($global_automatic_rule_creation_enable == 'on') ? 'checked' : '' ?> ><?php echo __('Enable Automatic Rule Creation', ''); ?> </label><br>
                             </fieldset>
                         </td>
                     </tr>
                     <tr class="angelleye_multi_account_paypal_express_field" valign="top">
                         <th scope="row" class="titledesc">
-                            <label for="global_automatic_rule_creation_testmode">PayPal Sandbox</label>
+                            <label for="global_automatic_rule_creation_testmode"><?php echo __('PayPal Sandbox', ''); ?></label>
                         </th>
                         <td class="forminp">
                             <fieldset>
                                 <label for="global_automatic_rule_creation_testmode">
-                                    <input class="global_automatic_rule_creation_testmode" name="global_automatic_rule_creation_testmode" id="global_automatic_rule_creation_testmode" type="checkbox"><?php echo __('Enable PayPal Sandbox for Automatic Rule Creation', '') ; ?></label><br>
+                                    <input class="global_automatic_rule_creation_testmode" name="global_automatic_rule_creation_testmode" id="global_automatic_rule_creation_testmode" type="checkbox" <?php echo ($global_automatic_rule_creation_testmode == 'on') ? 'checked' : '' ?> ><?php echo __('Enable PayPal Sandbox for Automatic Rule Creation', '') ; ?></label><br>
                             </fieldset>
                         </td>
                     </tr>
+                    <?php } ?>
                     <tr>
                         <th scope="row" class="titledesc">
                         </th>

From 5a129e33ff48c1280e2c94be309d880b5e3aeecd Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@users.noreply.github.com>
Date: Fri, 22 May 2020 15:39:18 +0530
Subject: [PATCH 08/18] Add sandbox vs live mode base on vendor option,
 PFWMA-131

---
 ...mmerce-multi-account-management-vendor.php | 11 ++++++++--
 ...r-woocommerce-multi-account-management.php | 20 +++++++++++--------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/includes/class-paypal-for-woocommerce-multi-account-management-vendor.php b/includes/class-paypal-for-woocommerce-multi-account-management-vendor.php
index bac1c53..e6ecda8 100644
--- a/includes/class-paypal-for-woocommerce-multi-account-management-vendor.php
+++ b/includes/class-paypal-for-woocommerce-multi-account-management-vendor.php
@@ -12,10 +12,17 @@ class Paypal_For_Woocommerce_Multi_Account_Management_Vendor {
 
     private $plugin_name;
     private $version;
+    public $testmode;
 
     public function __construct($plugin_name, $version) {
         $this->plugin_name = $plugin_name;
         $this->version = $version;
+        $global_automatic_rule_creation_testmode = get_option('global_automatic_rule_creation_testmode', '');
+        if($global_automatic_rule_creation_testmode == 'on') {
+            $this->testmode = 'on';
+        } else {
+            $this->testmode = '';
+        }
     }
 
     public function angelleye_paypal_for_woocommerce_multi_account_rule_save_dokan($vendor_id) {
@@ -71,7 +78,7 @@ public function angelleye_paypal_for_woocommerce_multi_account_rule_save_dokan($
                     }
                     $microprocessing_key_array = array(
                         'woocommerce_paypal_express_enable' => 'on',
-                        'woocommerce_paypal_express_testmode' => 'on',
+                        'woocommerce_paypal_express_testmode' => $this->testmode,
                         'woocommerce_paypal_express_account_name' => $user_string,
                         'woocommerce_paypal_express_sandbox_email' => $email,
                         'woocommerce_paypal_express_sandbox_merchant_id' => '',
@@ -161,7 +168,7 @@ public function angelleye_paypal_for_woocommerce_multi_account_rule_save_wc_vend
                     }
                     $microprocessing_key_array = array(
                         'woocommerce_paypal_express_enable' => 'on',
-                        'woocommerce_paypal_express_testmode' => 'on',
+                        'woocommerce_paypal_express_testmode' => $this->testmode,
                         'woocommerce_paypal_express_account_name' => $user_string,
                         'woocommerce_paypal_express_sandbox_email' => $email,
                         'woocommerce_paypal_express_sandbox_merchant_id' => '',
diff --git a/includes/class-paypal-for-woocommerce-multi-account-management.php b/includes/class-paypal-for-woocommerce-multi-account-management.php
index 28abc04..ff8d0df 100644
--- a/includes/class-paypal-for-woocommerce-multi-account-management.php
+++ b/includes/class-paypal-for-woocommerce-multi-account-management.php
@@ -184,14 +184,18 @@ private function define_admin_hooks() {
         $this->loader->add_action('woocommerce_create_refund', $express_checkout, 'own_woocommerce_create_refund', 10, 2);
         $this->loader->add_filter('angelleye_multi_account_need_shipping', $express_checkout, 'own_angelleye_multi_account_need_shipping', 10, 3);
         
-        $vendor = new Paypal_For_Woocommerce_Multi_Account_Management_Vendor($this->get_plugin_name(), $this->get_version());
-        $this->loader->add_action('personal_options_update', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
-        $this->loader->add_action('edit_user_profile_update', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
-        $this->loader->add_action('user_register', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
-        $this->loader->add_action('profile_update', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
-        $this->loader->add_action('wcv_pro_store_settings_saved', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
-        $this->loader->add_action('dokan_new_seller_created', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
-        $this->loader->add_action('dokan_store_profile_saved', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+        $global_automatic_rule_creation_enable = get_option('global_automatic_rule_creation_enable', '');
+        
+        if( $global_automatic_rule_creation_enable == 'on' ) {
+            $vendor = new Paypal_For_Woocommerce_Multi_Account_Management_Vendor($this->get_plugin_name(), $this->get_version());
+            $this->loader->add_action('personal_options_update', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+            $this->loader->add_action('edit_user_profile_update', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+            $this->loader->add_action('user_register', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+            $this->loader->add_action('profile_update', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+            $this->loader->add_action('wcv_pro_store_settings_saved', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+            $this->loader->add_action('dokan_new_seller_created', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+            $this->loader->add_action('dokan_store_profile_saved', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+        }
     }
 
     /**

From 643ddc909085cf76e197fb9c7d89e8391ba2be8d Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@users.noreply.github.com>
Date: Fri, 22 May 2020 17:08:41 +0530
Subject: [PATCH 09/18] Add function for count active/deactivate vendor
 account, PFWMA-131

---
 ...ommerce-multi-account-management-admin.php | 98 ++++++++++++++-----
 1 file changed, 76 insertions(+), 22 deletions(-)

diff --git a/admin/class-paypal-for-woocommerce-multi-account-management-admin.php b/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
index 4c8a4e4..cbbfca0 100644
--- a/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
+++ b/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
@@ -567,28 +567,28 @@ public function angelleye_multi_account_settings_fields() {
                         </td>
                     </tr>
                     <?php if (function_exists('dokan') || class_exists('WCV_Vendors')) { ?>
-                    <tr class="angelleye_multi_account_paypal_express_field" valign="top">
-                        <th scope="row" class="titledesc">
-                            <label for="global_automatic_rule_creation_enable"><?php echo __('Enable / Disable', ''); ?></label>
-                        </th>
-                        <td class="forminp">
-                            <fieldset>
-                                <label for="global_automatic_rule_creation_enable">
-                                    <input class="global_automatic_rule_creation_enable" name="global_automatic_rule_creation_enable" id="global_automatic_rule_creation_enable" type="checkbox" <?php echo ($global_automatic_rule_creation_enable == 'on') ? 'checked' : '' ?> ><?php echo __('Enable Automatic Rule Creation', ''); ?> </label><br>
-                            </fieldset>
-                        </td>
-                    </tr>
-                    <tr class="angelleye_multi_account_paypal_express_field" valign="top">
-                        <th scope="row" class="titledesc">
-                            <label for="global_automatic_rule_creation_testmode"><?php echo __('PayPal Sandbox', ''); ?></label>
-                        </th>
-                        <td class="forminp">
-                            <fieldset>
-                                <label for="global_automatic_rule_creation_testmode">
-                                    <input class="global_automatic_rule_creation_testmode" name="global_automatic_rule_creation_testmode" id="global_automatic_rule_creation_testmode" type="checkbox" <?php echo ($global_automatic_rule_creation_testmode == 'on') ? 'checked' : '' ?> ><?php echo __('Enable PayPal Sandbox for Automatic Rule Creation', '') ; ?></label><br>
-                            </fieldset>
-                        </td>
-                    </tr>
+                        <tr class="angelleye_multi_account_paypal_express_field" valign="top">
+                            <th scope="row" class="titledesc">
+                                <label for="global_automatic_rule_creation_enable"><?php echo __('Enable / Disable', ''); ?></label>
+                            </th>
+                            <td class="forminp">
+                                <fieldset>
+                                    <label for="global_automatic_rule_creation_enable">
+                                        <input class="global_automatic_rule_creation_enable" name="global_automatic_rule_creation_enable" id="global_automatic_rule_creation_enable" type="checkbox" <?php echo ($global_automatic_rule_creation_enable == 'on') ? 'checked' : '' ?> ><?php echo __('Enable Automatic Rule Creation', ''); ?> </label><br>
+                                </fieldset>
+                            </td>
+                        </tr>
+                        <tr class="angelleye_multi_account_paypal_express_field" valign="top">
+                            <th scope="row" class="titledesc">
+                                <label for="global_automatic_rule_creation_testmode"><?php echo __('PayPal Sandbox', ''); ?></label>
+                            </th>
+                            <td class="forminp">
+                                <fieldset>
+                                    <label for="global_automatic_rule_creation_testmode">
+                                        <input class="global_automatic_rule_creation_testmode" name="global_automatic_rule_creation_testmode" id="global_automatic_rule_creation_testmode" type="checkbox" <?php echo ($global_automatic_rule_creation_testmode == 'on') ? 'checked' : '' ?> ><?php echo __('Enable PayPal Sandbox for Automatic Rule Creation', ''); ?></label><br>
+                                </fieldset>
+                            </td>
+                        </tr>
                     <?php } ?>
                     <tr>
                         <th scope="row" class="titledesc">
@@ -694,7 +694,10 @@ public function angelleye_multi_account_list() {
         <br>
         <h1 class="wp-heading-inline"><?php echo __('Accounts', ''); ?></h1>
         <a href="<?php echo esc_url(admin_url('admin.php?page=wc-settings&tab=multi_account_management&section=add_edit_account')); ?>" class="page-title-action">Add New</a>
+
         <?php
+        $active_count = $this->angelleye_multi_account_get_count_active_vendor();
+        $deactive_count =  $this->angelleye_multi_account_get_count_deactive_vendor();
         if (class_exists('Paypal_For_Woocommerce_Multi_Account_Management_List_Data')) {
             $table = new Paypal_For_Woocommerce_Multi_Account_Management_List_Data();
             $table->prepare_items();
@@ -2129,4 +2132,55 @@ public function angelleye_save_multi_account_data_paypal() {
         }
     }
 
+    public function angelleye_multi_account_get_count_active_vendor() {
+        $args = array(
+            'post_type' => 'microprocessing',
+            'posts_per_page' => -1,
+            'meta_query' => array(
+                'relation' => 'AND',
+                array(
+                    'key' => 'vendor_id',
+                    'compare' => 'EXISTS'
+                ),
+                array(
+                    'key' => 'woocommerce_paypal_express_enable',
+                    'value' => 'on',
+                    'compare' => 'LIKE'
+                )
+            ),
+            'fields' => 'ids'
+        );
+        $query = new WP_Query($args);
+        if (!empty($query->found_posts) && $query->found_posts > 0) {
+            return $query->found_posts;
+        }
+        return false;
+    }
+
+    public function angelleye_multi_account_get_count_deactive_vendor() {
+        $args = array(
+            'post_type' => 'microprocessing',
+            'posts_per_page' => -1,
+            'meta_query' => array(
+                'relation' => 'AND',
+                array(
+                    'key' => 'vendor_id',
+                    'compare' => 'EXISTS'
+                ),
+                array(
+                    'key' => 'woocommerce_paypal_express_enable',
+                    'value' => '',
+                    'compare' => '='
+                )
+            ),
+            'fields' => 'ids'
+        );
+        $query = new WP_Query($args);
+        $query = new WP_Query($args);
+        if (!empty($query->found_posts) && $query->found_posts > 0) {
+            return $query->found_posts;
+        }
+        return false;
+    }
+
 }

From fab5685455cc88174fcf2b2eb2b3d35305c2152f Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@users.noreply.github.com>
Date: Mon, 25 May 2020 14:21:41 +0530
Subject: [PATCH 10/18] Add enable/disable auto generate rule button, PFWMA-131

---
 ...ommerce-multi-account-management-admin.php | 94 ++++++++++++++++++-
 ...commerce-multi-account-management-admin.js | 50 +++++++++-
 ...r-woocommerce-multi-account-management.php |  6 +-
 3 files changed, 143 insertions(+), 7 deletions(-)

diff --git a/admin/class-paypal-for-woocommerce-multi-account-management-admin.php b/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
index cbbfca0..cc0f0b2 100644
--- a/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
+++ b/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
@@ -690,14 +690,25 @@ public function angelleye_multi_account_ui() {
     }
 
     public function angelleye_multi_account_list() {
+        $active_count = $this->angelleye_multi_account_get_count_active_vendor();
+        $deactive_count =  $this->angelleye_multi_account_get_count_deactive_vendor();
+        wp_localize_script('paypal-for-woocommerce-multi-account-management', 'pfwma_param', 
+            array(
+                'disable_all_vendor_rules_alert_message' => sprintf( __('This will disable %s auto generated rules, Would you like to continue?', ''), $active_count),
+                'enable_all_vendor_rules_alert_message' => sprintf( __('This will enable %s auto generated rules, Would you like to continue?', ''), $deactive_count)
+            )
+        );
         ?>
         <br>
         <h1 class="wp-heading-inline"><?php echo __('Accounts', ''); ?></h1>
-        <a href="<?php echo esc_url(admin_url('admin.php?page=wc-settings&tab=multi_account_management&section=add_edit_account')); ?>" class="page-title-action">Add New</a>
-
+        <a href="<?php echo esc_url(admin_url('admin.php?page=wc-settings&tab=multi_account_management&section=add_edit_account')); ?>" class="page-title-action"><?php echo __('Add New', ''); ?></a>
         <?php
-        $active_count = $this->angelleye_multi_account_get_count_active_vendor();
-        $deactive_count =  $this->angelleye_multi_account_get_count_deactive_vendor();
+        if($active_count !== false) {
+            ?> <a class="page-title-action disable_all_vendor_rules"><?php echo __('Disable all vendor rules', ''); ?></a> <?php
+        }
+        if($deactive_count !== false) {
+            ?> <a class="page-title-action enable_all_vendor_rules"><?php echo __('Enable all vendor rules', ''); ?></a> <?php
+        }
         if (class_exists('Paypal_For_Woocommerce_Multi_Account_Management_List_Data')) {
             $table = new Paypal_For_Woocommerce_Multi_Account_Management_List_Data();
             $table->prepare_items();
@@ -2182,5 +2193,80 @@ public function angelleye_multi_account_get_count_deactive_vendor() {
         }
         return false;
     }
+    
+    public function angelleye_multi_account_disable_active_vendor_account() {
+        $args = array(
+            'post_type' => 'microprocessing',
+            'posts_per_page' => -1,
+            'meta_query' => array(
+                'relation' => 'AND',
+                array(
+                    'key' => 'vendor_id',
+                    'compare' => 'EXISTS'
+                ),
+                array(
+                    'key' => 'woocommerce_paypal_express_enable',
+                    'value' => 'on',
+                    'compare' => 'LIKE'
+                )
+            ),
+            'fields' => 'ids'
+        );
+        $query = new WP_Query($args);
+        if (!empty($query->found_posts) && $query->found_posts > 0) {
+            foreach ($query->posts as $key => $post_id) {
+                update_post_meta($post_id, 'woocommerce_paypal_express_enable', '');
+            }
+        }
+        return $query->found_posts;
+    }
+    
+    public function angelleye_multi_account_enable_active_vendor_account() {
+        $args = array(
+            'post_type' => 'microprocessing',
+            'posts_per_page' => -1,
+            'meta_query' => array(
+                'relation' => 'AND',
+                array(
+                    'key' => 'vendor_id',
+                    'compare' => 'EXISTS'
+                ),
+                array(
+                    'key' => 'woocommerce_paypal_express_enable',
+                    'value' => '',
+                    'compare' => '='
+                )
+            ),
+            'fields' => 'ids'
+        );
+        $query = new WP_Query($args);
+        if (!empty($query->found_posts) && $query->found_posts > 0) {
+            foreach ($query->posts as $key => $post_id) {
+                update_post_meta($post_id, 'woocommerce_paypal_express_enable', 'on');
+            }
+        }
+        return $query->found_posts;
+    }
+    
+    public function angelleye_pfwma_disable_all_vendor_rules() {
+        $update_count = $this->angelleye_multi_account_disable_active_vendor_account();
+        $redirect_url = admin_url('admin.php?page=wc-settings&tab=multi_account_management&section&pfwma_processed=' . $update_count);
+        echo $redirect_url;
+        exit();
+    }
+    
+    public function angelleye_pfwma_enable_all_vendor_rules() {
+        $update_count = $this->angelleye_multi_account_enable_active_vendor_account();
+        $redirect_url = admin_url('admin.php?page=wc-settings&tab=multi_account_management&section&pfwma_processed=' . $update_count);
+        echo $redirect_url;
+        exit();
+    }
+    
+    public function angelleye_pfwma_display_notice() {
+        $pfwma_processed = (isset($_GET['pfwma_processed']) ) ? $_GET['pfwma_processed'] : FALSE;
+        if($pfwma_processed) {
+            $this->message =  sprintf( __('Action completed; %s records processed. ', 'paypal-for-woocommerce'), $pfwma_processed);
+        }
+    }
 
 }
diff --git a/admin/js/paypal-for-woocommerce-multi-account-management-admin.js b/admin/js/paypal-for-woocommerce-multi-account-management-admin.js
index 362b4e2..ae0ef50 100644
--- a/admin/js/paypal-for-woocommerce-multi-account-management-admin.js
+++ b/admin/js/paypal-for-woocommerce-multi-account-management-admin.js
@@ -180,4 +180,52 @@ jQuery(document).off('click', '#angelleye-updater-notice .notice-dismiss').on('c
             });
         });
     } 
-});
\ No newline at end of file
+});
+jQuery('.disable_all_vendor_rules').on('click', function (event) {
+        var r = confirm(pfwma_param.disable_all_vendor_rules_alert_message);
+        if (r == true) {
+            jQuery(".disable_all_vendor_rules").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});
+            var data = {
+                'action': 'pfwma_disable_all_vendor_rules'
+            };
+            jQuery.post(ajaxurl, data, function (response) {
+                if ('failed' !== response)
+                {
+                    var redirectUrl = response;
+                    top.location.replace(redirectUrl);
+                    return true;
+                } else
+                {
+                    alert('Error updating records.');
+                    return false;
+                }
+            });
+        } else {
+            event.preventDefault();
+            return r;
+        }
+});
+jQuery('.enable_all_vendor_rules').on('click', function (event) {
+        var r = confirm(pfwma_param.enable_all_vendor_rules_alert_message);
+        if (r == true) {
+            jQuery(".enable_all_vendor_rules").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});
+            var data = {
+                'action': 'pfwma_enable_all_vendor_rules'
+            };
+            jQuery.post(ajaxurl, data, function (response) {
+                if ('failed' !== response)
+                {
+                    var redirectUrl = response;
+                    top.location.replace(redirectUrl);
+                    return true;
+                } else
+                {
+                    alert('Error updating records.');
+                    return false;
+                }
+            });
+        } else {
+            event.preventDefault();
+            return r;
+        }
+});
diff --git a/includes/class-paypal-for-woocommerce-multi-account-management.php b/includes/class-paypal-for-woocommerce-multi-account-management.php
index ff8d0df..5b74b6d 100644
--- a/includes/class-paypal-for-woocommerce-multi-account-management.php
+++ b/includes/class-paypal-for-woocommerce-multi-account-management.php
@@ -183,9 +183,7 @@ private function define_admin_hooks() {
         //$this->loader->add_filter('woocommerce_paypal_args', $paypal, 'angelleye_woocommerce_paypal_args', 10, 2);
         $this->loader->add_action('woocommerce_create_refund', $express_checkout, 'own_woocommerce_create_refund', 10, 2);
         $this->loader->add_filter('angelleye_multi_account_need_shipping', $express_checkout, 'own_angelleye_multi_account_need_shipping', 10, 3);
-        
         $global_automatic_rule_creation_enable = get_option('global_automatic_rule_creation_enable', '');
-        
         if( $global_automatic_rule_creation_enable == 'on' ) {
             $vendor = new Paypal_For_Woocommerce_Multi_Account_Management_Vendor($this->get_plugin_name(), $this->get_version());
             $this->loader->add_action('personal_options_update', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
@@ -196,6 +194,10 @@ private function define_admin_hooks() {
             $this->loader->add_action('dokan_new_seller_created', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
             $this->loader->add_action('dokan_store_profile_saved', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
         }
+        $this->loader->add_action('wp_ajax_pfwma_disable_all_vendor_rules', $plugin_admin, 'angelleye_pfwma_disable_all_vendor_rules');
+        $this->loader->add_action('wp_ajax_pfwma_enable_all_vendor_rules', $plugin_admin, 'angelleye_pfwma_enable_all_vendor_rules');
+        $this->loader->add_action( 'admin_init', $plugin_admin, 'angelleye_pfwma_display_notice');
+        
     }
 
     /**

From 66aac2ac9ec58704a1749cdeb0b0af5bade18426 Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@users.noreply.github.com>
Date: Mon, 25 May 2020 15:45:57 +0530
Subject: [PATCH 11/18] update text, PFWMA-131

---
 ...pal-for-woocommerce-multi-account-management-admin.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/admin/class-paypal-for-woocommerce-multi-account-management-admin.php b/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
index cc0f0b2..faf876c 100644
--- a/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
+++ b/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
@@ -692,10 +692,12 @@ public function angelleye_multi_account_ui() {
     public function angelleye_multi_account_list() {
         $active_count = $this->angelleye_multi_account_get_count_active_vendor();
         $deactive_count =  $this->angelleye_multi_account_get_count_deactive_vendor();
+        $active_rule_text = ($active_count > 1) ? 'rules' : 'rule';
+        $deactive_rule_text = ($deactive_count > 1) ? 'rules' : 'rule';
         wp_localize_script('paypal-for-woocommerce-multi-account-management', 'pfwma_param', 
             array(
-                'disable_all_vendor_rules_alert_message' => sprintf( __('This will disable %s auto generated rules, Would you like to continue?', ''), $active_count),
-                'enable_all_vendor_rules_alert_message' => sprintf( __('This will enable %s auto generated rules, Would you like to continue?', ''), $deactive_count)
+                'disable_all_vendor_rules_alert_message' => sprintf( __('This will disable %s auto generated %s, Would you like to continue?', 'paypal-for-woocommerce-multi-account-management'), $active_count, $active_rule_text),
+                'enable_all_vendor_rules_alert_message' => sprintf( __('This will enable %s auto generated %s, Would you like to continue?', 'paypal-for-woocommerce-multi-account-management'), $deactive_count, $deactive_rule_text)
             )
         );
         ?>
@@ -2265,7 +2267,7 @@ public function angelleye_pfwma_enable_all_vendor_rules() {
     public function angelleye_pfwma_display_notice() {
         $pfwma_processed = (isset($_GET['pfwma_processed']) ) ? $_GET['pfwma_processed'] : FALSE;
         if($pfwma_processed) {
-            $this->message =  sprintf( __('Action completed; %s records processed. ', 'paypal-for-woocommerce'), $pfwma_processed);
+            $this->message =  __('Action completed; ', 'paypal-for-woocommerce-multi-account-management') . sprintf( _n( '%s record ', '%s records ', $pfwma_processed, 'paypal-for-woocommerce-multi-account-management' ), $pfwma_processed ) . __('processed.', 'paypal-for-woocommerce-multi-account-management');
         }
     }
 

From e3e402645b5a1fc360c9cf32175a3aff830a78ad Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@users.noreply.github.com>
Date: Mon, 1 Jun 2020 09:39:37 +0530
Subject: [PATCH 12/18] create multi-account rule when role change, PFWMA-131

---
 ...ypal-for-woocommerce-multi-account-management-vendor.php | 3 +++
 ...lass-paypal-for-woocommerce-multi-account-management.php | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/includes/class-paypal-for-woocommerce-multi-account-management-vendor.php b/includes/class-paypal-for-woocommerce-multi-account-management-vendor.php
index e6ecda8..aab8cfa 100644
--- a/includes/class-paypal-for-woocommerce-multi-account-management-vendor.php
+++ b/includes/class-paypal-for-woocommerce-multi-account-management-vendor.php
@@ -210,6 +210,9 @@ public function angelleye_paypal_for_woocommerce_multi_account_rule_save_wc_vend
 
     public function angelleye_paypal_for_woocommerce_multi_account_rule_save($vendor_id) {
         try {
+            if(is_object($vendor_id)) {
+                $vendor_id = $vendor_id->ID;
+            }
             $dokan_profile_settings = get_user_meta($vendor_id, 'dokan_profile_settings', true);
             if (!empty($dokan_profile_settings)) {
                 $this->angelleye_paypal_for_woocommerce_multi_account_rule_save_dokan($vendor_id);
diff --git a/includes/class-paypal-for-woocommerce-multi-account-management.php b/includes/class-paypal-for-woocommerce-multi-account-management.php
index 5b74b6d..2601e62 100644
--- a/includes/class-paypal-for-woocommerce-multi-account-management.php
+++ b/includes/class-paypal-for-woocommerce-multi-account-management.php
@@ -193,6 +193,8 @@ private function define_admin_hooks() {
             $this->loader->add_action('wcv_pro_store_settings_saved', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
             $this->loader->add_action('dokan_new_seller_created', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
             $this->loader->add_action('dokan_store_profile_saved', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+            $this->loader->add_action('wcvendors_approve_vendor', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+            
         }
         $this->loader->add_action('wp_ajax_pfwma_disable_all_vendor_rules', $plugin_admin, 'angelleye_pfwma_disable_all_vendor_rules');
         $this->loader->add_action('wp_ajax_pfwma_enable_all_vendor_rules', $plugin_admin, 'angelleye_pfwma_enable_all_vendor_rules');
@@ -304,12 +306,12 @@ public function display_plugin_admin_page_submenu() {
                     }
                     ?>"><?php echo __('All PayPal Acounts', 'angelleye-paypal-shipment-tracking-woocommerce'); ?></a> |</li>
                 <li><a href="<?php echo esc_url(admin_url('admin.php?page=wc-settings&tab=multi_account_management&section=add_edit_account')); ?>" class="<?php
-                    if ($_GET['section'] == 'add_edit_account') {
+                    if (!empty($_GET['section']) && $_GET['section'] == 'add_edit_account') {
                         echo 'current';
                     }
                     ?>"><?php echo __('Add / Edit Acounts', 'angelleye-paypal-shipment-tracking-woocommerce'); ?></a> | </li>
                 <li><a href="<?php echo esc_url(admin_url('admin.php?page=wc-settings&tab=multi_account_management&section=settings')); ?>" class="<?php
-                    if ($_GET['section'] == 'settings') {
+                    if (!empty($_GET['section']) && $_GET['section'] == 'settings') {
                         echo 'current';
                     }
                     ?>"><?php echo __('Settings', 'angelleye-paypal-shipment-tracking-woocommerce'); ?></a>  </li>

From b19079ea9f31d75798c5fb2d479ee2cf2318b8d1 Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@users.noreply.github.com>
Date: Tue, 2 Jun 2020 14:45:49 +0530
Subject: [PATCH 13/18] add new hook for wc vendor free version, PFWMA-131

---
 .../class-paypal-for-woocommerce-multi-account-management.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/includes/class-paypal-for-woocommerce-multi-account-management.php b/includes/class-paypal-for-woocommerce-multi-account-management.php
index 2601e62..1e189de 100644
--- a/includes/class-paypal-for-woocommerce-multi-account-management.php
+++ b/includes/class-paypal-for-woocommerce-multi-account-management.php
@@ -194,6 +194,7 @@ private function define_admin_hooks() {
             $this->loader->add_action('dokan_new_seller_created', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
             $this->loader->add_action('dokan_store_profile_saved', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
             $this->loader->add_action('wcvendors_approve_vendor', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+            $this->loader->add_action('wcvendors_shop_settings_saved', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
             
         }
         $this->loader->add_action('wp_ajax_pfwma_disable_all_vendor_rules', $plugin_admin, 'angelleye_pfwma_disable_all_vendor_rules');

From 53c8f02bc5eaa875865e292fd5aab077a73b7974 Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@users.noreply.github.com>
Date: Wed, 3 Jun 2020 09:51:05 +0530
Subject: [PATCH 14/18] Add new hook for admin shop setting for wc vendor,
 PFWMA-131

---
 .../class-paypal-for-woocommerce-multi-account-management.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/includes/class-paypal-for-woocommerce-multi-account-management.php b/includes/class-paypal-for-woocommerce-multi-account-management.php
index 1e189de..8ed2c32 100644
--- a/includes/class-paypal-for-woocommerce-multi-account-management.php
+++ b/includes/class-paypal-for-woocommerce-multi-account-management.php
@@ -195,6 +195,7 @@ private function define_admin_hooks() {
             $this->loader->add_action('dokan_store_profile_saved', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
             $this->loader->add_action('wcvendors_approve_vendor', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
             $this->loader->add_action('wcvendors_shop_settings_saved', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+            $this->loader->add_action('wcvendors_shop_settings_admin_saved', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
             
         }
         $this->loader->add_action('wp_ajax_pfwma_disable_all_vendor_rules', $plugin_admin, 'angelleye_pfwma_disable_all_vendor_rules');

From 5e3dcb808a9efda2af16d24a68ddb4020baee1b0 Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@users.noreply.github.com>
Date: Wed, 3 Jun 2020 10:25:13 +0530
Subject: [PATCH 15/18] Add new hook for dokan lite, PFWMA-131

---
 ...paypal-for-woocommerce-multi-account-management-vendor.php | 4 +++-
 .../class-paypal-for-woocommerce-multi-account-management.php | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/includes/class-paypal-for-woocommerce-multi-account-management-vendor.php b/includes/class-paypal-for-woocommerce-multi-account-management-vendor.php
index aab8cfa..0b8968d 100644
--- a/includes/class-paypal-for-woocommerce-multi-account-management-vendor.php
+++ b/includes/class-paypal-for-woocommerce-multi-account-management-vendor.php
@@ -210,8 +210,10 @@ public function angelleye_paypal_for_woocommerce_multi_account_rule_save_wc_vend
 
     public function angelleye_paypal_for_woocommerce_multi_account_rule_save($vendor_id) {
         try {
-            if(is_object($vendor_id)) {
+            if(is_object($vendor_id) && isset($vendor_id->ID)) {
                 $vendor_id = $vendor_id->ID;
+            } elseif (is_object($vendor_id) && isset($vendor_id->store_id)) {
+                $vendor_id = $vendor_id->store_id;
             }
             $dokan_profile_settings = get_user_meta($vendor_id, 'dokan_profile_settings', true);
             if (!empty($dokan_profile_settings)) {
diff --git a/includes/class-paypal-for-woocommerce-multi-account-management.php b/includes/class-paypal-for-woocommerce-multi-account-management.php
index 8ed2c32..d78b1a4 100644
--- a/includes/class-paypal-for-woocommerce-multi-account-management.php
+++ b/includes/class-paypal-for-woocommerce-multi-account-management.php
@@ -196,6 +196,9 @@ private function define_admin_hooks() {
             $this->loader->add_action('wcvendors_approve_vendor', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
             $this->loader->add_action('wcvendors_shop_settings_saved', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
             $this->loader->add_action('wcvendors_shop_settings_admin_saved', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+            $this->loader->add_action('dokan_process_seller_meta_fields', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+            $this->loader->add_action('dokan_new_vendor', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
+            $this->loader->add_action('dokan_seller_wizard_payment_field_save', $vendor, 'angelleye_paypal_for_woocommerce_multi_account_rule_save');
             
         }
         $this->loader->add_action('wp_ajax_pfwma_disable_all_vendor_rules', $plugin_admin, 'angelleye_pfwma_disable_all_vendor_rules');

From 3ebd4e18d4ecf3f8c04bbf7a3e3aa82632821e31 Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@users.noreply.github.com>
Date: Sat, 6 Jun 2020 12:06:41 +0530
Subject: [PATCH 16/18] update button label, PFWMA-131

---
 ...aypal-for-woocommerce-multi-account-management-admin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/class-paypal-for-woocommerce-multi-account-management-admin.php b/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
index faf876c..7d736b8 100644
--- a/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
+++ b/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
@@ -703,13 +703,13 @@ public function angelleye_multi_account_list() {
         ?>
         <br>
         <h1 class="wp-heading-inline"><?php echo __('Accounts', ''); ?></h1>
-        <a href="<?php echo esc_url(admin_url('admin.php?page=wc-settings&tab=multi_account_management&section=add_edit_account')); ?>" class="page-title-action"><?php echo __('Add New', ''); ?></a>
+        <a href="<?php echo esc_url(admin_url('admin.php?page=wc-settings&tab=multi_account_management&section=add_edit_account')); ?>" class="page-title-action"><?php echo __('Add New', 'paypal-for-woocommerce-multi-account-management'); ?></a>
         <?php
         if($active_count !== false) {
-            ?> <a class="page-title-action disable_all_vendor_rules"><?php echo __('Disable all vendor rules', ''); ?></a> <?php
+            ?> <a class="page-title-action disable_all_vendor_rules"><?php echo __('Disable All Auto-generated Vendor rules', 'paypal-for-woocommerce-multi-account-management'); ?></a> <?php
         }
         if($deactive_count !== false) {
-            ?> <a class="page-title-action enable_all_vendor_rules"><?php echo __('Enable all vendor rules', ''); ?></a> <?php
+            ?> <a class="page-title-action enable_all_vendor_rules"><?php echo __('Enable All Auto-generated Vendor rules', 'paypal-for-woocommerce-multi-account-management'); ?></a> <?php
         }
         if (class_exists('Paypal_For_Woocommerce_Multi_Account_Management_List_Data')) {
             $table = new Paypal_For_Woocommerce_Multi_Account_Management_List_Data();

From 2c06f8aa485bfc9e9d8fe8df6b16a5a73cd89fc4 Mon Sep 17 00:00:00 2001
From: kcppdevelopers <kcppdevelopers@users.noreply.github.com>
Date: Sat, 6 Jun 2020 12:15:46 +0530
Subject: [PATCH 17/18] Add vendor header, PFWMA-131

---
 ...or-woocommerce-multi-account-management-admin.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/admin/class-paypal-for-woocommerce-multi-account-management-admin.php b/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
index 7d736b8..2b13751 100644
--- a/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
+++ b/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
@@ -566,6 +566,14 @@ public function angelleye_multi_account_settings_fields() {
                             </fieldset>
                         </td>
                     </tr>
+                </table>
+                 <?php if (function_exists('dokan') ) { 
+                     echo '<h2>' . __('Dokan Settings', 'paypal-for-woocommerce-multi-account-management') . '</h2>';
+                 } elseif(class_exists('WCV_Vendors')) {
+                     echo '<h2>' . __('WC Vendors Settings', 'paypal-for-woocommerce-multi-account-management') . '</h2>';
+                 }
+                 ?>
+                <table class="form-table">
                     <?php if (function_exists('dokan') || class_exists('WCV_Vendors')) { ?>
                         <tr class="angelleye_multi_account_paypal_express_field" valign="top">
                             <th scope="row" class="titledesc">
@@ -574,7 +582,7 @@ public function angelleye_multi_account_settings_fields() {
                             <td class="forminp">
                                 <fieldset>
                                     <label for="global_automatic_rule_creation_enable">
-                                        <input class="global_automatic_rule_creation_enable" name="global_automatic_rule_creation_enable" id="global_automatic_rule_creation_enable" type="checkbox" <?php echo ($global_automatic_rule_creation_enable == 'on') ? 'checked' : '' ?> ><?php echo __('Enable Automatic Rule Creation', ''); ?> </label><br>
+                                        <input class="global_automatic_rule_creation_enable" name="global_automatic_rule_creation_enable" id="global_automatic_rule_creation_enable" type="checkbox" <?php echo ($global_automatic_rule_creation_enable == 'on') ? 'checked' : '' ?> ><?php echo __('Enable Automatic Rule Creation', 'paypal-for-woocommerce-multi-account-management'); ?> </label><br>
                                 </fieldset>
                             </td>
                         </tr>
@@ -585,7 +593,7 @@ public function angelleye_multi_account_settings_fields() {
                             <td class="forminp">
                                 <fieldset>
                                     <label for="global_automatic_rule_creation_testmode">
-                                        <input class="global_automatic_rule_creation_testmode" name="global_automatic_rule_creation_testmode" id="global_automatic_rule_creation_testmode" type="checkbox" <?php echo ($global_automatic_rule_creation_testmode == 'on') ? 'checked' : '' ?> ><?php echo __('Enable PayPal Sandbox for Automatic Rule Creation', ''); ?></label><br>
+                                        <input class="global_automatic_rule_creation_testmode" name="global_automatic_rule_creation_testmode" id="global_automatic_rule_creation_testmode" type="checkbox" <?php echo ($global_automatic_rule_creation_testmode == 'on') ? 'checked' : '' ?> ><?php echo __('Enable PayPal Sandbox for Automatic Rule Creation', 'paypal-for-woocommerce-multi-account-management'); ?></label><br>
                                 </fieldset>
                             </td>
                         </tr>

From 0c14380452a9d0d820924b32b8eb1365625a942e Mon Sep 17 00:00:00 2001
From: Deepak Maurya <deepakmaurya@hotmail.com>
Date: Sun, 7 Jun 2020 22:29:18 +0530
Subject: [PATCH 18/18] Fixed the label verbiage, PFWMA-131

---
 ...-paypal-for-woocommerce-multi-account-management-admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/class-paypal-for-woocommerce-multi-account-management-admin.php b/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
index 2b13751..9966fbc 100644
--- a/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
+++ b/admin/class-paypal-for-woocommerce-multi-account-management-admin.php
@@ -714,10 +714,10 @@ public function angelleye_multi_account_list() {
         <a href="<?php echo esc_url(admin_url('admin.php?page=wc-settings&tab=multi_account_management&section=add_edit_account')); ?>" class="page-title-action"><?php echo __('Add New', 'paypal-for-woocommerce-multi-account-management'); ?></a>
         <?php
         if($active_count !== false) {
-            ?> <a class="page-title-action disable_all_vendor_rules"><?php echo __('Disable All Auto-generated Vendor rules', 'paypal-for-woocommerce-multi-account-management'); ?></a> <?php
+            ?> <a class="page-title-action disable_all_vendor_rules"><?php echo __('Disable All Auto-generated Vendor Rules', 'paypal-for-woocommerce-multi-account-management'); ?></a> <?php
         }
         if($deactive_count !== false) {
-            ?> <a class="page-title-action enable_all_vendor_rules"><?php echo __('Enable All Auto-generated Vendor rules', 'paypal-for-woocommerce-multi-account-management'); ?></a> <?php
+            ?> <a class="page-title-action enable_all_vendor_rules"><?php echo __('Enable All Auto-generated Vendor Rules', 'paypal-for-woocommerce-multi-account-management'); ?></a> <?php
         }
         if (class_exists('Paypal_For_Woocommerce_Multi_Account_Management_List_Data')) {
             $table = new Paypal_For_Woocommerce_Multi_Account_Management_List_Data();