callback Mapper Admin Settings in progress

includes/Admin/Settings.php

@@ -127,7 +127,7 @@ public function get_settings_value() {
         $settings = [];
 
         // Ensure new settings are populated from legacy if currently blank
-        $this->ensure_new_settings_populated_from_legacy();
+		//        $this->ensure_new_settings_populated_from_legacy();
 
         // Build legacy-style values from the new settings storage.
         $legacy_from_new = $this->get_legacy_values_from_new();
@@ -195,12 +195,17 @@ public function save_settings_value() {
 
             // Transform legacy section values to new settings storage and save
             $transformer = new LegacyTransformer();
-            $new_data    = $transformer->transform( [ 'from' => 'old', 'data' => [ $option_name => $option_value ] ] );
+            $new_data    = $transformer->transform(
+                [
+					'from' => 'old',
+					'data' => [ $option_name => $option_value ],
+				]
+            );
 
             if ( ! empty( $new_data ) ) {
                 /** @var NewAdminSettingsManager $settings_manager */
                 $settings_manager = dokan_get_container()->get( NewAdminSettingsManager::class );
-                $settings_manager->save( $new_data );
+                $settings_manager->save( $new_data, false );
 
                 // Fallback: if pages are not registered/available, write directly to new storage options
                 $available_ids = [];
@@ -1325,9 +1330,9 @@ protected function ensure_new_settings_populated_from_legacy(): void {
                 if ( ! is_array( $existing ) ) {
                     $existing = [];
                 }
-                $wrapped    = [ $page_id => $page_values ];
+                $wrapped = [ $page_id => $page_values ];
                 // Merge so we don't drop any pre-existing values.
-                $merged     = array_replace_recursive( $existing, $wrapped );
+                $merged = array_replace_recursive( $existing, $wrapped );
                 update_option( $storage_key, $merged );
             }
         }

includes/Admin/Settings/Pages/CompliancePage.php

@@ -3,6 +3,7 @@
 namespace WeDevs\Dokan\Admin\Settings\Pages;
 
 use WeDevs\Dokan\Admin\Settings\Elements\ElementFactory;
+use WeDevs\Dokan\Admin\Settings;
 
 class CompliancePage extends AbstractPage {
 
@@ -78,6 +79,15 @@ public function settings(): array {
      * @return void
      */
     public function describe_settings(): void {
+        $legacy_settings = dokan_get_container()->get( Settings::class );
+        $pages_array = $legacy_settings->get_post_type( 'page' );
+        $options = [];
+        foreach ( $pages_array as $key => $label ) {
+            $options[] = [
+                'title' => $label,
+                'value' => $key,
+            ];
+        }
         // Create Privacy subpage
         $privacy_page = ElementFactory::sub_page( 'privacy' )
             ->set_priority( 100 )
@@ -106,10 +116,7 @@ public function describe_settings(): void {
                 ->set_title( esc_html__( 'Privacy Policy Page', 'dokan-lite' ) )
                 ->set_description( esc_html__( 'Choose which page displays your privacy policy', 'dokan-lite' ) )
                 ->set_placeholder( esc_html__( 'Select a page', 'dokan-lite' ) )
-                ->add_option( esc_html__( 'Privacy Policy', 'dokan-lite' ), 'privacy-policy' )
-                ->add_option( esc_html__( 'Terms of Service', 'dokan-lite' ), 'terms-of-service' )
-                ->add_option( esc_html__( 'Legal Information', 'dokan-lite' ), 'legal-information' )
-                ->set_default( 'privacy-policy' )
+                ->set_options( $options )
         );
 
         // Create Privacy Policy Content section

includes/Admin/Settings/Pages/TransactionPage.php

@@ -192,25 +192,25 @@ public function describe_settings(): void {
                 ElementFactory::field( 'shipping_fee', 'radio_capsule' )
                     ->set_title( esc_html__( 'Shipping Fee', 'dokan-lite' ) )
                     ->set_description( esc_html__( 'Who will be receiving the shipping fees? Note that, tax fees for corresponding shipping method will not be included with shipping fees.', 'dokan-lite' ) )
-                    ->add_option( esc_html__( 'Vendor', 'dokan-lite' ), 'vendor', 'Users' )
+                    ->add_option( esc_html__( 'Vendor', 'dokan-lite' ), 'seller', 'Users' )
                     ->add_option( esc_html__( 'Admin', 'dokan-lite' ), 'admin', 'User' )
-                    ->set_default( 'vendor' )
+                    ->set_default( 'seller' )
             )
             ->add(
                 ElementFactory::field( 'product_tax_fee', 'radio_capsule' )
                     ->set_title( esc_html__( 'Product Tax Fee', 'dokan-lite' ) )
                     ->set_description( esc_html__( 'Who will be receiving the tax fees for products? Note that, shipping tax fees will not be included with product tax.', 'dokan-lite' ) )
-                    ->add_option( esc_html__( 'Vendor', 'dokan-lite' ), 'vendor', 'Users' )
+                    ->add_option( esc_html__( 'Vendor', 'dokan-lite' ), 'seller', 'Users' )
                     ->add_option( esc_html__( 'Admin', 'dokan-lite' ), 'admin', 'User' )
-                    ->set_default( 'vendor' )
+                    ->set_default( 'seller' )
             )
             ->add(
                 ElementFactory::field( 'shipping_tax_fee', 'radio_capsule' )
                     ->set_title( esc_html__( 'Shipping Tax Fee', 'dokan-lite' ) )
                     ->set_description( esc_html__( 'Who will be receiving the tax fees for shipping?', 'dokan-lite' ) )
-                    ->add_option( esc_html__( 'Vendor', 'dokan-lite' ), 'vendor', 'Users' )
+                    ->add_option( esc_html__( 'Vendor', 'dokan-lite' ), 'seller', 'Users' )
                     ->add_option( esc_html__( 'Admin', 'dokan-lite' ), 'admin', 'User' )
-                    ->set_default( 'vendor' )
+                    ->set_default( 'seller' )
             );
 
         // Add the fees section to fees page

includes/Admin/Settings/Pages/VendorPage.php

@@ -126,6 +126,8 @@ public function describe_settings(): void {
                     ->set_enable_state( esc_html__( 'Enabled', 'dokan-lite' ), 'on' )
                     ->set_disable_state( esc_html__( 'Disabled', 'dokan-lite' ), 'off' )
                     ->set_default( 'on' )
+                    ->add_dependency( 'vendor_capabilities.vendor_capabilities.one_page_creation', 'on', true, 'display', 'show', '===' )
+                    ->add_dependency( 'vendor_capabilities.vendor_capabilities.one_page_creation', 'off', true, 'display', 'hide', '!==' )
             )
             ->add(
                 ElementFactory::field( 'order_status_change', 'switch' )

includes/Admin/Settings/Settings.php

@@ -105,7 +105,7 @@ public function get_pages_data(): array {
      *
      * @throws \Exception
      */
-    public function save( array $data ): void {
+    public function save( array $data, bool $save_old = true ): void {
         // Mirror new settings saves back to legacy options as well.
         $transformer = new LegacyTransformer();
 
@@ -116,6 +116,10 @@ public function save( array $data ): void {
                 // Save into the new storage for this page
                 $page->save( $data[ $page_id ] );
 
+                if ( ! $save_old ) {
+                    continue;
+                }
+
                 // Also update corresponding legacy options using the mapper/transformer
                 $legacy = $transformer->transform(
                     [