Merge branch 'develop' into e2e-pw

shashwatahalder01 · Jan 25, 2024 · 096a737 · 096a737
2 parents e5dbb41 + 8cf0566
commit 096a737
Show file tree

Hide file tree

Showing 21 changed files with 230 additions and 50 deletions.
diff --git a/assets/src/js/dokan-daterangepicker.js b/assets/src/js/dokan-daterangepicker.js
@@ -4,7 +4,7 @@
             // Set date range data.
             let localeData = {
                 format      : dokan_get_daterange_picker_format(),
-                ...dokan_helper.locale
+                ...dokan_helper.daterange_picker_local
             };
 
             // Date range picker handler.

diff --git a/assets/src/js/helper.js b/assets/src/js/helper.js
@@ -262,6 +262,7 @@
       showCancelButton  : true,
       confirmButtonColor:'#28a745',
       cancelButtonColor :'#dc3545',
+      ...dokan_helper.sweetalert_local
     };
 
     const args   = { ...defaults, ...options };

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
   "minimum-stability": "dev",
   "require": {
     "php": ">=7.4",
-    "appsero/client": "^v1.4.0",
+    "appsero/client": "^v2.0.1",
     "jakeasmith/http_build_url": "^1"
   },
   "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/dokan.php b/dokan.php
@@ -291,7 +291,7 @@ private function define( $name, $value ) {
     public function declare_woocommerce_feature_compatibility() {
         if ( class_exists( \Automattic\WooCommerce\Utilities\FeaturesUtil::class ) ) {
             \Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'custom_order_tables', __FILE__, true );
-            \Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'cart_checkout_blocks', __FILE__, false );
+            \Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'cart_checkout_blocks', __FILE__, true );
         }
     }
 

diff --git a/includes/Assets.php b/includes/Assets.php
@@ -757,6 +757,13 @@ public function load_dokan_global_scripts() {
                         __( 'December', 'dokan-lite' ),
                     ],
                 ],
+                'sweetalert_local'       => [
+                    'cancelButtonText'     => __( 'Cancel', 'dokan-lite' ),
+                    'closeButtonText'      => __( 'Close', 'dokan-lite' ),
+                    'confirmButtonText'    => __( 'OK', 'dokan-lite' ),
+                    'denyButtonText'       => __( 'No', 'dokan-lite' ),
+                    'closeButtonAriaLabel' => __( 'Close this dialog', 'dokan-lite' ),
+                ],
             ]
         );
 

diff --git a/includes/CatalogMode/Dashboard/Products.php b/includes/CatalogMode/Dashboard/Products.php
@@ -30,6 +30,7 @@ public function __construct() {
         add_action( 'dokan_product_edit_after_options', [ $this, 'render_product_section' ], 99, 1 );
         // save catalog mode section data
         add_action( 'dokan_product_updated', [ $this, 'save_catalog_mode_data' ], 13 );
+        add_action( 'dokan_new_product_added', [ $this, 'save_catalog_mode_data' ], 13 );
     }
 
     /**

diff --git a/includes/Dashboard/Templates/Dashboard.php b/includes/Dashboard/Templates/Dashboard.php
@@ -122,11 +122,62 @@ public function get_orders_widgets() {
             ],
         ];
 
+        $nonce          = wp_create_nonce( 'seller-order-filter-nonce' );
+        $order_url      = dokan_get_navigation_url( 'orders' );
+        $completed_url  = add_query_arg(
+            [
+                'order_status'              => 'wc-completed',
+                'seller_order_filter_nonce' => $nonce,
+            ],
+            $order_url
+        );
+        $pending_url    = add_query_arg(
+            [
+                'order_status'              => 'wc-pending',
+                'seller_order_filter_nonce' => $nonce,
+            ],
+            $order_url
+        );
+        $processing_url = add_query_arg(
+            [
+                'order_status'              => 'wc-processing',
+                'seller_order_filter_nonce' => $nonce,
+            ],
+            $order_url
+        );
+        $cancelled_url  = add_query_arg(
+            [
+                'order_status'              => 'wc-cancelled',
+                'seller_order_filter_nonce' => $nonce,
+            ],
+            $order_url
+        );
+        $refunded_url   = add_query_arg(
+            [
+                'order_status'              => 'wc-refunded',
+                'seller_order_filter_nonce' => $nonce,
+            ],
+            $order_url
+        );
+        $on_hold_url    = add_query_arg(
+            [
+                'order_status'              => 'wc-on-hold',
+                'seller_order_filter_nonce' => $nonce,
+            ],
+            $order_url
+        );
+
         dokan_get_template_part(
             'dashboard/orders-widget', '', [
-                'order_data'   => $order_data,
-                'orders_count' => $this->orders_count,
-                'orders_url'   => dokan_get_navigation_url( 'orders' ),
+                'order_data'     => $order_data,
+                'orders_count'   => $this->orders_count,
+                'orders_url'     => $order_url,
+                'completed_url'  => $completed_url,
+                'pending_url'    => $pending_url,
+                'processing_url' => $processing_url,
+                'cancelled_url'  => $cancelled_url,
+                'refunded_url'   => $refunded_url,
+                'on_hold_url'    => $on_hold_url,
             ]
         );
     }
@@ -142,11 +193,33 @@ public function get_products_widgets() {
         if ( ! current_user_can( 'dokan_view_product_status_report' ) ) {
             return;
         }
-
+        $nonce       = wp_create_nonce( 'product_listing_filter' );
+        $product_url = dokan_get_navigation_url( 'products' );
+        $online_url  = add_query_arg(
+            [
+                'post_status'                   => 'publish',
+                '_product_listing_filter_nonce' => $nonce,
+            ], $product_url
+        );
+        $draft_url   = add_query_arg(
+            [
+                'post_status'                   => 'draft',
+                '_product_listing_filter_nonce' => $nonce,
+            ], $product_url
+        );
+        $pending_url = add_query_arg(
+            [
+                'post_status'                   => 'pending',
+                '_product_listing_filter_nonce' => $nonce,
+            ], $product_url
+        );
         dokan_get_template_part(
             'dashboard/products-widget', '', [
                 'post_counts'  => $this->get_post_counts(),
-                'products_url' => dokan_get_navigation_url( 'products' ),
+                'products_url' => $product_url,
+                'online_url'   => $online_url,
+                'draft_url'    => $draft_url,
+                'pending_url'  => $pending_url,
             ]
         );
     }

diff --git a/includes/Frontend/MyAccount/BecomeAVendor.php b/includes/Frontend/MyAccount/BecomeAVendor.php
@@ -176,6 +176,8 @@ public function load_customer_to_vendor_update_template() {
             return;
         }
 
+        wp_enqueue_script( 'dokan-vendor-registration' );
+
         $data = [
             'user_id'     => $user_id,
             'first_name'  => get_user_meta( $user_id, 'first_name', true ),

diff --git a/includes/Order/Hooks.php b/includes/Order/Hooks.php
@@ -36,9 +36,11 @@ public function __construct() {
 
         // create sub-orders
         add_action( 'woocommerce_checkout_update_order_meta', [ $this, 'split_vendor_orders' ] );
+        add_action( 'woocommerce_store_api_checkout_update_order_meta', [ $this, 'split_vendor_orders' ] );
 
         // order table synced for WooCommerce update order meta
         add_action( 'woocommerce_checkout_update_order_meta', 'dokan_sync_insert_order', 20 );
+        add_action( 'woocommerce_store_api_checkout_update_order_meta', 'dokan_sync_insert_order', 20 );
 
         // order table synced for dokan update order meta
         add_action( 'dokan_checkout_update_order_meta', 'dokan_sync_insert_order' );

diff --git a/includes/Order/Manager.php b/includes/Order/Manager.php
@@ -881,7 +881,13 @@ function ( $item ) {
      * @return void
      */
     public function maybe_split_orders( $parent_order_id, $force_create = false ) {
-        $parent_order = $this->get( $parent_order_id );
+        if ( is_a( $parent_order_id, 'WC_Order' ) ) {
+            $parent_order    = $parent_order_id;
+            $parent_order_id = $parent_order->get_id();
+        } else {
+            $parent_order = $this->get( $parent_order_id );
+        }
+
         if ( ! $parent_order ) {
             //dokan_log( sprintf( 'Invalid Order ID #%d found. Skipping from here.', $parent_order_id ) );
             return;

diff --git a/includes/Order/functions.php b/includes/Order/functions.php
@@ -215,7 +215,13 @@ function dokan_delete_sync_duplicate_order( $order_id, $seller_id ) {
 function dokan_sync_insert_order( $order_id ) {
     global $wpdb;
 
-    $order = wc_get_order( $order_id );
+    if ( is_a( $order_id, 'WC_Order' ) ) {
+        $order    = $order_id;
+        $order_id = $order->get_id();
+    } else {
+        $order = wc_get_order( $order_id );
+    }
+
     if ( ! $order || $order instanceof WC_Subscription ) {
         return;
     }

diff --git a/includes/Shipping/Hooks.php b/includes/Shipping/Hooks.php
@@ -43,6 +43,9 @@ public function split_shipping_packages( $packages ) {
         $packages     = [];
 
         foreach ( $cart_content as $key => $item ) {
+            if ( $item['data']->is_virtual() ) {
+                continue;
+            }
             $post_author = get_post_field( 'post_author', $item['data']->get_id() );
 
             $seller_pack[ $post_author ][ $key ] = $item;

diff --git a/includes/Vendor/SetupWizard.php b/includes/Vendor/SetupWizard.php
@@ -402,7 +402,7 @@ public function dokan_setup_store_save() {
         }
 
         update_user_meta( $this->store_id, 'dokan_profile_settings', $dokan_settings );
-
+        do_action( 'dokan_store_profile_saved', $this->store_id, $dokan_settings );
         do_action( 'dokan_seller_wizard_store_field_save', $this );
 
         wp_safe_redirect( esc_url_raw( $this->get_next_step_link() ) );