getdokan · nurul-umbhiya · Sep 1, 2023 · Sep 4, 2023 · Sep 4, 2023 · Sep 5, 2023
diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,4 @@ assets/js/style.js
 assets/js/vue-admin.js.LICENSE.txt
 assets/js/vue-bootstrap.js.LICENSE.txt
 assets/js/vue-frontend.js.LICENSE.txt
+assets/js/dokan-tailwind.js
diff --git a/assets/src/js/product-editor.js b/assets/src/js/product-editor.js
diff --git a/assets/src/less/dashboard.less b/assets/src/less/dashboard.less
@@ -503,6 +503,14 @@ div.media-sidebar a.edit-attachment{
                 margin-bottom: 10px;
             }
         }
+
+        .product-edit-container {
+            span {
+                &.validation-error {
+                    display: block;
+                }
+            }
+        }
     }
 
     div.chart-container > div.chart-placeholder > div.legend {

diff --git a/assets/src/less/products.less b/assets/src/less/products.less
@@ -281,6 +281,10 @@
 }
 
 .product-edit-new-container {
+  .dokan-hide {
+    display: none;
+  }
+
   .dokan-edit-row {
     &.dokan-other-options {
       margin-bottom: 20px;
@@ -465,14 +469,36 @@
 
   .dokan-shipping-container {
     .dokan-shipping-dimention-options {
-      margin-bottom: 20px;
-      input {
+      margin-bottom: 5px;
+
+      .dokan-form-group {
         width: 23.3%;
         float: left;
         margin-right: 2%;
 
+        &#dokan-form-group-height {
+          margin-right: 0;
+        }
+
+        input {
+          &.dokan-form-control {
+            width: 100%;
+            margin-right: 0;
+            margin-bottom: 0;
+          }
+        }
+      }
+
+      input {
+        &.dokan-form-control {
+          float: left;
+          width: 23.3%;
+          margin-right: 2%;
+          margin-bottom: 15px;
+        }
+
         &#_height {
-          margin-right: 0px;
+          margin-right: 0;
         }
       }
     }
@@ -972,7 +998,7 @@
 
   .instruction-inside {
     text-align: center;
-    padding-top: 40px;
+    padding-top: 80px;
     color: #aaa;
   }
 

diff --git a/dokan.php b/dokan.php
@@ -57,6 +57,7 @@
  * @property WeDevs\Dokan\BackgroundProcess\Manager $bg_process Instance of WeDevs\Dokan\BackgroundProcess\Manager class
  * @property WeDevs\Dokan\Withdraw\Manager $withdraw Instance of WeDevs\Dokan\Withdraw\Manager class
  * @property WeDevs\Dokan\Frontend\Frontend $frontend_manager Instance of \WeDevs\Dokan\Frontend\Frontend class
+ * @property WeDevs\Dokan\Dashboard\Manager $dashboard Instance of \WeDevs\Dokan\Dashboard\Manager class
  * @property WeDevs\Dokan\Registration $registration Instance of WeDevs\Dokan\Registration class
  */
 final class WeDevs_Dokan {
@@ -259,6 +260,7 @@ public function define_constants() {
         $this->define( 'DOKAN_FILE', __FILE__ );
         $this->define( 'DOKAN_DIR', __DIR__ );
         $this->define( 'DOKAN_INC_DIR', __DIR__ . '/includes' );
+        $this->define( 'DOKAN_TEMPLATE_DIR', __DIR__ . '/templates' );
         $this->define( 'DOKAN_LIB_DIR', __DIR__ . '/lib' );
         $this->define( 'DOKAN_PLUGIN_ASSEST', plugins_url( 'assets', __FILE__ ) );
 
@@ -376,6 +378,7 @@ public function init_classes() {
         new \WeDevs\Dokan\Vendor\UserSwitch();
         new \WeDevs\Dokan\CacheInvalidate();
         new \WeDevs\Dokan\Shipping\Hooks();
+        new \WeDevs\Dokan\ProductForm\Init();
 
         if ( is_admin() ) {
             new \WeDevs\Dokan\Admin\Hooks();

diff --git a/includes/Admin/Notices/Manager.php b/includes/Admin/Notices/Manager.php
@@ -48,8 +48,6 @@ private function init_hooks() {
         add_action( 'admin_notices', [ $this, 'render_missing_woocommerce_notice' ] );
         add_action( 'admin_notices', [ $this, 'render_global_admin_notices_html' ] );
         add_filter( 'dokan_admin_notices', [ $this, 'show_permalink_setting_notice' ] );
-        add_filter( 'dokan_admin_notices', [ $this, 'show_one_step_product_add_notice' ] );
-        add_action( 'wp_ajax_dismiss_dokan_one_step_product_notice', [ $this, 'dismiss_dokan_one_step_product_notice' ] );
     }
 
     /**
@@ -126,52 +124,4 @@ public function show_permalink_setting_notice( $notices ) {
 
         return $notices;
     }
-
-    /**
-     * Display single page product page create notice.
-     *
-     * @since 3.8.2
-     *
-     * @param array $notices
-     *
-     * @return array
-     */
-    public function show_one_step_product_add_notice( $notices ) {
-        if ( 'yes' !== get_option( 'dismiss_dokan_one_step_product_nonce', 'no' ) ) {
-            $notices[] = [
-                'type'        => 'alert',
-                'title'       => __( 'New One-Step Product Form', 'dokan-lite' ),
-                'description' => __( 'Try it now to enhance your vendor\'s product upload experience, the older two-step version will be retired in one month.', 'dokan-lite' ),
-                'priority'    => 1,
-                'show_close_button' => true,
-                'ajax_data'   => [
-                    'action' => 'dismiss_dokan_one_step_product_notice',
-                    'nonce'  => wp_create_nonce( 'dismiss_dokan_one_step_product_nonce' ),
-                ],
-            ];
-        }
-
-        return $notices;
-    }
-
-    /**
-     * Dismisses one-step product create notice.
-     *
-     * @since 3.8.2
-     *
-     * @return void
-     */
-    public function dismiss_dokan_one_step_product_notice() {
-        if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( sanitize_key( wp_unslash( $_POST['nonce'] ) ), 'dismiss_dokan_one_step_product_nonce' ) ) {
-            wp_send_json_error( __( 'Invalid nonce', 'dokan-lite' ) );
-        }
-
-        // phpcs:ignore
-        if ( ! current_user_can( 'manage_woocommerce' ) ) {
-            wp_send_json_error( __( 'You have no permission to do that', 'dokan-lite' ) );
-        }
-
-        update_option( 'dismiss_dokan_one_step_product_nonce', 'yes' );
-        wp_send_json_success();
-    }
 }
diff --git a/includes/Admin/Settings.php b/includes/Admin/Settings.php
@@ -557,25 +557,6 @@ public function get_settings_fields() {
                     'default' => 'on',
                     'tooltip' => __( 'If checked, vendors will have permission to sell immediately after registration. If unchecked, newly registered vendors cannot add products until selling capability is activated manually from admin dashboard.', 'dokan-lite' ),
                 ],
-                'one_step_product_create'     => [
-                    'name'    => 'one_step_product_create',
-                    'label'   => __( 'One Page Product Creation', 'dokan-lite' ),
-                    'desc'    => __( 'Add new product in single page view', 'dokan-lite' ),
-                    'type'    => 'switcher',
-                    'default' => 'on',
-                    'tooltip' => __( 'If disabled, instead of a single add product page it will open a pop up window or vendor will redirect to product page when adding new product.', 'dokan-lite' ),
-                ],
-                'disable_product_popup'     => [
-                    'name'    => 'disable_product_popup',
-                    'label'   => __( 'Disable Product Popup', 'dokan-lite' ),
-                    'desc'    => __( 'Disable add new product in popup view', 'dokan-lite' ),
-                    'type'    => 'switcher',
-                    'default' => 'off',
-                    'show_if' => [
-                        'dokan_selling.one_step_product_create' => [ 'equal' => 'off' ],
-                    ],
-                    'tooltip' => __( 'If disabled, instead of a pop up window vendor will redirect to product page when adding new product.', 'dokan-lite' ),
-                ],
                 'order_status_change'       => [
                     'name'    => 'order_status_change',
                     'label'   => __( 'Order Status Change', 'dokan-lite' ),

diff --git a/includes/Ajax.php b/includes/Ajax.php
@@ -41,8 +41,6 @@ public function __construct() {
         add_action( 'wp_ajax_dokan_seller_listing_search', [ $this, 'seller_listing_search' ] );
         add_action( 'wp_ajax_nopriv_dokan_seller_listing_search', [ $this, 'seller_listing_search' ] );
 
-        add_action( 'wp_ajax_dokan_create_new_product', [ $this, 'create_product' ] );
-
         add_action( 'wp_ajax_custom-header-crop', [ $this, 'crop_store_banner' ] );
 
         add_action( 'wp_ajax_dokan_json_search_products_tags', [ $this, 'dokan_json_search_products_tags' ] );
@@ -57,43 +55,6 @@ public function __construct() {
         add_action( 'wp_ajax_dokan-upgrade-dissmiss', [ $this, 'dismiss_pro_notice' ] );
     }
 
-    /**
-     * Create product from popup submission
-     *
-     * @since  2.5.0
-     *
-     * @return void
-     */
-    public function create_product() {
-        check_ajax_referer( 'dokan_reviews' );
-
-        if ( ! current_user_can( 'dokan_add_product' ) ) {
-            wp_send_json_error( __( 'You have no permission to do this action', 'dokan-lite' ) );
-        }
-
-        $submited_data = isset( $_POST['postdata'] ) ? wp_unslash( $_POST['postdata'] ) : ''; //phpcs:ignore
-
-        parse_str( $submited_data, $postdata );
-
-        $response = dokan_save_product( $postdata );
-
-        if ( is_wp_error( $response ) ) {
-            wp_send_json_error( $response->get_error_message() );
-        }
-
-        if ( is_int( $response ) ) {
-            if ( current_user_can( 'dokan_edit_product' ) ) {
-                $redirect = dokan_edit_product_url( $response );
-            } else {
-                $redirect = dokan_get_navigation_url( 'products' );
-            }
-
-            wp_send_json_success( $redirect );
-        } else {
-            wp_send_json_error( __( 'Something wrong, please try again later', 'dokan-lite' ) );
-        }
-    }
-
     /**
      * Check the availability of shop name.
      *