Feat/product form manager

.gitignore

@@ -4,6 +4,7 @@ npm-debug.log
 .DS_Store
 includes/.DS_Store
 .idea
+.vscode
 /includes/.DS_Store
 plugin-deploy.sh
 secret.json

assets/src/js/product-editor.js

@@ -203,11 +203,15 @@
 
         setCorrectProductId() {
             const productForm = $( '.dokan-product-edit-form' );
-            if ( ! productForm ) {
+            if ( ! productForm.length ) {
                 return;
             }
             const productId = $( '#dokan_product_id' ).val();
 
+            if ( typeof productId === 'undefined' ) {
+                return;
+            }
+
             if ( window.history.replaceState ) {
                 const url = new URL( document.location );
                 const searchParams = url.searchParams;

assets/src/less/dashboard.less

@@ -508,6 +508,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 {

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;
   }
 

dokan-class.php

@@ -16,6 +16,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 {
@@ -216,6 +217,7 @@ public function define_constants() {
         defined( 'DOKAN_PLUGIN_VERSION' ) || define( 'DOKAN_PLUGIN_VERSION', $this->version );
         defined( 'DOKAN_DIR' ) || define( 'DOKAN_DIR', __DIR__ );
         defined( 'DOKAN_INC_DIR' ) || define( 'DOKAN_INC_DIR', __DIR__ . '/includes' );
+        defined( 'DOKAN_TEMPLATE_DIR' ) || define( 'DOKAN_TEMPLATE_DIR', __DIR__ . '/templates' );
         defined( 'DOKAN_LIB_DIR' ) || define( 'DOKAN_LIB_DIR', __DIR__ . '/lib' );
         defined( 'DOKAN_PLUGIN_ASSEST' ) || define( 'DOKAN_PLUGIN_ASSEST', plugins_url( 'assets', DOKAN_FILE ) );
 

includes/Admin/Settings.php

@@ -664,25 +664,6 @@ public function get_settings_fields() {
                     'default' => 'automatically',
                     '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' ),

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' ] );
@@ -58,43 +56,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.
      *