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-class.php b/dokan-class.php
@@ -14,6 +14,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 {
@@ -214,6 +215,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 ) );
 

diff --git a/includes/Admin/Settings.php b/includes/Admin/Settings.php
@@ -634,25 +634,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.
      *

diff --git a/includes/Assets.php b/includes/Assets.php
@@ -6,6 +6,7 @@
 use WeDevs\Dokan\ReverseWithdrawal\SettingsHelper;
 use WeDevs\Dokan\ProductCategory\Helper as CategoryHelper;
 use WeDevs\Dokan\Utilities\OrderUtil;
+use WeDevs\Dokan\ProductForm\Factory as ProductFormFactory;
 
 class Assets {
 
@@ -527,7 +528,7 @@ public function get_scripts() {
             ],
             'dokan-util-helper'        => [
                 'src'       => $asset_url . '/js/helper.js',
-                'deps'      => [ 'jquery', 'dokan-sweetalert2', 'moment' ],
+                'deps'      => [ 'jquery', 'dokan-sweetalert2', 'moment', 'jquery-tiptip' ],
                 'version'   => filemtime( $asset_path . 'js/helper.js' ),
                 'in_footer' => false,
             ],
@@ -572,6 +573,15 @@ public function get_scripts() {
         return $scripts;
     }
 
+    public function get_product_fields() {
+        $temp_fields = [];
+        foreach ( ProductFormFactory::get_fields() as $field_id => $field ) {
+            $temp_fields[ $field_id ] = $field->toArray();
+        }
+
+        return json_encode( $temp_fields );
+    }
-    public function get_product_fields() {
-        $temp_fields = [];
-        foreach ( ProductFormFactory::get_fields() as $field_id => $field ) {
-            $temp_fields[ $field_id ] = $field->toArray();
-        }
-
-        return json_encode( $temp_fields );
-    }
+    public function get_product_fields() {
+        $temp_fields = [];
+        foreach ( ProductFormFactory::get_fields() as $field_id => $field ) {
+            $temp_fields[ $field_id ] = $field->toArray();
+        }
+
+        return wp_json_encode( $temp_fields );
+    }
-    public function get_product_fields() {
-        $temp_fields = [];
-        foreach ( ProductFormFactory::get_fields() as $field_id => $field ) {
-            $temp_fields[ $field_id ] = $field->toArray();
-        }
-
-        return json_encode( $temp_fields );
-    }
+    public function get_product_fields() {
+        $temp_fields = [];
+        foreach ( ProductFormFactory::get_fields() as $field_id => $field ) {
+            $temp_fields[ $field_id ] = $field->toArray();
+        }
+
+        return wp_json_encode( $temp_fields );
+    }
+
     /**
      * Enqueue front-end scripts
      */
@@ -617,6 +627,7 @@ public function enqueue_front_scripts() {
             'currency_format'              => esc_attr( str_replace( [ '%1$s', '%2$s' ], [ '%s', '%v' ], get_woocommerce_price_format() ) ), // For accounting JS
             'round_at_subtotal'            => get_option( 'woocommerce_tax_round_at_subtotal', 'no' ),
             'product_types'                => apply_filters( 'dokan_product_types', [ 'simple' ] ),
+            'product_form_fields'          => $this->get_product_fields(),
             'loading_img'                  => DOKAN_PLUGIN_ASSEST . '/images/loading.gif',
             'store_product_search_nonce'   => wp_create_nonce( 'dokan_store_product_search_nonce' ),
             'i18n_download_permission'     => __( 'Are you sure you want to revoke access to this download?', 'dokan-lite' ),
@@ -792,11 +803,9 @@ public function load_dokan_global_scripts() {
                     ],
                 ],
                 'sweetalert_local'       => [
-                    'cancelButtonText'     => __( 'Cancel', 'dokan-lite' ),
-                    'closeButtonText'      => __( 'Close', 'dokan-lite' ),
-                    'confirmButtonText'    => __( 'OK', 'dokan-lite' ),
-                    'denyButtonText'       => __( 'No', 'dokan-lite' ),
-                    'closeButtonAriaLabel' => __( 'Close this dialog', 'dokan-lite' ),
+                    'confirmButtonText'      => __( 'OK', 'dokan-lite' ),
+                    'denyButtonText'         => __( 'No', 'dokan-lite' ),
+                    'cancelButtonText'       => __( 'Cancel', 'dokan-lite' ),
                 ],
             ]
         );
@@ -988,43 +997,21 @@ public function conditional_localized_args( $default_args ) {
             $has_flex_height = ! empty( $general_settings['store_banner_flex_height'] ) ? $general_settings['store_banner_flex_height'] : true;
 
             $custom_args = [
-                'i18n_choose_featured_img'                 => __( 'Upload featured image', 'dokan-lite' ),
-                'i18n_choose_file'                         => __( 'Choose a file', 'dokan-lite' ),
-                'i18n_choose_gallery'                      => __( 'Add Images to Product Gallery', 'dokan-lite' ),
-                'i18n_choose_featured_img_btn_text'        => __( 'Set featured image', 'dokan-lite' ),
-                'i18n_choose_file_btn_text'                => __( 'Insert file URL', 'dokan-lite' ),
-                'i18n_choose_gallery_btn_text'             => __( 'Add to gallery', 'dokan-lite' ),
-                'duplicates_attribute_messg'               => __( 'Sorry, this attribute option already exists, Try a different one.', 'dokan-lite' ),
-                'variation_unset_warning'                  => __( 'Warning! This product will not have any variations if this option is not checked.', 'dokan-lite' ),
-                'new_attribute_prompt'                     => __( 'Enter a name for the new attribute term:', 'dokan-lite' ),
-                'remove_attribute'                         => __( 'Remove this attribute?', 'dokan-lite' ),
-                'dokan_placeholder_img_src'                => wc_placeholder_img_src(),
-                'add_variation_nonce'                      => wp_create_nonce( 'add-variation' ),
-                'link_variation_nonce'                     => wp_create_nonce( 'link-variations' ),
-                'delete_variations_nonce'                  => wp_create_nonce( 'delete-variations' ),
-                'load_variations_nonce'                    => wp_create_nonce( 'load-variations' ),
-                'save_variations_nonce'                    => wp_create_nonce( 'save-variations' ),
-                'bulk_edit_variations_nonce'               => wp_create_nonce( 'bulk-edit-variations' ),
-                /* translators: %d: max linked variation. */
-                'i18n_link_all_variations'                 => esc_js( sprintf( __( 'Are you sure you want to link all variations? This will create a new variation for each and every possible combination of variation attributes (max %d per run).', 'dokan-lite' ), defined( 'WC_MAX_LINKED_VARIATIONS' ) ? WC_MAX_LINKED_VARIATIONS : 50 ) ),
-                'i18n_enter_a_value'                       => esc_js( __( 'Enter a value', 'dokan-lite' ) ),
-                'i18n_enter_menu_order'                    => esc_js( __( 'Variation menu order (determines position in the list of variations)', 'dokan-lite' ) ),
-                'i18n_enter_a_value_fixed_or_percent'      => esc_js( __( 'Enter a value (fixed or %)', 'dokan-lite' ) ),
-                'i18n_delete_all_variations'               => esc_js( __( 'Are you sure you want to delete all variations? This cannot be undone.', 'dokan-lite' ) ),
-                'i18n_last_warning'                        => esc_js( __( 'Last warning, are you sure?', 'dokan-lite' ) ),
-                'i18n_choose_image'                        => esc_js( __( 'Choose an image', 'dokan-lite' ) ),
-                'i18n_set_image'                           => esc_js( __( 'Set variation image', 'dokan-lite' ) ),
-                'i18n_variation_added'                     => esc_js( __( 'variation added', 'dokan-lite' ) ),
-                'i18n_variations_added'                    => esc_js( __( 'variations added', 'dokan-lite' ) ),
-                'i18n_no_variations_added'                 => esc_js( __( 'No variations added', 'dokan-lite' ) ),
-                'i18n_remove_variation'                    => esc_js( __( 'Are you sure you want to remove this variation?', 'dokan-lite' ) ),
-                'i18n_scheduled_sale_start'                => esc_js( __( 'Sale start date (YYYY-MM-DD format or leave blank)', 'dokan-lite' ) ),
-                'i18n_scheduled_sale_end'                  => esc_js( __( 'Sale end date (YYYY-MM-DD format or leave blank)', 'dokan-lite' ) ),
-                'i18n_edited_variations'                   => esc_js( __( 'Save changes before changing page?', 'dokan-lite' ) ),
-                'i18n_variation_count_single'              => esc_js( __( '%qty% variation', 'dokan-lite' ) ),
-                'i18n_variation_count_plural'              => esc_js( __( '%qty% variations', 'dokan-lite' ) ),
-                'i18n_no_result_found'                     => esc_js( __( 'No Result Found', 'dokan-lite' ) ),
-                'i18n_sales_price_error'                   => esc_js( __( 'Please insert value less than the regular price!', 'dokan-lite' ) ),
+                'i18n_choose_featured_img'            => __( 'Upload featured image', 'dokan-lite' ),
+                'i18n_choose_file'                    => __( 'Choose a file', 'dokan-lite' ),
+                'i18n_choose_gallery'                 => __( 'Add Images to Product Gallery', 'dokan-lite' ),
+                'i18n_choose_featured_img_btn_text'   => __( 'Set featured image', 'dokan-lite' ),
+                'i18n_choose_file_btn_text'           => __( 'Insert file URL', 'dokan-lite' ),
+                'i18n_choose_gallery_btn_text'        => __( 'Add to gallery', 'dokan-lite' ),
+                'duplicates_attribute_messg'          => __( 'Sorry, this attribute option already exists, Try a different one.', 'dokan-lite' ),
+                'variation_unset_warning'             => __( 'Warning! This product will not have any variations if this option is not checked.', 'dokan-lite' ),
+                'new_attribute_prompt'                => __( 'Enter a name for the new attribute term:', 'dokan-lite' ),
+                'remove_attribute'                    => __( 'Remove this attribute?', 'dokan-lite' ),
+                'dokan_placeholder_img_src'           => wc_placeholder_img_src(),
+                'i18n_choose_image'                   => esc_js( __( 'Choose an image', 'dokan-lite' ) ),
+                'i18n_set_image'                      => esc_js( __( 'Set variation image', 'dokan-lite' ) ),
+                'i18n_no_result_found'                => esc_js( __( 'No Result Found', 'dokan-lite' ) ),
+                'i18n_sales_price_error'              => esc_js( __( 'Please insert value less than the regular price!', 'dokan-lite' ) ),
                 /* translators: %s: decimal */
                 'i18n_decimal_error'                       => sprintf( __( 'Please enter with one decimal point (%s) without thousand separators.', 'dokan-lite' ), $decimal ),
                 /* translators: %s: price decimal separator */
@@ -1071,6 +1058,30 @@ public function conditional_localized_args( $default_args ) {
                 'update_settings'                          => __( 'Update Settings', 'dokan-lite' ),
                 'search_downloadable_products_nonce'       => wp_create_nonce( 'search-downloadable-products' ),
                 'search_downloadable_products_placeholder' => __( 'Please enter 3 or more characters', 'dokan-lite' ),
+                // Todo: Variation related i18n strings will be moved to the Dokan Pro Assets class after releasing product form manager module.
+                // Variation related i18n, file: product-variation.js
+                'add_variation_nonce'                 => wp_create_nonce( 'add-variation' ),
+                'link_variation_nonce'                => wp_create_nonce( 'link-variations' ),
+                'delete_variations_nonce'             => wp_create_nonce( 'delete-variations' ),
+                'load_variations_nonce'               => wp_create_nonce( 'load-variations' ),
+                'save_variations_nonce'               => wp_create_nonce( 'save-variations' ),
+                'bulk_edit_variations_nonce'          => wp_create_nonce( 'bulk-edit-variations' ),
+                /* translators: %d: max linked variation. */
+                'i18n_link_all_variations'            => esc_js( sprintf( __( 'Are you sure you want to link all variations? This will create a new variation for each and every possible combination of variation attributes (max %d per run).', 'dokan-lite' ), defined( 'WC_MAX_LINKED_VARIATIONS' ) ? WC_MAX_LINKED_VARIATIONS : 50 ) ),
+                'i18n_enter_a_value'                  => esc_js( __( 'Enter a value', 'dokan-lite' ) ),
+                'i18n_enter_menu_order'               => esc_js( __( 'Variation menu order (determines position in the list of variations)', 'dokan-lite' ) ),
+                'i18n_enter_a_value_fixed_or_percent' => esc_js( __( 'Enter a value (fixed or %)', 'dokan-lite' ) ),
+                'i18n_delete_all_variations'          => esc_js( __( 'Are you sure you want to delete all variations? This cannot be undone.', 'dokan-lite' ) ),
+                'i18n_last_warning'                   => esc_js( __( 'Last warning, are you sure?', 'dokan-lite' ) ),
+                'i18n_variation_added'                => esc_js( __( 'Variation added', 'dokan-lite' ) ),
+                'i18n_variations_added'               => esc_js( __( 'Variations added', 'dokan-lite' ) ),
+                'i18n_no_variations_added'            => esc_js( __( 'No variations added', 'dokan-lite' ) ),
+                'i18n_remove_variation'               => esc_js( __( 'Are you sure you want to remove this variation?', 'dokan-lite' ) ),
+                'i18n_scheduled_sale_start'           => esc_js( __( 'Sale start date (YYYY-MM-DD format or leave blank)', 'dokan-lite' ) ),
+                'i18n_scheduled_sale_end'             => esc_js( __( 'Sale end date (YYYY-MM-DD format or leave blank)', 'dokan-lite' ) ),
+                'i18n_edited_variations'              => esc_js( __( 'Save changes before changing page?', 'dokan-lite' ) ),
+                'i18n_variation_count_single'         => esc_js( __( '%qty% variation', 'dokan-lite' ) ),
+                'i18n_variation_count_plural'         => esc_js( __( '%qty% variations', 'dokan-lite' ) ),
             ];
 
             $default_args = array_merge( $default_args, $custom_args );
@@ -1216,6 +1227,7 @@ public function get_admin_localized_scripts() {
                 'decimal_point'                     => $decimal,
                 'mon_decimal_point'                 => wc_get_price_decimal_separator(),
                 'i18n_date_format'                  => wc_date_format(),
+                'product_types'                     => apply_filters( 'dokan_product_types', [ 'simple' ] ),
             ]
         );
     }