diff --git a/src/core/integrations/integrations/integrations-create/IntegrationCreateController.vue b/src/core/integrations/integrations/integrations-create/IntegrationCreateController.vue
index 4f8f2385..f45a16fb 100644
--- a/src/core/integrations/integrations/integrations-create/IntegrationCreateController.vue
+++ b/src/core/integrations/integrations/integrations-create/IntegrationCreateController.vue
@@ -45,8 +45,8 @@ import {
   createWoocommerceSalesChannelMutation,
   getAmazonRedirectUrlMutation,
   getEbayRedirectUrlMutation,
+  getShopifyRedirectUrlMutation,
   getSheinRedirectUrlMutation,
-  refreshSalesChannelWebsitesMutation,
 } from '../../../../shared/api/mutations/salesChannels.js';
 import { createWebhookIntegrationMutation } from '../../../../shared/api/mutations/webhookIntegrations.js';
 import { Toast } from '../../../../shared/modules/toast';
@@ -479,7 +479,7 @@ const handleFinish = async () => {
     if (data && data[mutationKey]) {
       Toast.success(t('integrations.create.success'));
       loading.value = false;
-      handleSalesChannelSuccess(data[mutationKey], resolvedIntegrationType.value);
+      await handleSalesChannelSuccess(data[mutationKey], resolvedIntegrationType.value);
     }
   } catch (err) {
     loading.value = false;
@@ -498,7 +498,6 @@ const handleFinish = async () => {
 const handleShopifySalesChannelSuccess = async (channelData: any) => {
   const id = channelData.id;
 
-  /*
   const { data } = await apolloClient.mutate({
     mutation: getShopifyRedirectUrlMutation,
     variables: {
@@ -513,29 +512,15 @@ const handleShopifySalesChannelSuccess = async (channelData: any) => {
     return;
   }
 
-  // If we have errors from OperationInfo
   const messages = result?.messages || [];
-  messages.forEach((msg: any) => {
-    Toast.error(msg.message);
-  });
-  */
-  try {
-    loading.value = true;
-    await apolloClient.mutate({
-      mutation: refreshSalesChannelWebsitesMutation,
-      variables: {
-        data: { id },
-      },
+  if (messages.length) {
+    messages.forEach((msg: any) => {
+      Toast.error(msg.message);
     });
-    Toast.success(t("integrations.show.pullData.success"));
-  } catch (error) {
-    Toast.error(t("integrations.show.pullData.error"));
-    console.error("Pull data failed:", error);
-  } finally {
-    loading.value = false;
+  } else {
+    Toast.error(t('integrations.salesChannel.shopify.installed.genericError'));
   }
 
-  // Redirect to show page anyway
   router.push({
     name: 'integrations.integrations.show',
     params: { type: IntegrationTypes.Shopify, id },
diff --git a/src/core/integrations/integrations/integrations-create/containers/integration-specific-step/shopify/ShopifyChannelInfoStep.vue b/src/core/integrations/integrations/integrations-create/containers/integration-specific-step/shopify/ShopifyChannelInfoStep.vue
index d7f8341a..b92e9568 100644
--- a/src/core/integrations/integrations/integrations-create/containers/integration-specific-step/shopify/ShopifyChannelInfoStep.vue
+++ b/src/core/integrations/integrations/integrations-create/containers/integration-specific-step/shopify/ShopifyChannelInfoStep.vue
@@ -1,8 +1,7 @@
 <script setup lang="ts">
-import { computed, defineProps } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { Label } from "../../../../../../../shared/components/atoms/label";
-import { TextInput } from "../../../../../../../shared/components/atoms/input-text";
 import { ShopifyChannelInfo } from '../../../../integrations';
 import { Icon } from "../../../../../../../shared/components/atoms/icon";
 import { Button } from "../../../../../../../shared/components/atoms/button";
@@ -14,7 +13,7 @@ import {
   FieldQuery
 } from "../../../../../../../shared/components/organisms/general-form/containers/form-fields/field-query";
 
-const props = defineProps<{
+defineProps<{
   channelInfo: ShopifyChannelInfo
 }>();
 
@@ -48,74 +47,40 @@ const propertyField = computed(() => ({
 <template>
   <div>
     <h1 class="text-2xl text-center mb-2">
-      {{ t('integrations.create.wizard.step4.magento.content') }}
+      {{ t('integrations.create.wizard.step4.shopify.content') }}
     </h1>
     <hr/>
     <Flex vertical>
       <FlexCell>
         <Flex class="mt-4 gap-4" center>
           <FlexCell center>
-            <Flex vertical class="gap-2">
+            <Flex vertical class="gap-4">
               <FlexCell>
-                <Label class="font-semibold block text-sm leading-6 text-gray-900">
-                  {{ t('integrations.labels.apiKey') }}
-                </Label>
-              </FlexCell>
-              <FlexCell>
-                <TextInput
-                    class="w-96"
-                    v-model="channelInfo.apiKey"
-                    :placeholder="t('integrations.placeholders.apiKey')"
-                />
-              </FlexCell>
-              <FlexCell>
-                <Label class="font-semibold block text-sm leading-6 text-gray-900">
-                  {{ t('integrations.labels.apiSecret') }}
-                </Label>
-              </FlexCell>
-              <FlexCell>
-                <TextInput
-                    class="w-96"
-                    v-model="channelInfo.apiSecret"
-                    :placeholder="t('integrations.placeholders.apiSecret')"
-                    :secret="true"
-                />
+                <div class="w-96 rounded-xl border border-emerald-200 bg-emerald-50 px-4 py-3 text-sm leading-6 text-emerald-900">
+                  {{ t('integrations.create.wizard.step1.shopifyInfoModal.section.integrationStep8') }}
+                </div>
               </FlexCell>
               <FlexCell>
                 <Label class="font-semibold block text-sm leading-6 text-gray-900">
-                  {{ t('integrations.labels.accessToken') }}
+                  {{ t('integrations.labels.vendorProperty') }}
                 </Label>
               </FlexCell>
-              <FlexCell>
-                <TextInput
-                    class="w-96"
-                    v-model="channelInfo.accessToken"
-                    :placeholder="t('integrations.placeholders.accessToken')"
-                    secret
-                />
-              </FlexCell>
-
               <FlexCell>
                 <Flex between>
                   <FlexCell grow>
-                    <Label class="font-semibold block text-sm leading-6 text-gray-900">
-                      {{ t('integrations.labels.vendorProperty') }}
-                    </Label>
+                    <div class="mt-1 text-sm leading-6 text-gray-400 w-96">
+                      <p>{{ t('integrations.salesChannel.helpText.shopifyVendorProperty') }}</p>
+                    </div>
+                  </FlexCell>
+                  <FlexCell center>
+                    <Button class="btn-primary px-1.5 py-1 rounded-full" @click="openInNewTab">
+                      <Icon name="plus"/>
+                    </Button>
                   </FlexCell>
-                    <FlexCell center>
-                      <Button class="btn-primary px-1.5 py-1 rounded-full" @click="openInNewTab">
-                        <Icon name="plus"/>
-                      </Button>
-                    </FlexCell>
                 </Flex>
-
               </FlexCell>
               <FlexCell>
                 <FieldQuery v-model="channelInfo.vendorProperty.id" :field="propertyField as QueryFormField" />
-
-                <div class="mt-1 text-sm leading-6 text-gray-400 w-96">
-                  <p>{{ t('integrations.salesChannel.helpText.shopifyVendorProperty') }}</p>
-                </div>
               </FlexCell>
             </Flex>
           </FlexCell>
diff --git a/src/core/integrations/integrations/integrations-shopify-entry/ShopifyEntryController.vue b/src/core/integrations/integrations/integrations-shopify-entry/ShopifyEntryController.vue
index de069d16..7708fd45 100644
--- a/src/core/integrations/integrations/integrations-shopify-entry/ShopifyEntryController.vue
+++ b/src/core/integrations/integrations/integrations-shopify-entry/ShopifyEntryController.vue
@@ -81,7 +81,6 @@ const createShopifySalesChannel = async (queryParams: Record<string, any>, hostn
 const handleShopifySalesChannelSuccess = async (channelData: any) => {
   const id = channelData.id;
 
-  /*
   const { data } = await apolloClient.mutate({
     mutation: getShopifyRedirectUrlMutation,
     variables: { data: { id } },
@@ -90,15 +89,18 @@ const handleShopifySalesChannelSuccess = async (channelData: any) => {
   const result = data?.getShopifyRedirectUrl;
 
   if (result?.redirectUrl) {
-     window.location.href = result.redirectUrl;
+    window.location.href = result.redirectUrl;
     return;
   }
 
   const messages = result?.messages || [];
-  messages.forEach((msg: any) => {
-    Toast.error(msg.message);
-  });
-  */
+  if (messages.length) {
+    messages.forEach((msg: any) => {
+      Toast.error(msg.message);
+    });
+  } else {
+    Toast.error(t('integrations.salesChannel.shopify.installed.genericError'));
+  }
 
   router.push({
     name: 'integrations.integrations.show',
diff --git a/src/core/integrations/integrations/integrations-show/containers/general/shopify-general-tab/ShopifyGeneralInfoTab.vue b/src/core/integrations/integrations/integrations-show/containers/general/shopify-general-tab/ShopifyGeneralInfoTab.vue
index 2af8c2b4..85cefddc 100644
--- a/src/core/integrations/integrations/integrations-show/containers/general/shopify-general-tab/ShopifyGeneralInfoTab.vue
+++ b/src/core/integrations/integrations/integrations-show/containers/general/shopify-general-tab/ShopifyGeneralInfoTab.vue
@@ -16,7 +16,6 @@ import {
   updateShopifySalesChannelMutation
 } from "../../../../../../../shared/api/mutations/salesChannels.js";
 import { processGraphQLErrors } from "../../../../../../../shared/utils";
-import { cleanShopHostname } from "../../../../configs";
 import apolloClient from "../../../../../../../../apollo-client";
 import {FieldType, PropertyTypes} from "../../../../../../../shared/utils/constants";
 import {propertiesQuerySelector} from "../../../../../../../shared/api/queries/properties";
@@ -40,8 +39,6 @@ interface EditShopifyForm {
   importOrders: boolean;
   minNameLength: number | null;
   minDescriptionLength: number | null;
-  apiKey: string;
-  apiSecret: string;
   accessToken?: string;
   state?: string;
   gptEnable: boolean;
@@ -111,6 +108,7 @@ const cleanupAndMutate = async (mutate) => {
   const payload = { ...formData.value };
 
   delete (payload as any).startingStock;
+  delete (payload as any).accessToken;
 
   if (!payload.vendorProperty?.id) {
     delete (payload as any).vendorProperty;
@@ -239,30 +237,6 @@ useShiftBackspaceKeyboardListener(goBack);
     </div>
   </div>
 
-  <div class="grid grid-cols-12 gap-4">
-    <div class="md:col-span-6 col-span-12">
-      <Label class="font-semibold block text-sm leading-6 text-gray-900 mb-1">
-        {{ t('integrations.labels.apiKey') }}
-      </Label>
-      <TextInput v-model="formData.apiKey" disabled class="w-full" />
-    </div>
-    <div class="md:col-span-6 col-span-12">
-      <Label class="font-semibold block text-sm leading-6 text-gray-900 mb-1">
-        {{ t('integrations.labels.apiSecret') }}
-      </Label>
-      <TextInput v-model="formData.apiSecret" disabled :secret="true" class="w-full" />
-    </div>
-  </div>
-
-  <div class="grid grid-cols-12 gap-4">
-    <div class="md:col-span-12 col-span-12">
-      <Label class="font-semibold block text-sm leading-6 text-gray-900 mb-1">
-        {{ t('integrations.labels.accessToken') }}
-      </Label>
-      <TextInput v-model="formData.accessToken" secret class="w-full" />
-    </div>
-  </div>
-
     <!-- Accordion -->
     <Accordion class="mt-8" :items="accordionItems">
       <!-- Throttling -->
diff --git a/src/core/integrations/integrations/integrations-show/containers/properties/containers/mirakl-properties/MiraklEditProperty.vue b/src/core/integrations/integrations/integrations-show/containers/properties/containers/mirakl-properties/MiraklEditProperty.vue
index 82bde822..7dace1fd 100644
--- a/src/core/integrations/integrations/integrations-show/containers/properties/containers/mirakl-properties/MiraklEditProperty.vue
+++ b/src/core/integrations/integrations/integrations-show/containers/properties/containers/mirakl-properties/MiraklEditProperty.vue
@@ -9,7 +9,7 @@ import { FieldType, PropertyTypes } from "../../../../../../../../shared/utils/c
 import { getPropertyQuery, propertiesQuerySelector } from "../../../../../../../../shared/api/queries/properties.js";
 import apolloClient from "../../../../../../../../../apollo-client";
 import { Toast } from "../../../../../../../../shared/modules/toast";
-import { miraklPropertiesQuery, miraklRemoteLanguagesQuery } from "../../../../../../../../shared/api/queries/salesChannels";
+import { miraklPropertiesQuery } from "../../../../../../../../shared/api/queries/salesChannels";
 import type { FormConfig } from "../../../../../../../../shared/components/organisms/general-form/formConfig";
 import { Link } from "../../../../../../../../shared/components/atoms/link";
 import { Button } from "../../../../../../../../shared/components/atoms/button";
@@ -19,26 +19,8 @@ import { checkPropertyForDuplicatesMutation } from "../../../../../../../../shar
 import debounce from 'lodash.debounce';
 import { buildFilterVariablesFromRouteQuery, extractPrefixedQueryParams } from '../../../../../../../../shared/components/molecules/filter-manager/filterQueryUtils';
 import { getTypeCompatibility } from '../../../../../../../../shared/utils/propertyTypeCompatibility';
-import {
-  getMiraklRepresentationTypeOptions,
-  getMiraklRepresentationTypeGroup,
-  usesMiraklBooleanCurrentType,
-  usesMiraklDefaultValueInput,
-  usesMiraklLanguageSelection,
-  usesMiraklLocalPropertyMapping,
-} from './representationTypes';
-
-const miraklRepresentationImages = import.meta.glob(
-  '../../../../../../../../assets/images/integrations/mirakl/representation-types/*.png',
-  { eager: true, import: 'default' },
-) as Record<string, string>;
-
-const miraklRepresentationTypesWithoutImage = new Set([
-  'product_internal_id',
-  'product_configurable_id',
-]);
 
-const { t, te } = useI18n();
+const { t } = useI18n();
 const router = useRouter();
 const route = useRoute();
 
@@ -54,7 +36,6 @@ const formConfig = ref<FormConfig | null>(null);
 const formData = ref<Record<string, any>>({});
 const propertyMetadata = ref<Record<string, any> | null>(null);
 const propertyType = ref<string | null>(null);
-const representationType = ref<string | null>(null);
 const originalType = ref<string | null>(null);
 const initialCurrentType = ref<string | null>(null);
 const originalAllowsUnmappedValues = ref<boolean | null>(null);
@@ -127,124 +108,16 @@ const typeCompatibilityStatus = computed(() => {
 const isSelectPropertyType = (value?: string | null) =>
   value === PropertyTypes.SELECT || value === PropertyTypes.MULTISELECT;
 
-const currentRepresentationType = computed(() =>
-  formData.value.representationType || representationType.value || propertyMetadata.value?.representationType || null,
-);
 const isRepresentationTypeDecided = computed(() => Boolean(propertyMetadata.value?.representationTypeDecided));
-const usesLocalPropertyMapping = computed(() =>
-  isRepresentationTypeDecided.value || usesMiraklLocalPropertyMapping(currentRepresentationType.value),
-);
-const usesDefaultValueInput = computed(() =>
-  !isRepresentationTypeDecided.value && usesMiraklDefaultValueInput(currentRepresentationType.value),
-);
-const showLanguageField = computed(() =>
-  !isRepresentationTypeDecided.value && usesMiraklLanguageSelection(currentRepresentationType.value),
-);
-const canSeeValues = computed(() => usesLocalPropertyMapping.value && isSelectPropertyType(propertyType.value));
-const showRepresentationGuide = computed(() => !isRepresentationTypeDecided.value);
-const representationTypeLabel = computed(() =>
-  currentRepresentationType.value
-    ? t(`integrations.show.mirakl.representationTypes.options.${currentRepresentationType.value}`)
-    : t('integrations.show.mirakl.representationGuide.empty.title'),
-);
-const representationTypeGroup = computed(() => getMiraklRepresentationTypeGroup(currentRepresentationType.value));
-const representationGuideImage = computed(() => {
-  const currentType = currentRepresentationType.value;
-
-  if (!currentType || miraklRepresentationTypesWithoutImage.has(currentType)) {
-    return null;
-  }
-
-  const match = Object.entries(miraklRepresentationImages).find(([path]) =>
-    path.endsWith(`/${currentType}.png`),
-  );
-
-  return match?.[1] || null;
-});
+const canEditMapping = computed(() => isRepresentationTypeDecided.value);
+const canSeeValues = computed(() => canEditMapping.value && isSelectPropertyType(propertyType.value));
+const showDeveloperAlert = computed(() => propertyMetadata.value !== null && !isRepresentationTypeDecided.value);
 const labelTranslations = computed(() => normalizeTranslations(propertyMetadata.value?.labelTranslations));
 const descriptionTranslations = computed(() => normalizeTranslations(propertyMetadata.value?.descriptionTranslations));
-const representationGuide = computed(() => {
-  const currentType = currentRepresentationType.value;
-  if (!currentType) {
-    return {
-      title: t('integrations.show.mirakl.representationGuide.empty.title'),
-      description: t('integrations.show.mirakl.representationGuide.empty.description'),
-      summary: t('integrations.show.mirakl.representationGuide.empty.summary'),
-      source: t('integrations.show.mirakl.representationGuide.empty.source'),
-      fill: t('integrations.show.mirakl.representationGuide.empty.fill'),
-      badge: t('integrations.show.mirakl.representationGuide.badges.special'),
-    };
-  }
-
-  if (usesLocalPropertyMapping.value) {
-    return {
-      title: representationTypeLabel.value,
-      description: t('integrations.show.mirakl.representationGuide.special.property.description'),
-      summary: t('integrations.show.mirakl.representationGuide.special.property.summary'),
-      source: t('integrations.show.mirakl.representationGuide.special.property.source'),
-      fill: t('integrations.show.mirakl.representationGuide.special.property.fill'),
-      badge: t('integrations.show.mirakl.representationGuide.badges.special'),
-    };
-  }
-
-  if (usesDefaultValueInput.value) {
-    return {
-      title: representationTypeLabel.value,
-      description: t('integrations.show.mirakl.representationGuide.special.default_value.description'),
-      summary: t('integrations.show.mirakl.representationGuide.special.default_value.summary'),
-      source: t('integrations.show.mirakl.representationGuide.special.default_value.source'),
-      fill: t('integrations.show.mirakl.representationGuide.special.default_value.fill'),
-      badge: t('integrations.show.mirakl.representationGuide.badges.special'),
-    };
-  }
-
-  if (currentType === 'unit') {
-    return {
-      title: representationTypeLabel.value,
-      description: t('integrations.show.mirakl.representationGuide.special.unit.description'),
-      summary: t('integrations.show.mirakl.representationGuide.special.unit.summary'),
-      source: t('integrations.show.mirakl.representationGuide.special.unit.source'),
-      fill: t('integrations.show.mirakl.representationGuide.special.unit.fill'),
-      badge: t('integrations.show.mirakl.representationGuide.badges.special'),
-    };
-  }
-
-  const specificBaseKey = `integrations.show.mirakl.representationGuide.types.${currentType}`;
-  if (te(`${specificBaseKey}.description`)) {
-    return {
-      title: representationTypeLabel.value,
-      description: t(`${specificBaseKey}.description`),
-      summary: t(`${specificBaseKey}.summary`),
-      source: t(`${specificBaseKey}.source`),
-      fill: t(`${specificBaseKey}.fill`),
-      badge: t(`integrations.show.mirakl.representationGuide.badges.${representationTypeGroup.value}`),
-    };
-  }
-
-  return {
-    title: representationTypeLabel.value,
-    description: t(`integrations.show.mirakl.representationGuide.${representationTypeGroup.value}.description`, {
-      field: representationTypeLabel.value,
-    }),
-    summary: t(`integrations.show.mirakl.representationGuide.${representationTypeGroup.value}.summary`, {
-      field: representationTypeLabel.value,
-    }),
-    source: t(`integrations.show.mirakl.representationGuide.${representationTypeGroup.value}.source`, {
-      field: representationTypeLabel.value,
-    }),
-    fill: t(`integrations.show.mirakl.representationGuide.${representationTypeGroup.value}.fill`, {
-      field: representationTypeLabel.value,
-    }),
-    badge: t(`integrations.show.mirakl.representationGuide.badges.${representationTypeGroup.value}`),
-  };
-});
 
 const metadataFields = computed<Array<{ key: string; label: string; boolean?: boolean }>>(() => [
   { key: 'description', label: t('integrations.show.mirakl.properties.labels.description') },
   { key: 'example', label: t('integrations.show.mirakl.properties.labels.example') },
-  ...(showLanguageField.value
-    ? [{ key: 'language', label: t('integrations.show.mirakl.properties.labels.language') }]
-    : []),
   { key: 'defaultValue', label: t('integrations.show.mirakl.properties.labels.defaultValue') },
   { key: 'valueListCode', label: t('integrations.show.mirakl.properties.labels.valueListCode') },
   { key: 'valueListLabel', label: t('integrations.show.mirakl.properties.labels.valueListLabel') },
@@ -262,10 +135,13 @@ const rawDataAccordionItems = computed(() => ([
 
 const selectValuesRoute = computed(() => ({
   name: 'integrations.integrations.show',
-  params: { type: type.value, id: integrationId },
+  params: {
+    type: route.params.type?.toString() || type.value,
+    id: route.query.integrationId?.toString() || integrationId,
+  },
   query: {
     tab: 'propertySelectValues',
-    remoteProperty: miraklPropertyId.value,
+    remoteProperty: route.params.id?.toString() || miraklPropertyId.value,
   },
 }));
 
@@ -461,57 +337,6 @@ const buildLocalInstanceField = (defaultValue?: string | null) => ({
   ...(defaultValue ? { default: defaultValue } : {}),
 });
 
-const buildDefaultValueField = (defaultValue?: string | null) => ({
-  type: FieldType.Text,
-  name: 'defaultValue',
-  label: t('integrations.show.mirakl.properties.labels.defaultValue'),
-  help: t('integrations.show.mirakl.properties.help.defaultValue'),
-  ...(defaultValue != null ? { default: defaultValue } : {}),
-});
-
-const buildLanguageField = () => ({
-  type: FieldType.Query,
-  name: 'language',
-  label: t('integrations.show.mirakl.properties.labels.language'),
-  help: t('integrations.show.mirakl.properties.help.language'),
-  labelBy: 'name',
-  valueBy: 'remoteCode',
-  query: miraklRemoteLanguagesQuery,
-  dataKey: 'miraklRemoteLanguages',
-  queryVariables: salesChannelId
-    ? { filter: { salesChannel: { id: { exact: salesChannelId } } } }
-    : undefined,
-  isEdge: true,
-  multiple: false,
-  filterable: true,
-  removable: true,
-  optional: true,
-});
-
-const buildRepresentationTypeField = () => ({
-  type: FieldType.Choice,
-  name: 'representationType',
-  label: t('integrations.show.mirakl.properties.labels.representationType'),
-  labelBy: 'name',
-  valueBy: 'code',
-  options: getMiraklRepresentationTypeOptions(t),
-  disabled: false,
-  removable: false,
-  help: t('integrations.show.mirakl.properties.help.representationType'),
-});
-
-const getForcedRepresentationCurrentType = () => {
-  if (isRepresentationTypeDecided.value || !usesMiraklBooleanCurrentType(currentRepresentationType.value)) {
-    return null;
-  }
-
-  if (![PropertyTypes.SELECT, PropertyTypes.MULTISELECT].includes(originalType.value || '')) {
-    return null;
-  }
-
-  return PropertyTypes.BOOLEAN;
-};
-
 const insertFieldsAfter = (afterName: string, fieldsToAdd: any[]) => {
   if (!formConfig.value) {
     return;
@@ -544,7 +369,7 @@ const removeFieldsByName = (names: string[]) => {
   }
 };
 
-const syncRepresentationFields = () => {
+const syncEditableFields = () => {
   if (!formConfig.value) {
     return;
   }
@@ -554,62 +379,39 @@ const syncRepresentationFields = () => {
     propertyId ??
     propertyMetadata.value?.localInstance?.id ??
     null;
-  const existingDefaultValue = formData.value?.defaultValue ?? propertyMetadata.value?.defaultValue ?? '';
-  const existingLanguage = formData.value?.language ?? propertyMetadata.value?.language ?? null;
-
-  formConfig.value.haveCustomHelpSection = showRepresentationGuide.value;
+  formConfig.value.haveCustomHelpSection = showDeveloperAlert.value;
 
-  if (showRepresentationGuide.value) {
-    insertFieldsAfter('allowsUnmappedValues', [buildRepresentationTypeField() as any]);
-  } else {
-    removeFieldsByName(['representationType']);
-  }
+  removeFieldsByName(['localInstance', 'yesTextValue', 'noTextValue']);
 
-  removeFieldsByName(['localInstance', 'defaultValue', 'language', 'yesTextValue', 'noTextValue']);
-
-  if (usesLocalPropertyMapping.value) {
-    insertFieldsAfter('name', [
-      buildLocalInstanceField(existingLocalInstance) as any,
-    ]);
-    formData.value.localInstance = existingLocalInstance;
-    syncBooleanTextFields(getEffectiveCurrentType(formData.value.type));
-    if (showLanguageField.value) {
-      const languageAnchor = formConfig.value.fields.some((item) => item.name === 'noTextValue')
-        ? 'noTextValue'
-        : formConfig.value.fields.some((item) => item.name === 'yesTextValue')
-          ? 'yesTextValue'
-          : 'localInstance';
-      insertFieldsAfter(languageAnchor, [buildLanguageField() as any]);
-      formData.value.language = existingLanguage;
+  if (!canEditMapping.value) {
+    localPropertyType.value = null;
+    recommendations.value = [];
+    if (formData.value) {
+      formData.value.type = getEffectiveCurrentType(formData.value.type);
     }
     updateLocalInstanceHelp();
+    updateCurrentTypeHelp();
     return;
   }
 
-  if (usesDefaultValueInput.value) {
-    insertFieldsAfter('name', [
-      buildDefaultValueField(existingDefaultValue) as any,
-    ]);
-    formData.value.defaultValue = existingDefaultValue;
-  }
-
-  if (showLanguageField.value) {
-    const languageAnchor = usesDefaultValueInput.value ? 'defaultValue' : 'name';
-    insertFieldsAfter(languageAnchor, [buildLanguageField() as any]);
-    formData.value.language = existingLanguage;
-  }
-
-  localPropertyType.value = getForcedRepresentationCurrentType();
-  if (formData.value) {
-    formData.value.type = getEffectiveCurrentType(formData.value.type);
-  }
+  insertFieldsAfter('name', [
+    buildLocalInstanceField(existingLocalInstance) as any,
+  ]);
+  formData.value.localInstance = existingLocalInstance;
+  syncBooleanTextFields(getEffectiveCurrentType(formData.value.type));
   updateLocalInstanceHelp();
   updateCurrentTypeHelp();
 };
 
+const clearBlockedMappingData = (data: Record<string, any>) => {
+  delete data.localInstance;
+  delete data.yesTextValue;
+  delete data.noTextValue;
+};
+
 const syncBooleanTextFields = (currentTypeOverride?: string | null) => {
   const fieldNames = ['yesTextValue', 'noTextValue'];
-  if (!usesLocalPropertyMapping.value) {
+  if (!canEditMapping.value) {
     removeFieldsByName(fieldNames);
     return;
   }
@@ -690,25 +492,11 @@ onMounted(async () => {
         type: getEffectiveCurrentType(cleanedData.type),
       };
 
-      if (!usesLocalPropertyMapping.value) {
-        delete nextData.localInstance;
-        delete nextData.yesTextValue;
-        delete nextData.noTextValue;
-      }
-
-      if (isRepresentationTypeDecided.value) {
-        delete nextData.representationType;
-      }
-
-      if (!usesDefaultValueInput.value) {
-        delete nextData.defaultValue;
+      if (!canEditMapping.value) {
+        clearBlockedMappingData(nextData);
       }
 
-      if (!showLanguageField.value) {
-        delete nextData.language;
-      }
-
-      if (!usesLocalPropertyMapping.value && nextData.localInstance?.id === null) {
+      if (!canEditMapping.value && nextData.localInstance?.id === null) {
         nextData.localInstance = null;
       }
 
@@ -787,19 +575,14 @@ const handleSetData = (data: any) => {
     return;
   }
   propertyMetadata.value = propertyData || null;
-  representationType.value = propertyData?.representationType || null;
-
   originalType.value = propertyData?.originalType || currentType;
   initialCurrentType.value = currentType;
   originalAllowsUnmappedValues.value = propertyData?.allowsUnmappedValues ?? null;
   propertyType.value = currentType;
   if (formData.value) {
     formData.value.originalType = originalType.value;
-    formData.value.representationType = representationType.value;
-    formData.value.defaultValue = propertyData?.defaultValue ?? '';
-    formData.value.language = propertyData?.language ?? null;
   }
-  syncRepresentationFields();
+  syncEditableFields();
 };
 
 const handleFormUpdate = (form: Record<string, any>) => {
@@ -807,10 +590,11 @@ const handleFormUpdate = (form: Record<string, any>) => {
 };
 
 watch(localInstanceId, async (nextId) => {
-  if (!usesLocalPropertyMapping.value) {
+  if (!canEditMapping.value) {
     localPropertyType.value = null;
     updateLocalInstanceHelp();
     updateCurrentTypeHelp();
+    syncBooleanTextFields();
     return;
   }
 
@@ -857,7 +641,7 @@ watch(localInstanceId, async (nextId) => {
 });
 
 const fetchRecommendations = async () => {
-  if (!usesLocalPropertyMapping.value) {
+  if (!canEditMapping.value) {
     recommendations.value = [];
     return;
   }
@@ -892,7 +676,7 @@ const debouncedFetchRecommendations = debounce(fetchRecommendations, 500);
 watch(
   () => formData.value.name,
   () => {
-    if (!usesLocalPropertyMapping.value) {
+    if (!canEditMapping.value) {
       recommendations.value = [];
       return;
     }
@@ -912,8 +696,8 @@ const selectRecommendation = (id: string) => {
   recommendations.value = recommendations.value.filter((r) => r.id !== id);
 };
 
-watch(currentRepresentationType, () => {
-  syncRepresentationFields();
+watch(isRepresentationTypeDecided, () => {
+  syncEditableFields();
 });
 </script>
 
@@ -925,63 +709,27 @@ watch(currentRepresentationType, () => {
     @form-updated="handleFormUpdate"
   >
     <template #help-section>
-      <div v-if="showRepresentationGuide" class="rounded-2xl border border-slate-200 bg-white shadow-sm overflow-hidden">
-        <div class="bg-gradient-to-br from-sky-50 via-white to-cyan-50 p-5 border-b border-slate-200">
-          <div class="flex items-start justify-between gap-3">
-            <div>
-              <p class="text-xs font-semibold uppercase tracking-[0.2em] text-sky-700">
-                {{ t('integrations.show.mirakl.representationGuide.eyebrow') }}
-              </p>
-              <h2 class="mt-2 text-xl font-semibold text-slate-900">
-                {{ representationGuide.title }}
-              </h2>
-              <p class="mt-2 text-sm leading-6 text-slate-600">
-                {{ representationGuide.summary }}
-              </p>
-            </div>
-            <span class="rounded-full bg-sky-100 px-3 py-1 text-xs font-semibold text-sky-800 whitespace-nowrap">
-              {{ representationGuide.badge }}
-            </span>
-          </div>
-        </div>
-
-        <div class="space-y-5 p-5">
-          <img
-            v-if="representationGuideImage"
-            :src="representationGuideImage"
-            :alt="representationTypeLabel"
-            class="h-auto w-full rounded-xl border border-slate-200 bg-white object-cover shadow-sm"
-          />
-
-          <div class="rounded-xl border border-slate-200 bg-slate-50 p-4">
-            <p class="text-xs font-semibold uppercase tracking-[0.2em] text-slate-500">
-              {{ t('integrations.show.mirakl.representationGuide.cards.general.title') }}
-            </p>
-            <p class="mt-3 text-sm leading-6 text-slate-600">
-              {{ representationGuide.description }}
-            </p>
-            <p class="mt-3 text-sm leading-6 text-slate-600">
-              {{ representationGuide.summary }}
-            </p>
-          </div>
-
-          <div class="rounded-xl border border-slate-200 bg-slate-50 p-4">
-            <p class="text-xs font-semibold uppercase tracking-[0.2em] text-slate-500">
-              {{ t('integrations.show.mirakl.representationGuide.cards.current.title') }}
-            </p>
-            <p class="mt-3 text-sm leading-6 text-slate-600">
-              {{ representationGuide.source }}
-            </p>
-            <p class="mt-3 text-sm leading-6 text-slate-600">
-              {{ representationGuide.fill }}
-            </p>
-          </div>
+      <div v-if="showDeveloperAlert" class="rounded-2xl border border-amber-300 bg-amber-50 p-5 shadow-sm">
+        <p class="text-xs font-semibold uppercase tracking-[0.2em] text-amber-700">
+          {{ t('integrations.show.mirakl.properties.setupRequired.eyebrow') }}
+        </p>
+        <h2 class="mt-2 text-xl font-semibold text-amber-950">
+          {{ t('integrations.show.mirakl.properties.setupRequired.title') }}
+        </h2>
+        <p class="mt-3 text-sm leading-6 text-amber-900">
+          {{ t('integrations.show.mirakl.properties.setupRequired.description') }}
+        </p>
+        <p class="mt-3 text-sm leading-6 text-amber-800">
+          {{ t('integrations.show.mirakl.properties.setupRequired.contact') }}
+        </p>
+        <div class="mt-4 rounded-xl border border-amber-200 bg-white/70 p-4 text-sm leading-6 text-amber-950">
+          {{ t('integrations.show.mirakl.properties.setupRequired.details') }}
         </div>
       </div>
     </template>
     <template #before-form>
       <div
-        v-if="showTypeDisclaimer"
+        v-if="canEditMapping && showTypeDisclaimer"
         :class="[
           'mb-6 border rounded p-4',
           typeCompatibilityIsCompatible ? 'border-orange-200 bg-orange-50' : 'border-red-200 bg-red-50',
@@ -1000,7 +748,7 @@ watch(currentRepresentationType, () => {
       </div>
     </template>
     <template #additional-button>
-      <div v-if="usesLocalPropertyMapping" class="flex items-center gap-2">
+      <div v-if="canEditMapping" class="flex items-center gap-2">
         <Link
           v-if="remoteRuleId"
           :path="{
@@ -1026,8 +774,8 @@ watch(currentRepresentationType, () => {
       </div>
     </template>
     <template #additional-fields>
-      <div class="space-y-4">
-        <div v-if="usesLocalPropertyMapping" class="mt-4 border border-gray-300 bg-gray-50 rounded p-4">
+      <div v-if="canEditMapping" class="space-y-4">
+        <div class="mt-4 border border-gray-300 bg-gray-50 rounded p-4">
           <Label class="font-semibold block text-sm leading-6 text-gray-900 mb-2">
             {{ t('integrations.show.propertySelectValues.recommendation.title') }}
           </Label>
diff --git a/src/core/integrations/integrations/integrations-show/containers/properties/containers/mirakl-properties/configs.ts b/src/core/integrations/integrations/integrations-show/containers/properties/containers/mirakl-properties/configs.ts
index 0ab213a8..1ecc16c8 100644
--- a/src/core/integrations/integrations/integrations-show/containers/properties/containers/mirakl-properties/configs.ts
+++ b/src/core/integrations/integrations/integrations-show/containers/properties/containers/mirakl-properties/configs.ts
@@ -12,7 +12,6 @@ import { getPropertyTypeBadgeMap } from "../../../../../../../properties/propert
 import { updateMiraklPropertyMutation, updateMiraklInternalPropertyMutation } from "../../../../../../../../shared/api/mutations/salesChannels.js";
 import type { FormConfig } from "../../../../../../../../shared/components/organisms/general-form/formConfig";
 import { FormType } from "../../../../../../../../shared/components/organisms/general-form/formConfig";
-import { getMiraklRepresentationTypeOptions } from "./representationTypes";
 
 export const miraklPropertiesSearchConfigConstructor = (t: Function): SearchConfig => ({
   search: true,
@@ -33,15 +32,6 @@ export const miraklPropertiesSearchConfigConstructor = (t: Function): SearchConf
       addLookup: true,
       strict: true,
     },
-    {
-      type: FieldType.Choice,
-      name: 'representationType',
-      label: t('integrations.show.mirakl.properties.labels.representationType'),
-      labelBy: 'name',
-      valueBy: 'code',
-      options: getMiraklRepresentationTypeOptions(t),
-      addLookup: true,
-    },
     { type: FieldType.Boolean, name: 'usedInProducts', label: t('properties.properties.labels.usedInProducts'), strict: true },
     {
       type: FieldType.Choice,
@@ -91,7 +81,7 @@ export const miraklPropertyEditFormConfigConstructor = (
   query: getMiraklPropertyQuery,
   queryVariables: { id: propertyId },
   queryDataKey: "miraklProperty",
-  haveCustomHelpSection: true,
+  haveCustomHelpSection: false,
   submitUrl: { name: 'integrations.integrations.show', params: { type, id: integrationId }, query: { tab: 'properties' } },
   fields: [
     { type: FieldType.Hidden, name: 'id', value: propertyId },
@@ -132,17 +122,6 @@ export const miraklPropertyEditFormConfigConstructor = (
       strict: true,
       help: t('integrations.show.properties.help.allowsUnmappedValues'),
     },
-    {
-      type: FieldType.Choice,
-      name: 'representationType',
-      label: t('integrations.show.mirakl.properties.labels.representationType'),
-      labelBy: 'name',
-      valueBy: 'code',
-      options: getMiraklRepresentationTypeOptions(t),
-      disabled: false,
-      removable: false,
-      help: t('integrations.show.mirakl.properties.help.representationType'),
-    },
     {
       type: FieldType.Text,
       name: 'name',
diff --git a/src/core/integrations/integrations/integrations-show/containers/properties/containers/mirakl-properties/representationTypes.ts b/src/core/integrations/integrations/integrations-show/containers/properties/containers/mirakl-properties/representationTypes.ts
index 0f0973e1..bc6b6809 100644
--- a/src/core/integrations/integrations/integrations-show/containers/properties/containers/mirakl-properties/representationTypes.ts
+++ b/src/core/integrations/integrations/integrations-show/containers/properties/containers/mirakl-properties/representationTypes.ts
@@ -1,123 +1 @@
-export const MIRAKL_REPRESENTATION_TYPE_PROPERTY = 'property';
 export const MIRAKL_REPRESENTATION_TYPE_UNIT = 'unit';
-export const MIRAKL_REPRESENTATION_TYPE_DEFAULT_VALUE = 'default_value';
-export const MIRAKL_REPRESENTATION_TYPE_CONDITION = 'condition';
-export const MIRAKL_REPRESENTATION_TYPE_LOGISTIC_CLASS = 'logistic_class';
-
-export const MIRAKL_REPRESENTATION_TYPE_CHOICES = [
-  MIRAKL_REPRESENTATION_TYPE_PROPERTY,
-  MIRAKL_REPRESENTATION_TYPE_UNIT,
-  MIRAKL_REPRESENTATION_TYPE_DEFAULT_VALUE,
-  'product_title',
-  'product_subtitle',
-  'product_description',
-  'product_short_description',
-  'product_bullet_point',
-  'product_sku',
-  'product_internal_id',
-  'product_category',
-  'product_configurable_sku',
-  'product_configurable_id',
-  'product_active',
-  'product_url_key',
-  'product_ean',
-  'thumbnail_image',
-  'image',
-  'image_color',
-  'video',
-  'price',
-  'discounted_price',
-  'stock',
-  'vat_rate',
-  'allow_backorder',
-  MIRAKL_REPRESENTATION_TYPE_CONDITION,
-  MIRAKL_REPRESENTATION_TYPE_LOGISTIC_CLASS,
-] as const;
-
-export const getMiraklRepresentationTypeOptions = (t: Function) =>
-  MIRAKL_REPRESENTATION_TYPE_CHOICES.map((code) => ({
-    code,
-    name: t(`integrations.show.mirakl.representationTypes.options.${code}`),
-  }));
-
-export const MIRAKL_PRODUCT_REPRESENTATION_TYPES = [
-  'product_title',
-  'product_subtitle',
-  'product_description',
-  'product_short_description',
-  'product_bullet_point',
-  'product_sku',
-  'product_internal_id',
-  'product_category',
-  'product_configurable_sku',
-  'product_configurable_id',
-  'product_active',
-  'product_url_key',
-  'product_ean',
-] as const;
-
-export const MIRAKL_MEDIA_REPRESENTATION_TYPES = [
-  'thumbnail_image',
-  'image',
-  'image_color',
-  'video',
-  'document',
-] as const;
-
-export const MIRAKL_COMMERCIAL_REPRESENTATION_TYPES = [
-  'price',
-  'discounted_price',
-  'stock',
-  'vat_rate',
-  'allow_backorder',
-  'condition',
-  'logistic_class',
-] as const;
-
-export const getMiraklRepresentationTypeGroup = (representationType?: string | null) => {
-  if (!representationType) {
-    return 'special';
-  }
-
-  if (MIRAKL_PRODUCT_REPRESENTATION_TYPES.includes(representationType as any)) {
-    return 'product';
-  }
-
-  if (MIRAKL_MEDIA_REPRESENTATION_TYPES.includes(representationType as any)) {
-    return 'media';
-  }
-
-  if (MIRAKL_COMMERCIAL_REPRESENTATION_TYPES.includes(representationType as any)) {
-    return 'commercial';
-  }
-
-  return 'special';
-};
-
-export const usesMiraklLocalPropertyMapping = (representationType?: string | null) =>
-  [
-    MIRAKL_REPRESENTATION_TYPE_PROPERTY,
-    MIRAKL_REPRESENTATION_TYPE_CONDITION,
-    MIRAKL_REPRESENTATION_TYPE_LOGISTIC_CLASS,
-    'product_active',
-    'allow_backorder',
-  ].includes(representationType || '');
-
-export const usesMiraklDefaultValueInput = (representationType?: string | null) =>
-  representationType === MIRAKL_REPRESENTATION_TYPE_DEFAULT_VALUE;
-
-export const usesMiraklUnitSelection = (representationType?: string | null) =>
-  representationType === MIRAKL_REPRESENTATION_TYPE_UNIT;
-
-export const usesMiraklLanguageSelection = (representationType?: string | null) =>
-  [
-    MIRAKL_REPRESENTATION_TYPE_PROPERTY,
-    'product_title',
-    'product_subtitle',
-    'product_description',
-    'product_short_description',
-    'product_bullet_point',
-  ].includes(representationType || '');
-
-export const usesMiraklBooleanCurrentType = (representationType?: string | null) =>
-  ['product_active', 'allow_backorder'].includes(representationType || '');
diff --git a/src/core/integrations/integrations/integrations-show/containers/properties/containers/remote-properties/RemoteProperties.vue b/src/core/integrations/integrations/integrations-show/containers/properties/containers/remote-properties/RemoteProperties.vue
index 964993bb..6f4edc37 100644
--- a/src/core/integrations/integrations/integrations-show/containers/properties/containers/remote-properties/RemoteProperties.vue
+++ b/src/core/integrations/integrations/integrations-show/containers/properties/containers/remote-properties/RemoteProperties.vue
@@ -16,7 +16,6 @@ import { displayApolloError } from "../../../../../../../../shared/utils";
 import { Toast } from "../../../../../../../../shared/modules/toast";
 import { PropertyTypes } from "../../../../../../../../shared/utils/constants";
 import { IntegrationTypes } from "../../../../../integrations";
-import { MIRAKL_REPRESENTATION_TYPE_PROPERTY } from "../mirakl-properties/representationTypes";
 
 type RouteBuilderContext = {
   id: string;
@@ -76,7 +75,7 @@ const canSeeValues = (item: any) => {
   }
 
   if (integrationType.value === IntegrationTypes.Mirakl) {
-    return item?.node?.representationTypeDecided || item?.node?.representationType === MIRAKL_REPRESENTATION_TYPE_PROPERTY;
+    return Boolean(item?.node?.representationTypeDecided);
   }
 
   return true;
diff --git a/src/core/integrations/integrations/integrations.ts b/src/core/integrations/integrations/integrations.ts
index 7f52bcb9..9afcd97b 100644
--- a/src/core/integrations/integrations/integrations.ts
+++ b/src/core/integrations/integrations/integrations.ts
@@ -89,9 +89,6 @@ export interface MagentoChannelInfo extends SpecificChannelInfo {
 
 export interface ShopifyChannelInfo extends SpecificChannelInfo {
   vendorProperty: { id: string | null };
-  apiKey: string;
-  apiSecret: string;
-  accessToken: string;
   hmac?: string;
   host?: string;
   timestamp?: string;
@@ -152,9 +149,6 @@ export function getMagentoDefaultFields(): MagentoChannelInfo {
 export function getShopifyDefaultFields(): ShopifyChannelInfo {
   return {
     vendorProperty: { id: null },
-    apiKey: '',
-    apiSecret: '',
-    accessToken: '',
   };
 }
 
diff --git a/src/core/integrations/routes.ts b/src/core/integrations/routes.ts
index 2cb95c42..ba2927da 100644
--- a/src/core/integrations/routes.ts
+++ b/src/core/integrations/routes.ts
@@ -114,19 +114,18 @@ export const routes = [
     meta: { title: 'integrations.show.miraklIssues.show.title' },
     component: () => import('./integrations/integrations-show/containers/issues/containers/MiraklProductIssueShowController.vue'),
   },
-  // temporary commented since we no longer to oAuth
-  // {
-  //   path: '/integrations/shopify/installed',
-  //   name: 'integrations.shopify.installed',
-  //   meta: { title: 'integrations.shopify.installed.title' },
-  //   component: () => import('./integrations/integrations-installed/shopify-installed/ShopifyInstalledController.vue'),
-  // },
-  // {
-  //   path: '/integrations/shopify/entry',
-  //   name: 'integrations.shopify.entry',
-  //   meta: { title: 'integrations.shopify.entry.title' },
-  //   component: () => import('./integrations/integrations-shopify-entry/ShopifyEntryController.vue'),
-  // },
+  {
+    path: '/integrations/shopify/installed',
+    name: 'integrations.shopify.installed',
+    meta: { title: 'integrations.shopify.installed.title' },
+    component: () => import('./integrations/integrations-installed/shopify-installed/ShopifyInstalledController.vue'),
+  },
+  {
+    path: '/integrations/shopify/entry',
+    name: 'integrations.shopify.entry',
+    meta: { title: 'integrations.shopify.entry.title' },
+    component: () => import('./integrations/integrations-shopify-entry/ShopifyEntryController.vue'),
+  },
   {
     path: '/integrations/amazon/installed',
     name: 'integrations.amazon.installed',
diff --git a/src/core/products/products/product-show/containers/tabs/ean-codes/ProductEanCodeInput.vue b/src/core/products/products/product-show/containers/tabs/ean-codes/ProductEanCodeInput.vue
index 43fce9f6..fe0bab5c 100644
--- a/src/core/products/products/product-show/containers/tabs/ean-codes/ProductEanCodeInput.vue
+++ b/src/core/products/products/product-show/containers/tabs/ean-codes/ProductEanCodeInput.vue
@@ -1,10 +1,15 @@
 <script setup lang="ts">
-
-import { computed, defineProps, watchEffect, ref } from 'vue';
+import { computed, defineProps, ref, watchEffect } from 'vue';
 import { useI18n } from 'vue-i18n';
+import Swal, { SweetAlertOptions } from 'sweetalert2';
 import apolloClient from "../../../../../../../../apollo-client";
 import { eanCodesQuery } from "../../../../../../../shared/api/queries/eanCodes.js";
-import { createEanCodeMutation, updateEanCodeMutation, deleteEanCodeMutation } from "../../../../../../../shared/api/mutations/eanCodes.js";
+import {
+  createEanCodeMutation,
+  deleteEanCodeMutation,
+  manualAssignEanCodeMutation,
+  updateEanCodeMutation
+} from "../../../../../../../shared/api/mutations/eanCodes.js";
 import { processGraphQLErrors } from "../../../../../../../shared/utils";
 import { Toast } from "../../../../../../../shared/modules/toast";
 import { PrimaryButton } from "../../../../../../../shared/components/atoms/button-primary";
@@ -14,10 +19,16 @@ import { ValueFormField } from "../../../../../../../shared/components/organisms
 import { FieldType } from "../../../../../../../shared/utils/constants";
 import { Label } from "../../../../../../../shared/components/atoms/label";
 import ApolloAlertMutation from "../../../../../../../shared/components/molecules/apollo-alert-mutation/ApolloAlertMutation.vue";
-import {
-  FieldValue
-} from "../../../../../../../shared/components/organisms/general-form/containers/form-fields/field-value";
-import Swal, { SweetAlertOptions } from "sweetalert2";
+import { FieldValue } from "../../../../../../../shared/components/organisms/general-form/containers/form-fields/field-value";
+
+interface ExistingEanCodeNode {
+  id: string;
+  internal: boolean;
+  alreadyUsed: boolean;
+  product?: {
+    id?: string | null;
+  } | null;
+}
 
 const { t } = useI18n();
 
@@ -25,13 +36,14 @@ const props = defineProps<{ product: any, initialEanCode: { id: string | null, e
 const emit = defineEmits(['ean-updated']);
 
 const errors = ref<Record<string, string>>({});
+const saving = ref(false);
+const matchingExistingEan = ref(false);
 const eanCode = ref({
-  id: props.initialEanCode?.id || null,
-  ean: props.initialEanCode?.ean || '',
-  internal: props.initialEanCode?.internal || null
+  id: props.initialEanCode?.id ?? null,
+  ean: props.initialEanCode?.ean ?? '',
+  internal: props.initialEanCode?.internal ?? null
 });
-
-const lastSavedEanCode = ref(props.initialEanCode?.ean || '');
+const lastSavedEanCode = ref(props.initialEanCode?.ean ?? '');
 
 const defaultSwalOptions = {
   title: t('products.eanCodes.invalidEanCodeAlert.title'),
@@ -48,8 +60,7 @@ const defaultSwalClasses = {
   popup: 'sweet-alerts',
   confirmButton: 'btn btn-secondary',
   cancelButton: 'btn btn-dark ltr:mr-3 rtl:ml-3'
-}
-
+};
 
 const swalWithBootstrapButtons = Swal.mixin({
   customClass: defaultSwalClasses,
@@ -58,85 +69,112 @@ const swalWithBootstrapButtons = Swal.mixin({
 
 watchEffect(() => {
   if (props.initialEanCode) {
-    eanCode.value.id = props.initialEanCode.id || null;
-    eanCode.value.ean = props.initialEanCode.ean || '';
-    eanCode.value.internal = props.initialEanCode.internal || null;
-    lastSavedEanCode.value = props.initialEanCode.ean || '';
+    eanCode.value.id = props.initialEanCode.id ?? null;
+    eanCode.value.ean = props.initialEanCode.ean ?? '';
+    eanCode.value.internal = props.initialEanCode.internal ?? null;
+    lastSavedEanCode.value = props.initialEanCode.ean ?? '';
   }
 });
 
+const isBusy = computed(() => saving.value || matchingExistingEan.value);
 
 const getEanCode = (): ValueFormField => ({
   type: FieldType.Text,
   name: 'eanCode',
   label: t('products.eanCodes.labels.externalEanCode'),
   placeholder: t('products.eanCodes.placeholders.externalEanCode'),
+  disabled: isBusy.value
 });
 
-const handleCreate = async () => {
-
-  const inputData = {
-    eanCode: eanCode.value.ean,
-    product: { id: props.product.id },
-    internal: false,
-    alreadyUsed: true,
-  };
+const buildExternalEanCodeInput = (value: string) => ({
+  eanCode: value,
+  product: { id: props.product.id },
+  internal: false,
+  alreadyUsed: true,
+});
 
-  const { data } = await apolloClient.mutate({
+const createExternalEanCode = async (value: string) => {
+  return apolloClient.mutate({
     mutation: createEanCodeMutation,
-    variables: { data: inputData },
+    variables: { data: buildExternalEanCodeInput(value) },
+  });
+};
+
+const updateExternalEanCode = async (id: string, value: string) => {
+  return apolloClient.mutate({
+    mutation: updateEanCodeMutation,
+    variables: {
+      data: {
+        id,
+        eanCode: value,
+        internal: false,
+        alreadyUsed: true,
+      },
+    },
   });
+};
+
+const deleteAssignedEanCode = async (id: string) => {
+  return apolloClient.mutate({
+    mutation: deleteEanCodeMutation,
+    variables: { id },
+  });
+};
+
+const handleCreate = async (value: string) => {
+  const { data } = await createExternalEanCode(value);
 
   if (data) {
     eanCode.value.id = data.createEanCode.id;
+    eanCode.value.ean = value;
+    lastSavedEanCode.value = value;
     Toast.success(t('products.eanCodes.createdSuccessfully'));
     await emit('ean-updated');
   }
 };
 
-const handleEdit = async () => {
-
-  const inputData = {
-    id: eanCode.value.id,
-    eanCode: eanCode.value.ean,
-    internal: false,
-    alreadyUsed: true,
-  };
+const handleEdit = async (value: string) => {
+  if (!eanCode.value.id) {
+    return;
+  }
 
-  const { data } = await apolloClient.mutate({
-    mutation: updateEanCodeMutation,
-    variables: { data: inputData },
-  });
+  const { data } = await updateExternalEanCode(eanCode.value.id, value);
 
   if (data) {
+    eanCode.value.ean = value;
+    lastSavedEanCode.value = value;
     Toast.success(t('products.eanCodes.updatedSuccessfully'));
     await emit('ean-updated');
   }
 };
 
 const deleteSuccess = async () => {
-    Toast.success(t('products.eanCodes.deletedSuccessfully'));
-    eanCode.value.ean = '';
-    lastSavedEanCode.value = '';
-    eanCode.value.id = null;
-    await emit('ean-updated');
+  Toast.success(t('products.eanCodes.deletedSuccessfully'));
+  errors.value = {};
+  matchingExistingEan.value = false;
+  eanCode.value.ean = '';
+  eanCode.value.internal = null;
+  eanCode.value.id = null;
+  lastSavedEanCode.value = '';
+  await emit('ean-updated');
 };
 
 const handleDelete = async () => {
-  if (!eanCode.value.id) return;
+  if (!eanCode.value.id) {
+    return;
+  }
 
-    const { data } = await apolloClient.mutate({
-      mutation: deleteEanCodeMutation,
-      variables: {  id: eanCode.value.id  },
-    });
+  const { data } = await deleteAssignedEanCode(eanCode.value.id);
 
-    if (data) {
-      await deleteSuccess();
-    }
+  if (data) {
+    await deleteSuccess();
+  }
 };
 
 const isValidEan13 = (ean: string): boolean => {
-  if (!/^\d{13}$/.test(ean)) return false;
+  if (!/^\d{13}$/.test(ean)) {
+    return false;
+  }
 
   const digits = ean.split('').map(Number);
   const checkDigit = digits.pop();
@@ -153,110 +191,252 @@ const displayGraphqlErrors = (error: unknown) => {
   const validationErrors = processGraphQLErrors(error, t);
   errors.value = validationErrors;
   const messages = Object.values(validationErrors).filter(Boolean);
+
   if (messages.length) {
     messages.forEach((message) => {
       Toast.error(String(message));
     });
     return;
   }
+
   Toast.error(t('shared.alert.toast.unexpectedResult'));
 };
 
+const getGraphQLErrorMessages = (error: unknown): string[] => {
+  if (!error || typeof error !== 'object' || !('graphQLErrors' in error)) {
+    return [];
+  }
+
+  const graphQLErrors = (error as { graphQLErrors?: Array<{ message?: string }> }).graphQLErrors;
+  if (!Array.isArray(graphQLErrors)) {
+    return [];
+  }
+
+  return graphQLErrors
+    .map((graphQLError) => graphQLError?.message)
+    .filter((message): message is string => Boolean(message));
+};
+
+const isDuplicateEanError = (error: unknown): boolean => {
+  const normalizedMessages = Object.values(processGraphQLErrors(error, t)).map((message) => String(message));
+  const messages = [...getGraphQLErrorMessages(error), ...normalizedMessages];
+
+  return messages.some((message) => /ean code/i.test(message) && /already exists/i.test(message));
+};
+
+const setExistingEanBlockedError = () => {
+  errors.value = {
+    __all__: t('products.eanCodes.messages.matchExistingBlocked')
+  };
+};
+
+const fetchMatchingEanCode = async (value: string): Promise<ExistingEanCodeNode | null> => {
+  const { data } = await apolloClient.query({
+    query: eanCodesQuery,
+    variables: {
+      first: 1,
+      filter: {
+        eanCode: { exact: value }
+      }
+    },
+    fetchPolicy: 'network-only'
+  });
+
+  return data?.eanCodes?.edges?.[0]?.node ?? null;
+};
+
+const isReclaimableEanCode = (existingEanCode: ExistingEanCodeNode | null): existingEanCode is ExistingEanCodeNode => {
+  return Boolean(
+    existingEanCode &&
+    existingEanCode.internal &&
+    existingEanCode.alreadyUsed === false &&
+    !existingEanCode.product?.id
+  );
+};
+
+const rollbackPreviousExternalEan = async (previousEan: string) => {
+  if (!previousEan) {
+    return;
+  }
+
+  await createExternalEanCode(previousEan);
+  lastSavedEanCode.value = previousEan;
+};
+
+const tryMatchExistingEanCode = async (value: string): Promise<boolean> => {
+  matchingExistingEan.value = true;
+  errors.value = {};
+
+  const previousExternalEanId = eanCode.value.id;
+  const previousExternalEan = lastSavedEanCode.value.trim();
+
+  try {
+    const existingEanCode = await fetchMatchingEanCode(value);
+
+    if (!isReclaimableEanCode(existingEanCode)) {
+      setExistingEanBlockedError();
+      return false;
+    }
+
+    if (previousExternalEanId) {
+      await deleteAssignedEanCode(previousExternalEanId);
+      eanCode.value.id = null;
+    }
+
+    const { data } = await apolloClient.mutate({
+      mutation: manualAssignEanCodeMutation,
+      variables: {
+        data: {
+          product: { id: props.product.id },
+          eanCode: { id: existingEanCode.id }
+        }
+      }
+    });
+
+    if (!data) {
+      if (previousExternalEanId && previousExternalEan) {
+        await rollbackPreviousExternalEan(previousExternalEan);
+        await emit('ean-updated');
+      }
+      setExistingEanBlockedError();
+      return false;
+    }
+
+    errors.value = {};
+    eanCode.value.ean = value;
+    lastSavedEanCode.value = value;
+    Toast.success(t('products.eanCodes.assignSuccessfully'));
+    await emit('ean-updated');
+    return true;
+  } catch (error) {
+    if (previousExternalEanId && previousExternalEan && !eanCode.value.id) {
+      try {
+        await rollbackPreviousExternalEan(previousExternalEan);
+        await emit('ean-updated');
+      } catch (rollbackError) {
+        console.error('Failed to restore previous external EAN code.', rollbackError);
+      }
+    }
+
+    displayGraphqlErrors(error);
+    return false;
+  } finally {
+    matchingExistingEan.value = false;
+  }
+};
+
 const handleSave = async () => {
   errors.value = {};
 
   const trimmedEan = eanCode.value.ean.trim();
 
-  // If empty, delete it
   if (!trimmedEan) {
-    await handleDelete();
+    try {
+      saving.value = true;
+      await handleDelete();
+    } catch (error) {
+      displayGraphqlErrors(error);
+    } finally {
+      saving.value = false;
+    }
     return;
   }
 
-  // Soft validation for EAN13
   if (!isValidEan13(trimmedEan)) {
-  const result = await swalWithBootstrapButtons.fire(defaultSwalOptions as SweetAlertOptions);
+    const result = await swalWithBootstrapButtons.fire(defaultSwalOptions as SweetAlertOptions);
 
     if (!result.isConfirmed) {
-      // Revert
       eanCode.value.ean = lastSavedEanCode.value;
       return;
     }
   }
 
-  try {
-    lastSavedEanCode.value = trimmedEan;
+  eanCode.value.ean = trimmedEan;
+  saving.value = true;
 
+  try {
     if (eanCode.value.id) {
-      await handleEdit();
+      await handleEdit(trimmedEan);
     } else {
-      await handleCreate();
+      await handleCreate(trimmedEan);
     }
-  } catch (err) {
-    displayGraphqlErrors(err);
+  } catch (error) {
+    saving.value = false;
+
+    if (isDuplicateEanError(error)) {
+      const matched = await tryMatchExistingEanCode(trimmedEan);
+      if (!matched && !errors.value.__all__ && !errors.value.eanCode) {
+        setExistingEanBlockedError();
+      }
+      return;
+    }
+
+    displayGraphqlErrors(error);
+  } finally {
+    saving.value = false;
   }
 };
 
-
-const isSaveDisabled = computed(() => lastSavedEanCode.value === eanCode.value.ean);
-
-const hasUnsavedChanges = computed(() => lastSavedEanCode.value !== eanCode.value.ean);
+const isSaveDisabled = computed(() => lastSavedEanCode.value === eanCode.value.ean.trim());
+const hasUnsavedChanges = computed(() => lastSavedEanCode.value !== eanCode.value.ean.trim());
 
 defineExpose({ hasUnsavedChanges });
-
 </script>
 
 <template>
-      <Flex vertical class="gap-4">
+  <Flex vertical class="gap-4">
+    <FlexCell>
+      <Flex class="mt-4 gap-4" vertical>
         <FlexCell>
-          <Flex class="mt-4 gap-4" vertical>
+          <Flex vertical class="gap-2">
             <FlexCell>
-              <Flex vertical class="gap-2">
-                <!-- Label for EAN Code -->
-                <FlexCell>
-                  <Label class="font-semibold block text-sm leading-6 text-gray-900">
-                    {{ t('products.eanCodes.labels.externalEanCode') }}
-                  </Label>
-                </FlexCell>
-
-                <!-- Help Text -->
-                <FlexCell>
-                  <span class="text-gray-500 text-xs">
-                    {{ t('products.eanCodes.help.externalEanCode') }}
-                  </span>
-                </FlexCell>
-
-                <!-- Error Message -->
-                <FlexCell>
-                  <div v-if="errors.__all__ || errors.eanCode" class="text-danger text-small blink-animation ml-1 mb-1">
-                    <Icon size="sm" name="exclamation-circle" />
-                    <span class="ml-1">{{ errors.__all__ || errors.eanCode }}</span>
-                  </div>
-                </FlexCell>
-
-                <!-- EAN Code Input -->
-                <FlexCell>
-                  <FieldValue class="w-96" v-model="eanCode.ean" :field="getEanCode()" />
-                </FlexCell>
-              </Flex>
+              <Label class="font-semibold block text-sm leading-6 text-gray-900">
+                {{ t('products.eanCodes.labels.externalEanCode') }}
+              </Label>
+            </FlexCell>
+
+            <FlexCell>
+              <span class="text-gray-500 text-xs">
+                {{ t('products.eanCodes.help.externalEanCode') }}
+              </span>
+            </FlexCell>
+
+            <FlexCell v-if="matchingExistingEan">
+              <div class="rounded-md border border-amber-200 bg-amber-50 px-3 py-2 text-sm text-amber-800">
+                <div class="flex items-center gap-2">
+                  <Icon name="circle-notch" spin class="h-4 w-4" />
+                  <span>{{ t('products.eanCodes.messages.matchingExisting') }}</span>
+                </div>
+              </div>
             </FlexCell>
-          </Flex>
-        </FlexCell>
 
-        <!-- Save & Delete Buttons -->
-        <FlexCell class="flex gap-2">
-          <PrimaryButton :disabled="isSaveDisabled" @click="handleSave">
-            {{ t('shared.button.save') }}
-          </PrimaryButton>
-
-          <!-- Delete Button -->
-          <ApolloAlertMutation :mutation="deleteEanCodeMutation" :mutation-variables="{ id: eanCode.id }" @done="deleteSuccess">
-            <template v-slot="{ loading, confirmAndMutate }">
-              <Button :disabled="!eanCode.id" :customClass="'ltr:ml-auto rtl:mr-auto btn btn-outline-danger p-2'" @click="confirmAndMutate">
-                <Icon name="trash" class="h-5 w-5" />
-              </Button>
-            </template>
-          </ApolloAlertMutation>
+            <FlexCell>
+              <div v-if="errors.__all__ || errors.eanCode" class="text-danger text-small blink-animation ml-1 mb-1">
+                <Icon size="sm" name="exclamation-circle" />
+                <span class="ml-1">{{ errors.__all__ || errors.eanCode }}</span>
+              </div>
+            </FlexCell>
+
+            <FlexCell>
+              <FieldValue class="w-96" v-model="eanCode.ean" :field="getEanCode()" />
+            </FlexCell>
+          </Flex>
         </FlexCell>
       </Flex>
+    </FlexCell>
+
+    <FlexCell class="flex gap-2">
+      <PrimaryButton :disabled="isSaveDisabled || isBusy" :loading="isBusy" @click="handleSave">
+        {{ t('shared.button.save') }}
+      </PrimaryButton>
+
+      <ApolloAlertMutation :mutation="deleteEanCodeMutation" :mutation-variables="{ id: eanCode.id }" @done="deleteSuccess">
+        <template v-slot="{ loading, confirmAndMutate }">
+          <Button :disabled="!eanCode.id || isBusy || loading" :loading="loading" :customClass="'ltr:ml-auto rtl:mr-auto btn btn-outline-danger p-2'" @click="confirmAndMutate">
+            <Icon name="trash" class="h-5 w-5" />
+          </Button>
+        </template>
+      </ApolloAlertMutation>
+    </FlexCell>
+  </Flex>
 </template>
diff --git a/src/core/products/products/product-show/containers/tabs/variations/VariationsView.vue b/src/core/products/products/product-show/containers/tabs/variations/VariationsView.vue
index 3d76f324..3721121f 100644
--- a/src/core/products/products/product-show/containers/tabs/variations/VariationsView.vue
+++ b/src/core/products/products/product-show/containers/tabs/variations/VariationsView.vue
@@ -15,9 +15,11 @@ import VariationsImagesBulkEdit from "./containers/variations-images-bulk-edit/V
 import VariationsDocumentsBulkEdit from "./containers/variations-documents-bulk-edit/VariationsDocumentsBulkEdit.vue";
 import VariationsVideosBulkEdit from "./containers/variations-videos-bulk-edit/VariationsVideosBulkEdit.vue";
 import VariationsGeneralBulkEdit from "./containers/variations-general-bulk-edit/VariationsGeneralBulkEdit.vue";
+import VariationsEanCodesBulkEdit from "./containers/variations-ean-codes-bulk-edit/VariationsEanCodesBulkEdit.vue";
 import VariationsAmazonBulkEdit from "./containers/variations-amazon-bulk-edit/VariationsAmazonBulkEdit.vue";
 import VariationsSheinBulkEdit from "./containers/variations-shein-bulk-edit/VariationsSheinBulkEdit.vue";
 import VariationsEbayBulkEdit from "./containers/variations-ebay-bulk-edit/VariationsEbayBulkEdit.vue";
+import VariationsMiraklBulkEdit from "./containers/variations-mirakl-bulk-edit/VariationsMiraklBulkEdit.vue";
 import { useI18n } from 'vue-i18n';
 import Swal from 'sweetalert2';
 import { injectAuth } from "../../../../../../../shared/modules/auth";
@@ -31,7 +33,7 @@ const route = useRoute();
 const router = useRouter();
 const ids = ref([]);
 const refetchNeeded = ref(false);
-type Mode = 'list' | 'editContent' | 'editProperties' | 'editPrices' | 'editImages' | 'editDocuments' | 'editVideos' | 'editAmazon' | 'editShein' | 'editEbay' | 'editGeneral';
+type Mode = 'list' | 'editContent' | 'editProperties' | 'editPrices' | 'editImages' | 'editDocuments' | 'editVideos' | 'editAmazon' | 'editShein' | 'editEbay' | 'editMirakl' | 'editGeneral' | 'editEanCodes';
 const mode = ref<Mode>('list');
 const modeQueryKey = 'variationView';
 const bulkEditRef = ref<InstanceType<typeof VariationsBulkEdit> | null>(null);
@@ -41,9 +43,11 @@ const imageEditRef = ref<InstanceType<typeof VariationsImagesBulkEdit> | null>(n
 const documentEditRef = ref<InstanceType<typeof VariationsDocumentsBulkEdit> | null>(null);
 const videoEditRef = ref<InstanceType<typeof VariationsVideosBulkEdit> | null>(null);
 const generalEditRef = ref<InstanceType<typeof VariationsGeneralBulkEdit> | null>(null);
+const eanCodesEditRef = ref<InstanceType<typeof VariationsEanCodesBulkEdit> | null>(null);
 const amazonEditRef = ref<InstanceType<typeof VariationsAmazonBulkEdit> | null>(null);
 const sheinEditRef = ref<InstanceType<typeof VariationsSheinBulkEdit> | null>(null);
 const ebayEditRef = ref<InstanceType<typeof VariationsEbayBulkEdit> | null>(null);
+const miraklEditRef = ref<InstanceType<typeof VariationsMiraklBulkEdit> | null>(null);
 
 const getUnsavedChangesForMode = (currentMode: Mode) => {
   if (currentMode === 'editContent') {
@@ -73,9 +77,15 @@ const getUnsavedChangesForMode = (currentMode: Mode) => {
   if (currentMode === 'editEbay') {
     return ebayEditRef.value?.hasUnsavedChanges ?? false;
   }
+  if (currentMode === 'editMirakl') {
+    return miraklEditRef.value?.hasUnsavedChanges ?? false;
+  }
   if (currentMode === 'editGeneral') {
     return generalEditRef.value?.hasUnsavedChanges ?? false;
   }
+  if (currentMode === 'editEanCodes') {
+    return eanCodesEditRef.value?.hasUnsavedChanges ?? false;
+  }
   return false;
 };
 
@@ -87,15 +97,18 @@ const hasUnsavedChanges = computed(
     (imageEditRef.value?.hasUnsavedChanges ?? false) ||
     (documentEditRef.value?.hasUnsavedChanges ?? false) ||
     (videoEditRef.value?.hasUnsavedChanges ?? false) ||
+    (eanCodesEditRef.value?.hasUnsavedChanges ?? false) ||
     (amazonEditRef.value?.hasUnsavedChanges ?? false) ||
     (sheinEditRef.value?.hasUnsavedChanges ?? false) ||
     (ebayEditRef.value?.hasUnsavedChanges ?? false) ||
+    (miraklEditRef.value?.hasUnsavedChanges ?? false) ||
     (generalEditRef.value?.hasUnsavedChanges ?? false)
 );
 
 const hasAmazonIntegration = computed(() => Boolean(auth.user.company?.hasAmazonIntegration));
 const hasSheinIntegration = computed(() => Boolean(auth.user.company?.hasSheinIntegration));
 const hasEbayIntegration = computed(() => Boolean(auth.user.company?.hasEbayIntegration));
+const hasMiraklIntegration = computed(() => Boolean(auth.user.company?.hasMiraklIntegration));
 
 const tabs = computed<{ key: Mode; label: string; icon: string }[]>(() => {
   const items: { key: Mode; label: string; icon: string }[] = [
@@ -103,6 +116,7 @@ const tabs = computed<{ key: Mode; label: string; icon: string }[]>(() => {
     { key: 'editGeneral', label: t('products.products.variations.tabs.general'), icon: 'sliders' },
     { key: 'editContent', label: t('products.products.variations.tabs.content'), icon: 'file-lines' },
     { key: 'editProperties', label: t('products.products.tabs.properties'), icon: 'screwdriver-wrench' },
+    { key: 'editEanCodes', label: t('products.products.tabs.eanCodes'), icon: 'qrcode' },
     { key: 'editPrices', label: t('products.products.tabs.prices'), icon: 'coins' },
     { key: 'editImages', label: t('products.products.variations.tabs.images'), icon: 'images' },
     { key: 'editDocuments', label: t('products.products.variations.tabs.documents'), icon: 'file-text' },
@@ -121,6 +135,10 @@ const tabs = computed<{ key: Mode; label: string; icon: string }[]>(() => {
     items.push({ key: 'editShein', label: t('products.products.variations.tabs.shein'), icon: 'store' });
   }
 
+  if (hasMiraklIntegration.value) {
+    items.push({ key: 'editMirakl', label: t('products.products.variations.tabs.mirakl'), icon: 'store' });
+  }
+
   return items;
 });
 const availableModes = computed<Mode[]>(() => tabs.value.map(tab => tab.key));
@@ -316,6 +334,9 @@ defineExpose({ hasUnsavedChanges });
           <template v-else-if="mode === 'editPrices'">
             <VariationsPricesBulkEdit ref="priceEditRef" :product="product" />
           </template>
+          <template v-else-if="mode === 'editEanCodes'">
+            <VariationsEanCodesBulkEdit ref="eanCodesEditRef" :product="product" />
+          </template>
           <template v-else-if="mode === 'editImages'">
             <VariationsImagesBulkEdit ref="imageEditRef" :product="product" />
           </template>
@@ -334,6 +355,9 @@ defineExpose({ hasUnsavedChanges });
           <template v-else-if="mode === 'editShein'">
             <VariationsSheinBulkEdit ref="sheinEditRef" :product="product" />
           </template>
+          <template v-else-if="mode === 'editMirakl'">
+            <VariationsMiraklBulkEdit ref="miraklEditRef" :product="product" />
+          </template>
           <template v-else>
             <VariationsGeneralBulkEdit ref="generalEditRef" :product="product" />
           </template>
diff --git a/src/core/products/products/product-show/containers/tabs/variations/containers/variations-amazon-bulk-edit/VariationsAmazonBulkEdit.vue b/src/core/products/products/product-show/containers/tabs/variations/containers/variations-amazon-bulk-edit/VariationsAmazonBulkEdit.vue
index d7374844..43c40855 100644
--- a/src/core/products/products/product-show/containers/tabs/variations/containers/variations-amazon-bulk-edit/VariationsAmazonBulkEdit.vue
+++ b/src/core/products/products/product-show/containers/tabs/variations/containers/variations-amazon-bulk-edit/VariationsAmazonBulkEdit.vue
@@ -1706,7 +1706,7 @@ defineExpose({ hasUnsavedChanges });
     </Modal>
 
     <Modal v-model="browseNodeModal.visible" @closed="closeBrowseNodeModal">
-      <Card class="modal-content w-11/12 max-w-6xl max-h-[85vh] flex flex-col min-h-0 overflow-hidden">
+      <Card class="modal-content w-[90vw] max-w-[90vw] max-h-[85vh] flex flex-col min-h-0 overflow-hidden">
         <div class="mb-4">
           <h3 class="text-xl font-semibold">
             {{ t('products.products.amazon.browseNode') }}
diff --git a/src/core/products/products/product-show/containers/tabs/variations/containers/variations-ean-codes-bulk-edit/VariationsEanCodesBulkEdit.vue b/src/core/products/products/product-show/containers/tabs/variations/containers/variations-ean-codes-bulk-edit/VariationsEanCodesBulkEdit.vue
new file mode 100644
index 00000000..0decf62e
--- /dev/null
+++ b/src/core/products/products/product-show/containers/tabs/variations/containers/variations-ean-codes-bulk-edit/VariationsEanCodesBulkEdit.vue
@@ -0,0 +1,938 @@
+<script setup lang="ts">
+import { computed, onBeforeUnmount, ref, watch, withDefaults } from 'vue';
+import type { FetchPolicy } from '@apollo/client';
+import { useI18n } from 'vue-i18n';
+import MatrixEditor from "../../../../../../../../../shared/components/organisms/matrix-editor/MatrixEditor.vue";
+import type { MatrixColumn, MatrixEditorExpose } from "../../../../../../../../../shared/components/organisms/matrix-editor/types";
+import { Button } from "../../../../../../../../../shared/components/atoms/button";
+import { Link } from "../../../../../../../../../shared/components/atoms/link";
+import { Icon } from "../../../../../../../../../shared/components/atoms/icon";
+import { Toast } from "../../../../../../../../../shared/modules/toast";
+import { processGraphQLErrors, shortenText } from "../../../../../../../../../shared/utils";
+import apolloClient from "../../../../../../../../../../apollo-client";
+import { Product } from "../../../../../../configs";
+import { ProductType } from "../../../../../../../../../shared/utils/constants";
+import {
+  bundleVariationsQuery,
+  configurableVariationsQuery,
+  productsWithEanCodesQuery
+} from "../../../../../../../../../shared/api/queries/products.js";
+import { eanCodesQuery } from "../../../../../../../../../shared/api/queries/eanCodes.js";
+import {
+  assignEanCodeMutation,
+  createEanCodeMutation,
+  deleteEanCodeMutation,
+  manualAssignEanCodeMutation,
+  releaseEanCodeMutation,
+  updateEanCodeMutation
+} from "../../../../../../../../../shared/api/mutations/eanCodes.js";
+
+type PendingAction = 'none' | 'assign' | 'release' | 'delete';
+type ValidationState = 'idle' | 'valid' | 'invalid';
+type SaveOperation = Exclude<PendingAction, 'none'> | 'create' | 'update' | null;
+
+interface EanCodeInfo {
+  id: string | null;
+  ean: string;
+  internal: boolean | null;
+  alreadyUsed: boolean | null;
+}
+
+interface VariationEanRow {
+  id: string;
+  variation: {
+    id: string;
+    sku: string;
+    name: string;
+    active: boolean;
+    type: string | null;
+  };
+  currentEan: EanCodeInfo;
+  draftEan: string;
+  pendingAction: PendingAction;
+  validationState: ValidationState;
+  errorMessage: string;
+}
+
+interface ExistingEanCodeNode {
+  id: string;
+  internal: boolean;
+  alreadyUsed: boolean;
+  product?: {
+    id?: string | null;
+  } | null;
+}
+
+const props = withDefaults(
+  defineProps<{ product?: Product | null; productIds?: string[] }>(),
+  { product: null, productIds: () => [] }
+);
+
+const { t } = useI18n();
+
+const variations = ref<VariationEanRow[]>([]);
+const originalVariations = ref<VariationEanRow[]>([]);
+const loading = ref(false);
+const saving = ref(false);
+const matrixRef = ref<MatrixEditorExpose | null>(null);
+const validationTimers = new Map<string, number>();
+
+const baseColumns = computed<MatrixColumn[]>(() => [
+  { key: 'sku', label: t('shared.labels.sku'), sticky: true, editable: false },
+  { key: 'name', label: t('shared.labels.name'), editable: false },
+  { key: 'active', label: t('shared.labels.active'), editable: false, initialWidth: 60 },
+  { key: 'eanCode', label: t('products.eanCodes.labels.eanCode'), editable: true, initialWidth: 360 },
+]);
+
+const columns = computed<MatrixColumn[]>(() => baseColumns.value);
+const hasProductIds = computed(() => props.productIds.length > 0);
+const isAlias = computed(() => props.product?.type === ProductType.Alias);
+const parentProduct = computed(() => {
+  if (!props.product) {
+    return null;
+  }
+  return isAlias.value ? props.product.aliasParentProduct : props.product;
+});
+const parentProductType = computed(() => parentProduct.value?.type ?? null);
+
+const cloneRows = (rows: VariationEanRow[]) => JSON.parse(JSON.stringify(rows));
+
+const serializeRows = (rows: VariationEanRow[]) =>
+  JSON.stringify(
+    rows.map((row) => ({
+      id: row.id,
+      currentEan: row.currentEan,
+      draftEan: row.draftEan.trim(),
+      pendingAction: row.pendingAction,
+    }))
+  );
+
+const hasChanges = computed(() => serializeRows(variations.value) !== serializeRows(originalVariations.value));
+const hasUnsavedChanges = hasChanges;
+
+const copyValueToClipboard = async (value: string) => {
+  try {
+    await navigator.clipboard.writeText(value);
+    Toast.success(t('shared.alert.toast.clipboardSuccess'));
+  } catch (error) {
+    Toast.error(t('shared.alert.toast.clipboardFail'));
+  }
+};
+
+const clearValidationTimer = (rowId: string) => {
+  const timer = validationTimers.get(rowId);
+  if (timer) {
+    window.clearTimeout(timer);
+    validationTimers.delete(rowId);
+  }
+};
+
+const clearAllValidationTimers = () => {
+  validationTimers.forEach((timer) => window.clearTimeout(timer));
+  validationTimers.clear();
+};
+
+const findOriginalRow = (rowId: string) => originalVariations.value.find((row) => row.id === rowId) ?? null;
+const getOriginalDraft = (rowId: string) => findOriginalRow(rowId)?.draftEan.trim() ?? '';
+
+const isValidEan13 = (ean: string): boolean => {
+  if (!/^\d{13}$/.test(ean)) {
+    return false;
+  }
+
+  const digits = ean.split('').map(Number);
+  const checkDigit = digits.pop();
+  const sum = digits.reduce((acc, digit, idx) => acc + digit * (idx % 2 === 0 ? 1 : 3), 0);
+  const calculatedCheck = (10 - (sum % 10)) % 10;
+
+  return calculatedCheck === checkDigit;
+};
+
+const scheduleValidation = (rowId: string) => {
+  clearValidationTimer(rowId);
+  const row = variations.value.find((item) => item.id === rowId);
+  if (!row) {
+    return;
+  }
+
+  const trimmed = row.draftEan.trim();
+  if (!trimmed || trimmed === getOriginalDraft(rowId)) {
+    row.validationState = 'idle';
+    return;
+  }
+
+  const timer = window.setTimeout(() => {
+    const currentRow = variations.value.find((item) => item.id === rowId);
+    if (!currentRow) {
+      return;
+    }
+    currentRow.validationState = isValidEan13(trimmed) ? 'valid' : 'invalid';
+    validationTimers.delete(rowId);
+  }, 250);
+
+  validationTimers.set(rowId, timer);
+};
+
+const isConfigurableRow = (row: VariationEanRow) => row.variation.type === ProductType.Configurable;
+
+const createEmptyEanInfo = (): EanCodeInfo => ({
+  id: null,
+  ean: '',
+  internal: null,
+  alreadyUsed: null,
+});
+
+const createRow = (product: any, eanCode?: any): VariationEanRow => ({
+  id: product.id,
+  variation: {
+    id: product.id,
+    sku: product.sku,
+    name: product.name,
+    active: product.active,
+    type: product.type ?? null,
+  },
+  currentEan: eanCode
+    ? {
+        id: eanCode.id ?? null,
+        ean: eanCode.eanCode ?? '',
+        internal: eanCode.internal ?? null,
+        alreadyUsed: eanCode.alreadyUsed ?? null,
+      }
+    : createEmptyEanInfo(),
+  draftEan: eanCode?.eanCode ?? '',
+  pendingAction: 'none',
+  validationState: 'idle',
+  errorMessage: '',
+});
+
+const fetchVariationProducts = async (policy: FetchPolicy = 'cache-first') => {
+  if (!parentProduct.value || !parentProductType.value) {
+    return [];
+  }
+
+  const isBundle = parentProductType.value === ProductType.Bundle;
+  const query = isBundle ? bundleVariationsQuery : configurableVariationsQuery;
+  const key = isBundle ? 'bundleVariations' : 'configurableVariations';
+  const pageSize = 100;
+  let after: string | null = null;
+  const products: any[] = [];
+  let hasNextPage = true;
+
+  while (hasNextPage) {
+    const { data } = await apolloClient.query({
+      query,
+      variables: {
+        first: pageSize,
+        after,
+        filter: { parent: { id: { exact: parentProduct.value.id } } },
+      },
+      fetchPolicy: policy,
+    });
+
+    const connection = data?.[key];
+    if (!connection) {
+      break;
+    }
+
+    const edges = connection.edges ?? [];
+    edges.forEach((edge: any) => {
+      if (edge?.node?.variation) {
+        products.push(edge.node.variation);
+      }
+    });
+
+    hasNextPage = connection.pageInfo?.hasNextPage ?? false;
+    after = connection.pageInfo?.endCursor ?? null;
+    if (!after) {
+      break;
+    }
+  }
+
+  return products;
+};
+
+const fetchProducts = async (policy: FetchPolicy = 'cache-first') => {
+  const ids = props.productIds.filter(Boolean);
+  if (!ids.length) {
+    return [];
+  }
+
+  const pageSize = 100;
+  let after: string | null = null;
+  const products: any[] = [];
+  let hasNextPage = true;
+
+  while (hasNextPage) {
+    const { data } = await apolloClient.query({
+      query: productsWithEanCodesQuery,
+      variables: {
+        first: pageSize,
+        after,
+        filter: { id: { inList: ids } },
+      },
+      fetchPolicy: policy,
+    });
+
+    const connection = data?.products;
+    if (!connection) {
+      break;
+    }
+
+    const edges = connection.edges ?? [];
+    edges.forEach((edge: any) => {
+      if (edge?.node) {
+        products.push(edge.node);
+      }
+    });
+
+    hasNextPage = connection.pageInfo?.hasNextPage ?? false;
+    after = connection.pageInfo?.endCursor ?? null;
+    if (!after) {
+      break;
+    }
+  }
+
+  return products;
+};
+
+const fetchEanCodeMap = async (productIds: string[], policy: FetchPolicy = 'cache-first') => {
+  if (!productIds.length) {
+    return new Map<string, any>();
+  }
+
+  const pageSize = 100;
+  let after: string | null = null;
+  let hasNextPage = true;
+  const eanMap = new Map<string, any>();
+
+  while (hasNextPage) {
+    const { data } = await apolloClient.query({
+      query: eanCodesQuery,
+      variables: {
+        first: pageSize,
+        after,
+        filter: { product: { id: { inList: productIds } } },
+      },
+      fetchPolicy: policy,
+    });
+
+    const connection = data?.eanCodes;
+    if (!connection) {
+      break;
+    }
+
+    const edges = connection.edges ?? [];
+    edges.forEach((edge: any) => {
+      const node = edge?.node;
+      const productId = node?.product?.id;
+      if (node && productId && !eanMap.has(productId)) {
+        eanMap.set(productId, node);
+      }
+    });
+
+    hasNextPage = connection.pageInfo?.hasNextPage ?? false;
+    after = connection.pageInfo?.endCursor ?? null;
+    if (!after) {
+      break;
+    }
+  }
+
+  return eanMap;
+};
+
+const mergeFailedRows = (serverRows: VariationEanRow[], failedRows: Map<string, VariationEanRow>) =>
+  serverRows.map((row) => {
+    const failedRow = failedRows.get(row.id);
+    if (!failedRow) {
+      return row;
+    }
+
+    return {
+      ...row,
+      draftEan: failedRow.draftEan,
+      pendingAction: failedRow.pendingAction,
+      validationState: failedRow.validationState,
+      errorMessage: failedRow.errorMessage,
+    };
+  });
+
+const loadData = async (policy: FetchPolicy = 'cache-first', failedRows: Map<string, VariationEanRow> = new Map()) => {
+  loading.value = true;
+  clearAllValidationTimers();
+
+  try {
+    const products = hasProductIds.value
+      ? await fetchProducts(policy)
+      : await fetchVariationProducts(policy);
+
+    const eanMap = await fetchEanCodeMap(
+      products.map((product: any) => product.id).filter(Boolean),
+      policy
+    );
+
+    const rows = products.map((product: any) => createRow(product, eanMap.get(product.id)));
+    const mergedRows = mergeFailedRows(rows, failedRows);
+
+    originalVariations.value = cloneRows(rows);
+    variations.value = cloneRows(mergedRows);
+    matrixRef.value?.resetHistory(variations.value);
+  } finally {
+    loading.value = false;
+  }
+};
+
+const getMatrixCellValue = (rowIndex: number, columnKey: string) => {
+  const row = variations.value[rowIndex];
+  if (!row) {
+    return '';
+  }
+
+  if (columnKey === 'sku') {
+    return row.variation.sku;
+  }
+  if (columnKey === 'name') {
+    return row.variation.name;
+  }
+  if (columnKey === 'active') {
+    return row.variation.active ? t('shared.labels.yes') : t('shared.labels.no');
+  }
+  if (columnKey === 'eanCode') {
+    return row.draftEan;
+  }
+
+  return '';
+};
+
+const setMatrixCellValue = (rowIndex: number, columnKey: string, value: any) => {
+  if (columnKey !== 'eanCode') {
+    return;
+  }
+
+  updateDraft(rowIndex, String(value ?? ''));
+};
+
+const cloneMatrixCellValue = () => {};
+const clearMatrixCellValue = () => {};
+
+const getInputClasses = (row: VariationEanRow) => {
+  if (row.validationState === 'invalid') {
+    return 'border border-red-400 focus:border-red-400 focus:ring-red-400';
+  }
+  if (row.validationState === 'valid') {
+    return 'border border-emerald-400 focus:border-emerald-400 focus:ring-emerald-400';
+  }
+  return 'border border-gray-300 focus:border-sky-500 focus:ring-sky-500';
+};
+
+const updateDraft = (rowIndex: number, value: string) => {
+  const row = variations.value[rowIndex];
+  if (!row || isConfigurableRow(row)) {
+    return;
+  }
+
+  row.draftEan = value;
+  row.errorMessage = '';
+  if (row.pendingAction !== 'none') {
+    row.pendingAction = 'none';
+  }
+  scheduleValidation(row.id);
+};
+
+const scheduleAssign = (rowIndex: number) => {
+  const row = variations.value[rowIndex];
+  if (!row || isConfigurableRow(row)) {
+    return;
+  }
+
+  row.pendingAction = row.pendingAction === 'assign' ? 'none' : 'assign';
+  row.draftEan = row.pendingAction === 'assign' ? '' : row.currentEan.ean;
+  row.validationState = 'idle';
+  row.errorMessage = '';
+  clearValidationTimer(row.id);
+};
+
+const scheduleRelease = (rowIndex: number) => {
+  const row = variations.value[rowIndex];
+  if (!row || isConfigurableRow(row)) {
+    return;
+  }
+
+  row.pendingAction = row.pendingAction === 'release' ? 'none' : 'release';
+  row.errorMessage = '';
+};
+
+const scheduleDelete = (rowIndex: number) => {
+  const row = variations.value[rowIndex];
+  if (!row || isConfigurableRow(row)) {
+    return;
+  }
+
+  row.pendingAction = row.pendingAction === 'delete' ? 'none' : 'delete';
+  row.errorMessage = '';
+};
+
+const buildExternalEanCodeInput = (productId: string, value: string) => ({
+  eanCode: value,
+  product: { id: productId },
+  internal: false,
+  alreadyUsed: true,
+});
+
+const createExternalEanCode = async (productId: string, value: string) => {
+  return apolloClient.mutate({
+    mutation: createEanCodeMutation,
+    variables: { data: buildExternalEanCodeInput(productId, value) },
+  });
+};
+
+const updateExternalEanCode = async (id: string, value: string) => {
+  return apolloClient.mutate({
+    mutation: updateEanCodeMutation,
+    variables: {
+      data: {
+        id,
+        eanCode: value,
+        internal: false,
+        alreadyUsed: true,
+      },
+    },
+  });
+};
+
+const deleteAssignedEanCode = async (id: string) => {
+  return apolloClient.mutate({
+    mutation: deleteEanCodeMutation,
+    variables: { id },
+  });
+};
+
+const releaseAssignedEanCode = async (id: string) => {
+  return apolloClient.mutate({
+    mutation: releaseEanCodeMutation,
+    variables: { data: { id } },
+  });
+};
+
+const assignInternalEanCode = async (productId: string) => {
+  return apolloClient.mutate({
+    mutation: assignEanCodeMutation,
+    variables: { data: { product: { id: productId } } },
+  });
+};
+
+const manualAssignInternalEanCode = async (productId: string, eanCodeId: string) => {
+  return apolloClient.mutate({
+    mutation: manualAssignEanCodeMutation,
+    variables: {
+      data: {
+        product: { id: productId },
+        eanCode: { id: eanCodeId }
+      }
+    },
+  });
+};
+
+const fetchMatchingEanCode = async (value: string): Promise<ExistingEanCodeNode | null> => {
+  const { data } = await apolloClient.query({
+    query: eanCodesQuery,
+    variables: {
+      first: 1,
+      filter: {
+        eanCode: { exact: value }
+      }
+    },
+    fetchPolicy: 'network-only'
+  });
+
+  return data?.eanCodes?.edges?.[0]?.node ?? null;
+};
+
+const isReclaimableEanCode = (existingEanCode: ExistingEanCodeNode | null): existingEanCode is ExistingEanCodeNode =>
+  Boolean(
+    existingEanCode &&
+    existingEanCode.internal &&
+    existingEanCode.alreadyUsed === false &&
+    !existingEanCode.product?.id
+  );
+
+const getGraphQLErrorMessages = (error: unknown): string[] => {
+  if (!error || typeof error !== 'object' || !('graphQLErrors' in error)) {
+    return [];
+  }
+
+  const graphQLErrors = (error as { graphQLErrors?: Array<{ message?: string }> }).graphQLErrors;
+  if (!Array.isArray(graphQLErrors)) {
+    return [];
+  }
+
+  return graphQLErrors
+    .map((graphQLError) => graphQLError?.message)
+    .filter((message): message is string => Boolean(message));
+};
+
+const getErrorMessage = (error: unknown) => {
+  const validationErrors = processGraphQLErrors(error, t);
+  const messages = Object.values(validationErrors).filter(Boolean);
+  if (messages.length) {
+    return String(messages[0]);
+  }
+  if (error instanceof Error && error.message) {
+    return error.message;
+  }
+  return t('shared.alert.toast.unexpectedResult');
+};
+
+const isDuplicateEanError = (error: unknown) => {
+  const validationMessages = Object.values(processGraphQLErrors(error, t)).map((message) => String(message));
+  const messages = [...getGraphQLErrorMessages(error), ...validationMessages];
+
+  return messages.some((message) => /ean code/i.test(message) && /already exists/i.test(message));
+};
+
+const tryMatchExistingEanCode = async (
+  productId: string,
+  value: string,
+  previousExternalId: string | null,
+  previousExternalEan: string
+) => {
+  const existingEanCode = await fetchMatchingEanCode(value);
+
+  if (!isReclaimableEanCode(existingEanCode)) {
+    throw new Error(t('products.eanCodes.messages.matchExistingBlocked'));
+  }
+
+  if (previousExternalId) {
+    await deleteAssignedEanCode(previousExternalId);
+  }
+
+  try {
+    await manualAssignInternalEanCode(productId, existingEanCode.id);
+  } catch (error) {
+    if (previousExternalId && previousExternalEan) {
+      try {
+        await createExternalEanCode(productId, previousExternalEan);
+      } catch (rollbackError) {
+        console.error('Failed to restore previous external EAN code.', rollbackError);
+      }
+    }
+    throw error;
+  }
+};
+
+const getRowOperation = (row: VariationEanRow, original: VariationEanRow | null): SaveOperation => {
+  if (row.pendingAction !== 'none') {
+    return row.pendingAction;
+  }
+
+  const trimmedDraft = row.draftEan.trim();
+  const originalDraft = original?.draftEan.trim() ?? '';
+
+  if (!row.currentEan.id && trimmedDraft) {
+    return 'create';
+  }
+
+  if (row.currentEan.id && row.currentEan.internal === false && trimmedDraft && trimmedDraft !== originalDraft) {
+    return 'update';
+  }
+
+  return null;
+};
+
+const performOperation = async (row: VariationEanRow, original: VariationEanRow | null) => {
+  const operation = getRowOperation(row, original);
+  if (!operation) {
+    return false;
+  }
+
+  const productId = row.variation.id;
+  const trimmedDraft = row.draftEan.trim();
+
+  if (operation === 'assign') {
+    await assignInternalEanCode(productId);
+    return true;
+  }
+
+  if (operation === 'release') {
+    if (!row.currentEan.id) {
+      return false;
+    }
+    await releaseAssignedEanCode(row.currentEan.id);
+    return true;
+  }
+
+  if (operation === 'delete') {
+    if (!row.currentEan.id) {
+      return false;
+    }
+    await deleteAssignedEanCode(row.currentEan.id);
+    return true;
+  }
+
+  if (operation === 'create') {
+    try {
+      await createExternalEanCode(productId, trimmedDraft);
+    } catch (error) {
+      if (!isDuplicateEanError(error)) {
+        throw error;
+      }
+      await tryMatchExistingEanCode(productId, trimmedDraft, null, '');
+    }
+    return true;
+  }
+
+  if (operation === 'update') {
+    if (!row.currentEan.id) {
+      return false;
+    }
+
+    try {
+      await updateExternalEanCode(row.currentEan.id, trimmedDraft);
+    } catch (error) {
+      if (!isDuplicateEanError(error)) {
+        throw error;
+      }
+      await tryMatchExistingEanCode(
+        productId,
+        trimmedDraft,
+        row.currentEan.id,
+        original?.currentEan.ean ?? row.currentEan.ean
+      );
+    }
+    return true;
+  }
+
+  return false;
+};
+
+const save = async () => {
+  if (!hasChanges.value) {
+    return;
+  }
+
+  saving.value = true;
+  clearAllValidationTimers();
+
+  const failedRows = new Map<string, VariationEanRow>();
+  let successCount = 0;
+  let attemptedCount = 0;
+
+  try {
+    const originalMap = new Map<string, VariationEanRow>();
+    originalVariations.value.forEach((row) => {
+      originalMap.set(row.id, row);
+    });
+
+    for (const row of variations.value) {
+      row.errorMessage = '';
+      const original = originalMap.get(row.id) ?? null;
+      const operation = getRowOperation(row, original);
+
+      if (!operation || isConfigurableRow(row)) {
+        continue;
+      }
+
+      attemptedCount += 1;
+
+      try {
+        const changed = await performOperation(row, original);
+        if (changed) {
+          successCount += 1;
+        }
+      } catch (error) {
+        row.errorMessage = getErrorMessage(error);
+        failedRows.set(row.id, JSON.parse(JSON.stringify(row)));
+      }
+    }
+
+    if (!attemptedCount) {
+      await loadData('network-only');
+      return;
+    }
+
+    await loadData('network-only', failedRows);
+
+    if (successCount) {
+      Toast.success(
+        t('products.products.variations.eanCodes.toast.saved', { count: successCount })
+      );
+    }
+
+    if (failedRows.size) {
+      Toast.warning(
+        t('products.products.variations.eanCodes.toast.failed', { count: failedRows.size })
+      );
+    }
+  } finally {
+    saving.value = false;
+  }
+};
+
+watch(
+  () => [props.product?.id ?? null, props.productIds.join(',')],
+  () => {
+    loadData();
+  },
+  { immediate: true }
+);
+
+onBeforeUnmount(() => {
+  clearAllValidationTimers();
+});
+
+defineExpose({ save, hasUnsavedChanges });
+</script>
+
+<template>
+  <div class="relative w-full min-w-0">
+    <MatrixEditor
+      ref="matrixRef"
+      v-model:rows="variations"
+      :columns="columns"
+      :loading="loading"
+      :saving="saving"
+      :has-changes="hasChanges"
+      :enable-cell-clipboard="false"
+      :enable-row-clipboard="false"
+      :enable-drag-fill="false"
+      row-key="id"
+      :get-cell-value="getMatrixCellValue"
+      :set-cell-value="setMatrixCellValue"
+      :clone-cell-value="cloneMatrixCellValue"
+      :clear-cell-value="clearMatrixCellValue"
+      @save="save"
+    >
+      <template #cell="{ row, column, rowIndex }">
+        <template v-if="column.key === 'name'">
+          <Link
+            :path="{ name: 'products.products.show', params: { id: row.variation.id }, query: { tab: 'general' } }"
+            target="_blank"
+          >
+            <span class="block truncate" :title="row.variation.name">
+              {{ shortenText(row.variation.name, 32) }}
+            </span>
+          </Link>
+        </template>
+        <template v-else-if="column.key === 'sku'">
+          <div class="flex items-center gap-1">
+            <span class="block truncate" :title="row.variation.sku">
+              {{ row.variation.sku }}
+            </span>
+            <Button class="p-0" @click="copyValueToClipboard(row.variation.sku)">
+              <Icon name="clipboard" class="h-4 w-4 text-gray-500" aria-hidden="true" />
+            </Button>
+          </div>
+        </template>
+        <template v-else-if="column.key === 'active'">
+          <Icon v-if="row.variation.active" name="check-circle" class="text-green-500" />
+          <Icon v-else name="times-circle" class="text-red-500" />
+        </template>
+        <template v-else-if="column.key === 'eanCode'">
+          <div class="min-w-[320px] py-1">
+            <template v-if="isConfigurableRow(row)">
+              <span class="text-xs text-gray-400">
+                {{ t('products.products.variations.eanCodes.labels.disabledForConfigurable') }}
+              </span>
+            </template>
+
+            <template v-else-if="row.pendingAction === 'assign'">
+              <div class="rounded-md border border-amber-200 bg-amber-50 px-3 py-2 text-sm text-amber-800">
+                {{ t('products.products.variations.eanCodes.status.toBeAssigned') }}
+              </div>
+            </template>
+
+            <template v-else-if="row.pendingAction === 'release'">
+              <div class="space-y-2">
+                <div class="flex items-center gap-2">
+                  <span class="block truncate font-medium text-gray-900" :title="row.currentEan.ean">
+                    {{ row.currentEan.ean }}
+                  </span>
+                  <Button class="p-0" @click="copyValueToClipboard(row.currentEan.ean)">
+                    <Icon name="clipboard" class="h-4 w-4 text-gray-500" aria-hidden="true" />
+                  </Button>
+                </div>
+                <span class="inline-flex rounded-full bg-amber-100 px-2 py-1 text-xs font-medium text-amber-800">
+                  {{ t('products.products.variations.eanCodes.status.toBeReleased') }}
+                </span>
+              </div>
+            </template>
+
+            <template v-else-if="row.pendingAction === 'delete'">
+              <div class="space-y-2">
+                <span class="block truncate text-gray-500 line-through" :title="row.currentEan.ean">
+                  {{ row.currentEan.ean }}
+                </span>
+                <span class="inline-flex rounded-full bg-amber-100 px-2 py-1 text-xs font-medium text-amber-800">
+                  {{ t('products.products.variations.eanCodes.status.toBeDeleted') }}
+                </span>
+              </div>
+            </template>
+
+            <template v-else-if="row.currentEan.internal">
+              <div class="space-y-2">
+                <div class="flex items-center gap-2">
+                  <span class="block truncate font-medium text-gray-900" :title="row.currentEan.ean">
+                    {{ row.currentEan.ean }}
+                  </span>
+                  <Button class="p-0" @click="copyValueToClipboard(row.currentEan.ean)">
+                    <Icon name="clipboard" class="h-4 w-4 text-gray-500" aria-hidden="true" />
+                  </Button>
+                </div>
+                <Button class="btn btn-outline-danger btn-sm" @click="scheduleRelease(rowIndex)">
+                  {{ t('products.eanCodes.assign.button.release') }}
+                </Button>
+              </div>
+            </template>
+
+            <template v-else>
+              <div class="space-y-2">
+                <input
+                  :value="row.draftEan"
+                  type="text"
+                  :placeholder="t('products.eanCodes.placeholders.externalEanCode')"
+                  class="w-full rounded-md px-3 py-2 text-sm text-gray-900 focus:outline-none focus:ring-1"
+                  :class="getInputClasses(row)"
+                  :disabled="saving"
+                  @input="(event) => updateDraft(rowIndex, (event.target as HTMLInputElement).value)"
+                />
+                <div class="flex flex-wrap items-center gap-2">
+                  <Button
+                    v-if="!row.currentEan.id"
+                    class="btn btn-outline-primary btn-sm"
+                    :disabled="saving"
+                    @click="scheduleAssign(rowIndex)"
+                  >
+                    {{ t('products.eanCodes.assign.button.assign') }}
+                  </Button>
+                  <Button
+                    v-if="row.currentEan.id && row.currentEan.internal === false"
+                    class="btn btn-outline-danger btn-sm"
+                    :disabled="saving"
+                    @click="scheduleDelete(rowIndex)"
+                  >
+                    {{ t('shared.button.delete') }}
+                  </Button>
+                  <span
+                    v-if="!row.currentEan.id && row.draftEan.trim()"
+                    class="text-xs text-gray-500"
+                  >
+                    {{ t('products.products.variations.eanCodes.status.willCreate') }}
+                  </span>
+                  <span
+                    v-if="row.currentEan.id && row.currentEan.internal === false && row.draftEan.trim() && row.draftEan.trim() !== row.currentEan.ean"
+                    class="text-xs text-gray-500"
+                  >
+                    {{ t('products.products.variations.eanCodes.status.willUpdate') }}
+                  </span>
+                </div>
+              </div>
+            </template>
+
+            <p v-if="row.errorMessage" class="mt-2 text-xs text-danger">
+              {{ row.errorMessage }}
+            </p>
+          </div>
+        </template>
+      </template>
+    </MatrixEditor>
+  </div>
+</template>
diff --git a/src/core/products/products/product-show/containers/tabs/variations/containers/variations-ebay-bulk-edit/VariationsEbayBulkEdit.vue b/src/core/products/products/product-show/containers/tabs/variations/containers/variations-ebay-bulk-edit/VariationsEbayBulkEdit.vue
index 5d6f2634..fa37c595 100644
--- a/src/core/products/products/product-show/containers/tabs/variations/containers/variations-ebay-bulk-edit/VariationsEbayBulkEdit.vue
+++ b/src/core/products/products/product-show/containers/tabs/variations/containers/variations-ebay-bulk-edit/VariationsEbayBulkEdit.vue
@@ -1841,7 +1841,7 @@ defineExpose({ hasUnsavedChanges });
     </MatrixEditor>
 
     <Modal v-model="selectionModal.visible" @closed="closeSelectionModal">
-      <Card class="modal-content w-11/12 max-w-6xl max-h-[85vh] flex flex-col min-h-0 overflow-hidden">
+      <Card class="modal-content w-[90vw] max-w-[90vw] max-h-[85vh] flex flex-col min-h-0 overflow-hidden">
         <div class="mb-4">
           <h3 class="text-xl font-semibold">
             {{ t('products.products.variations.ebay.modal.title') }}
@@ -1952,7 +1952,7 @@ defineExpose({ hasUnsavedChanges });
     </Modal>
 
     <Modal v-model="storeSelectionModal.visible" @closed="closeStoreSelectionModal">
-      <Card class="modal-content w-11/12 max-w-6xl max-h-[85vh] flex flex-col min-h-0 overflow-hidden">
+      <Card class="modal-content w-[90vw] max-w-[90vw] max-h-[85vh] flex flex-col min-h-0 overflow-hidden">
         <div class="mb-4">
           <h3 class="text-xl font-semibold">
             {{ t('products.products.variations.ebay.modal.storeTitle') }}
diff --git a/src/core/products/products/product-show/containers/tabs/variations/containers/variations-mirakl-bulk-edit/VariationsMiraklBulkEdit.vue b/src/core/products/products/product-show/containers/tabs/variations/containers/variations-mirakl-bulk-edit/VariationsMiraklBulkEdit.vue
new file mode 100644
index 00000000..71addcdc
--- /dev/null
+++ b/src/core/products/products/product-show/containers/tabs/variations/containers/variations-mirakl-bulk-edit/VariationsMiraklBulkEdit.vue
@@ -0,0 +1,1060 @@
+<script setup lang="ts">
+import { computed, onMounted, reactive, ref, watch, withDefaults } from 'vue';
+import type { FetchPolicy } from '@apollo/client';
+import { useI18n } from 'vue-i18n';
+import MatrixEditor from '../../../../../../../../../shared/components/organisms/matrix-editor/MatrixEditor.vue';
+import type { MatrixColumn, MatrixEditorExpose } from '../../../../../../../../../shared/components/organisms/matrix-editor/types';
+import { Product } from '../../../../../../configs';
+import { ProductType } from '../../../../../../../../../shared/utils/constants';
+import apolloClient from '../../../../../../../../../../apollo-client';
+import { Button } from '../../../../../../../../../shared/components/atoms/button';
+import { Card } from '../../../../../../../../../shared/components/atoms/card';
+import { Icon } from '../../../../../../../../../shared/components/atoms/icon';
+import { Modal } from '../../../../../../../../../shared/components/atoms/modal';
+import { Link } from '../../../../../../../../../shared/components/atoms/link';
+import { Selector } from '../../../../../../../../../shared/components/atoms/selector';
+import { Toast } from '../../../../../../../../../shared/modules/toast';
+import { displayApolloError, shortenText } from '../../../../../../../../../shared/utils';
+import {
+  bundleVariationsWithMiraklQuery,
+  configurableVariationsWithMiraklQuery,
+  productsWithMiraklQuery,
+} from '../../../../../../../../../shared/api/queries/products.js';
+import { propertiesQuerySelector, productTypePropertyValuesQuery } from '../../../../../../../../../shared/api/queries/properties.js';
+import { miraklCategoriesQuery, miraklProductCategoriesQuery } from '../../../../../../../../../shared/api/queries/miraklProducts.js';
+import { miraklChannelsQuery } from '../../../../../../../../../shared/api/queries/salesChannels.js';
+import {
+  createMiraklProductCategoryMutation,
+  deleteMiraklProductCategoryMutation,
+  updateMiraklProductCategoryMutation,
+} from '../../../../../../../../../shared/api/mutations/miraklProducts.js';
+import MiraklCategoryBrowser from '../../../mirakl/components/MiraklCategoryBrowser.vue';
+import MiraklCategoryDetails from '../../../mirakl/components/MiraklCategoryDetails.vue';
+import {
+  mapMiraklCategoriesConnection,
+  normalizeMiraklCategoryNode,
+  type MiraklCategoryNode,
+} from '../../../mirakl/components/miraklCategoryUtils';
+
+interface CategorySelection {
+  productCategoryId: string | null;
+  remoteId: string | null;
+  path: string | null;
+}
+
+interface VariationRow {
+  id: string;
+  variation: {
+    id: string;
+    sku: string;
+    name: string;
+    active: boolean;
+  };
+  categories: Record<string, CategorySelection>;
+  productRuleValue: string | null;
+}
+
+const props = withDefaults(
+  defineProps<{ product?: Product | null; productIds?: string[] }>(),
+  { product: null, productIds: () => [] },
+);
+
+const { t } = useI18n();
+
+const productRuleColumnKey = 'productRule';
+const categoryColumnKey = 'category';
+
+const matrixRef = ref<MatrixEditorExpose | null>(null);
+const variations = ref<VariationRow[]>([]);
+const originalVariations = ref<VariationRow[]>([]);
+const loading = ref(false);
+const saving = ref(false);
+const categoryMapByChannel = ref<Record<string, Record<string, MiraklCategoryNode>>>({});
+const productTypePropertyId = ref<string | null>(null);
+const productTypePropertyName = ref<string | null>(null);
+
+const miraklChannels = ref<any[]>([]);
+const selectedChannelId = ref<string | null>(null);
+
+const selectionModal = reactive({
+  visible: false,
+  rowIndex: -1,
+  channelId: null as string | null,
+});
+const modalSelection = ref<MiraklCategoryNode | null>(null);
+const modalSelectionPath = ref<string | null>(null);
+
+const previewVisible = ref(false);
+const previewNode = ref<MiraklCategoryNode | null>(null);
+const previewRow = ref<VariationRow | null>(null);
+const previewChannelId = ref<string | null>(null);
+
+const hasProductIds = computed(() => props.productIds.length > 0);
+const isAlias = computed(() => props.product?.type === ProductType.Alias);
+const parentProduct = computed(() => {
+  if (!props.product) {
+    return null;
+  }
+  return isAlias.value ? props.product.aliasParentProduct : props.product;
+});
+const parentProductType = computed(() => parentProduct.value?.type ?? null);
+
+const channelById = computed(() =>
+  miraklChannels.value.reduce<Record<string, any>>((acc, channel) => {
+    acc[channel.id] = channel;
+    return acc;
+  }, {}),
+);
+
+const channelIdAliasMap = computed(() =>
+  miraklChannels.value.reduce<Record<string, string>>((acc, channel) => {
+    if (channel?.id) {
+      acc[channel.id] = channel.id;
+    }
+    if (channel?.saleschannelPtr?.id) {
+      acc[channel.saleschannelPtr.id] = channel.id;
+    }
+    return acc;
+  }, {}),
+);
+
+const selectionModalChannel = computed(() =>
+  selectionModal.channelId ? channelById.value[selectionModal.channelId] : null,
+);
+const previewChannel = computed(() =>
+  previewChannelId.value ? channelById.value[previewChannelId.value] : null,
+);
+const selectionModalSalesChannelId = computed(() =>
+  selectionModal.channelId ? getEffectiveSalesChannelId(selectionModal.channelId) : null,
+);
+const previewSalesChannelId = computed(() =>
+  previewChannelId.value ? getEffectiveSalesChannelId(previewChannelId.value) : null,
+);
+
+const selectedChannel = computed(() =>
+  selectedChannelId.value ? channelById.value[selectedChannelId.value] || null : null,
+);
+
+const channelOptions = computed(() =>
+  miraklChannels.value.map((channel) => ({
+    id: channel.id,
+    name: channel.hostname || '-',
+  })),
+);
+
+const columns = computed<MatrixColumn[]>(() => [
+  { key: 'sku', label: t('shared.labels.sku'), sticky: true, editable: false, initialWidth: 160 },
+  {
+    key: productRuleColumnKey,
+    label: productTypePropertyName.value || t('products.products.variations.bulkEdit.labels.productRule'),
+    sticky: true,
+    editable: false,
+    initialWidth: 220,
+  },
+  { key: 'name', label: t('shared.labels.name'), editable: false, initialWidth: 280 },
+  { key: 'active', label: t('shared.labels.active'), editable: false, initialWidth: 80 },
+  {
+    key: categoryColumnKey,
+    label: selectedChannel.value?.hostname || t('products.products.variations.mirakl.columns.category'),
+    editable: true,
+    initialWidth: 600,
+    valueType: 'mirakl-category',
+  },
+]);
+
+const hasChanges = computed(() => {
+  if (variations.value.length !== originalVariations.value.length) {
+    return true;
+  }
+  const originalMap = new Map<string, VariationRow>();
+  originalVariations.value.forEach((row) => {
+    originalMap.set(row.id, row);
+  });
+  return variations.value.some((row) => {
+    const original = originalMap.get(row.id);
+    if (!original) return true;
+    return miraklChannels.value.some((channel) => {
+      const channelId = channel.id;
+      const currentRemoteId = row.categories[channelId]?.remoteId ?? null;
+      const originalRemoteId = original.categories[channelId]?.remoteId ?? null;
+      return currentRemoteId !== originalRemoteId;
+    });
+  });
+});
+
+const hasUnsavedChanges = hasChanges;
+
+const createEmptyCategory = (): CategorySelection => ({
+  productCategoryId: null,
+  remoteId: null,
+  path: null,
+});
+
+const ensureCategorySelection = (row: VariationRow, channelId: string) => {
+  if (!row.categories[channelId]) {
+    row.categories[channelId] = createEmptyCategory();
+  }
+  return row.categories[channelId];
+};
+
+const resolveDisplayChannelId = (salesChannelId: string | null | undefined) =>
+  salesChannelId ? channelIdAliasMap.value[salesChannelId] || null : null;
+
+const getEffectiveSalesChannelId = (channelId: string) =>
+  channelById.value[channelId]?.saleschannelPtr?.id || channelId;
+
+const getCategorySelection = (row: VariationRow, channelId: string | null = selectedChannelId.value) => {
+  if (!channelId) return null;
+  return row.categories[channelId] || null;
+};
+
+const getCategoryDisplayPath = (row: VariationRow, channelId: string | null = selectedChannelId.value) => {
+  if (!channelId) return null;
+  const selection = row.categories[channelId];
+  if (!selection?.remoteId) return null;
+  return selection.path || buildCategoryPath(selection.remoteId, channelId) || selection.remoteId;
+};
+
+const copySkuToClipboard = async (sku: string) => {
+  try {
+    await navigator.clipboard.writeText(sku);
+    Toast.success(t('shared.alert.toast.clipboardSuccess'));
+  } catch (_error) {
+    Toast.error(t('shared.alert.toast.clipboardFail'));
+  }
+};
+
+const getMatrixCellValue = (rowIndex: number, columnKey: string) => {
+  const row = variations.value[rowIndex];
+  if (!row) return null;
+  if (columnKey === 'sku') return row.variation.sku;
+  if (columnKey === productRuleColumnKey) return row.productRuleValue;
+  if (columnKey === 'name') return row.variation.name;
+  if (columnKey === 'active') return row.variation.active;
+  if (columnKey !== categoryColumnKey) return null;
+  const channelId = selectedChannelId.value;
+  if (!channelId) return null;
+  const category = row.categories[channelId];
+  if (!category?.remoteId) return null;
+  return {
+    remoteId: category.remoteId,
+    path: category.path,
+  };
+};
+
+const clearCategorySelection = (row: VariationRow, channelId: string) => {
+  const category = ensureCategorySelection(row, channelId);
+  category.remoteId = null;
+  category.path = null;
+};
+
+const pendingCategoryUpdates = new Map<string, string>();
+const pendingCategoryChecks = new Map<string, Promise<void>>();
+
+const ensureCategoryForChannel = async (channelId: string, remoteId: string) => {
+  const map = categoryMapByChannel.value[channelId] || {};
+  if (map[remoteId]) return map[remoteId];
+  const key = `${channelId}:${remoteId}`;
+  if (!pendingCategoryChecks.has(key)) {
+    const request = (async () => {
+      try {
+        await ensureCategoryMapForChannel(channelId, [remoteId], 'cache-first');
+      } catch (error) {
+        displayApolloError(error);
+      }
+    })();
+    pendingCategoryChecks.set(key, request);
+  }
+  await pendingCategoryChecks.get(key);
+  pendingCategoryChecks.delete(key);
+  return categoryMapByChannel.value[channelId]?.[remoteId] || null;
+};
+
+const applyCategorySelection = (row: VariationRow, channelId: string, node: MiraklCategoryNode) => {
+  const category = ensureCategorySelection(row, channelId);
+  category.remoteId = node.remoteId;
+  category.path = buildCategoryPath(node.remoteId, channelId) || node.name || node.remoteId;
+};
+
+const validateAndApplyCategory = async (
+  rowId: string,
+  channelId: string,
+  remoteId: string,
+) => {
+  const key = `${rowId}:${channelId}`;
+  pendingCategoryUpdates.set(key, remoteId);
+  const node = await ensureCategoryForChannel(channelId, remoteId);
+  if (pendingCategoryUpdates.get(key) !== remoteId) {
+    return;
+  }
+  pendingCategoryUpdates.delete(key);
+  if (!node) {
+    Toast.error(t('products.products.mirakl.manualEntry.invalid'));
+    return;
+  }
+  const row = variations.value.find((item) => item.id === rowId);
+  if (!row) return;
+  applyCategorySelection(row, channelId, node);
+};
+
+const setMatrixCellValue = (rowIndex: number, columnKey: string, value: any) => {
+  const row = variations.value[rowIndex];
+  if (!row) return;
+  if (columnKey !== categoryColumnKey) return;
+  const channelId = selectedChannelId.value;
+  if (!channelId) return;
+
+  if (value === null || value === undefined || value === '') {
+    clearCategorySelection(row, channelId);
+    return;
+  }
+
+  const remoteId = typeof value === 'object' ? value.remoteId ?? null : value;
+  if (!remoteId) {
+    clearCategorySelection(row, channelId);
+    return;
+  }
+
+  const resolvedRemoteId = String(remoteId);
+  const node = categoryMapByChannel.value[channelId]?.[resolvedRemoteId] || null;
+  if (node) {
+    applyCategorySelection(row, channelId, node);
+    return;
+  }
+
+  void validateAndApplyCategory(row.id, channelId, resolvedRemoteId);
+};
+
+const cloneMatrixCellValue = (fromRow: number, toRow: number, columnKey: string) => {
+  const value = getMatrixCellValue(fromRow, columnKey);
+  const clonedValue = value && typeof value === 'object' ? { ...(value as Record<string, any>) } : value;
+  setMatrixCellValue(toRow, columnKey, clonedValue ?? null);
+};
+
+const clearMatrixCellValue = (rowIndex: number, columnKey: string) => {
+  const row = variations.value[rowIndex];
+  if (columnKey !== categoryColumnKey) return;
+  const channelId = selectedChannelId.value;
+  if (!row || !channelId) return;
+  clearCategorySelection(row, channelId);
+};
+
+const buildCategoryPath = (remoteId: string, channelId: string) => {
+  const map = categoryMapByChannel.value[channelId] || {};
+  const parts: string[] = [];
+  let current = map[remoteId];
+  const visited = new Set<string>();
+
+  while (current && !visited.has(current.remoteId)) {
+    parts.unshift(current.name || current.remoteId);
+    visited.add(current.remoteId);
+    const parentRemoteId = current.parent?.remoteId;
+    if (!parentRemoteId) break;
+    current = map[parentRemoteId];
+  }
+
+  return parts.length ? parts.join(' > ') : null;
+};
+
+const ensureCategoryMapForChannel = async (
+  channelId: string,
+  remoteIds: string[],
+  policy: FetchPolicy,
+) => {
+  const effectiveSalesChannelId = getEffectiveSalesChannelId(channelId);
+  if (!effectiveSalesChannelId || !remoteIds.length) return;
+
+  const map = { ...(categoryMapByChannel.value[channelId] || {}) };
+  const pending = new Set<string>(remoteIds.filter((id) => id && !map[id]));
+  const processed = new Set<string>(Object.keys(map));
+
+  while (pending.size) {
+    const batch = Array.from(pending).slice(0, 50);
+    batch.forEach((id) => pending.delete(id));
+
+    const { data } = await apolloClient.query({
+      query: miraklCategoriesQuery,
+      variables: {
+        first: batch.length,
+        filter: {
+          salesChannel: { id: { exact: effectiveSalesChannelId } },
+          remoteId: { inList: batch },
+        },
+      },
+      fetchPolicy: policy,
+    });
+
+    const nodes = mapMiraklCategoriesConnection(data?.miraklCategories);
+    nodes.forEach((node) => {
+      map[node.remoteId] = node;
+      processed.add(node.remoteId);
+    });
+    nodes.forEach((node) => {
+      const parentRemoteId = node.parent?.remoteId;
+      if (parentRemoteId && !map[parentRemoteId] && !processed.has(parentRemoteId)) {
+        pending.add(parentRemoteId);
+      }
+    });
+  }
+
+  categoryMapByChannel.value = {
+    ...categoryMapByChannel.value,
+    [channelId]: map,
+  };
+};
+
+const fetchCategoryDetails = async (
+  remoteId: string,
+  channelId: string,
+  policy: FetchPolicy,
+) => {
+  const effectiveSalesChannelId = getEffectiveSalesChannelId(channelId);
+  if (!effectiveSalesChannelId) {
+    return null;
+  }
+
+  try {
+    const { data } = await apolloClient.query({
+      query: miraklCategoriesQuery,
+      variables: {
+        first: 1,
+        filter: {
+          salesChannel: { id: { exact: effectiveSalesChannelId } },
+          remoteId: { exact: remoteId },
+        },
+      },
+      fetchPolicy: policy,
+    });
+    const node = data?.miraklCategories?.edges?.[0]?.node;
+    return node ? normalizeMiraklCategoryNode(node) : null;
+  } catch (error) {
+    displayApolloError(error);
+    return null;
+  }
+};
+
+const fetchMiraklChannels = async () => {
+  try {
+    const { data } = await apolloClient.query({
+      query: miraklChannelsQuery,
+      fetchPolicy: 'cache-first',
+    });
+    const list = data?.miraklChannels?.edges?.map((edge: any) => edge.node) || [];
+    miraklChannels.value = list.sort((a: any, b: any) => (a.hostname || '').localeCompare(b.hostname || ''));
+  } catch (error) {
+    miraklChannels.value = [];
+    displayApolloError(error);
+  }
+};
+
+const fetchVariations = async (policy: FetchPolicy = 'cache-first') => {
+  if (!parentProduct.value || !parentProductType.value) {
+    return [];
+  }
+  const isBundle = parentProductType.value === ProductType.Bundle;
+  const query = isBundle ? bundleVariationsWithMiraklQuery : configurableVariationsWithMiraklQuery;
+  const key = isBundle ? 'bundleVariations' : 'configurableVariations';
+  const pageSize = 100;
+  let after: string | null = null;
+  const nodes: any[] = [];
+  let hasNextPage = true;
+
+  while (hasNextPage) {
+    const { data } = await apolloClient.query({
+      query,
+      variables: {
+        first: pageSize,
+        after,
+        filter: { parent: { id: { exact: parentProduct.value.id } } },
+      },
+      fetchPolicy: policy,
+    });
+    const connection = data?.[key];
+    if (!connection) break;
+    const edges = connection.edges ?? [];
+    edges.forEach((edge: any) => nodes.push(edge.node));
+    hasNextPage = connection.pageInfo?.hasNextPage ?? false;
+    after = connection.pageInfo?.endCursor ?? null;
+    if (!after) break;
+  }
+
+  return nodes.map((node: any) => {
+    const variationProduct = node.variation;
+    return {
+      id: variationProduct.id,
+      variation: {
+        id: variationProduct.id,
+        sku: variationProduct.sku,
+        name: variationProduct.name,
+        active: Boolean(variationProduct.active),
+      },
+      categories: {},
+      productRuleValue: null,
+    } as VariationRow;
+  });
+};
+
+const fetchProducts = async (policy: FetchPolicy = 'cache-first') => {
+  const ids = props.productIds.filter(Boolean);
+  if (!ids.length) {
+    return [];
+  }
+  const pageSize = 100;
+  let after: string | null = null;
+  const nodes: any[] = [];
+  let hasNextPage = true;
+
+  while (hasNextPage) {
+    const { data } = await apolloClient.query({
+      query: productsWithMiraklQuery,
+      variables: {
+        first: pageSize,
+        after,
+        filter: { id: { inList: ids } },
+      },
+      fetchPolicy: policy,
+    });
+    const connection = data?.products;
+    if (!connection) break;
+    const edges = connection.edges ?? [];
+    edges.forEach((edge: any) => nodes.push(edge.node));
+    hasNextPage = connection.pageInfo?.hasNextPage ?? false;
+    after = connection.pageInfo?.endCursor ?? null;
+    if (!after) break;
+  }
+
+  return nodes.map((node: any) => ({
+    id: node.id,
+    variation: {
+      id: node.id,
+      sku: node.sku,
+      name: node.name,
+      active: Boolean(node.active),
+    },
+    categories: {},
+    productRuleValue: null,
+  })) as VariationRow[];
+};
+
+const fetchProductTypeProperty = async (policy: FetchPolicy) => {
+  if (productTypePropertyId.value) {
+    return productTypePropertyId.value;
+  }
+  try {
+    const { data } = await apolloClient.query({
+      query: propertiesQuerySelector,
+      variables: { first: 1, filter: { isProductType: { exact: true } } },
+      fetchPolicy: policy,
+    });
+    const node = data?.properties?.edges?.[0]?.node;
+    productTypePropertyId.value = node?.id ?? null;
+    productTypePropertyName.value = node?.name ?? null;
+    return productTypePropertyId.value;
+  } catch (error) {
+    displayApolloError(error);
+    productTypePropertyId.value = null;
+    productTypePropertyName.value = null;
+    return null;
+  }
+};
+
+const fetchProductTypeValues = async (productIds: string[], policy: FetchPolicy) => {
+  const valuesByProductId = new Map<string, string | null>();
+  if (!productIds.length) {
+    return valuesByProductId;
+  }
+  const propertyId = await fetchProductTypeProperty(policy);
+  if (!propertyId) {
+    return valuesByProductId;
+  }
+  const pageSize = 100;
+  let after: string | null = null;
+  let hasNextPage = true;
+
+  while (hasNextPage) {
+    const { data } = await apolloClient.query({
+      query: productTypePropertyValuesQuery,
+      variables: {
+        first: pageSize,
+        after,
+        filter: {
+          product: { id: { inList: productIds } },
+          property: { id: { exact: propertyId } },
+        },
+      },
+      fetchPolicy: policy,
+    });
+    const edges = data?.productProperties?.edges ?? [];
+    edges.forEach((edge: any) => {
+      const node = edge?.node;
+      const productId = node?.product?.id;
+      if (!productId) return;
+      valuesByProductId.set(String(productId), node?.valueSelect?.value ?? null);
+    });
+    const pageInfo = data?.productProperties?.pageInfo;
+    hasNextPage = Boolean(pageInfo?.hasNextPage && pageInfo?.endCursor);
+    after = pageInfo?.endCursor ?? null;
+  }
+
+  return valuesByProductId;
+};
+
+const fetchProductCategories = async (productIds: string[], policy: FetchPolicy) => {
+  if (!productIds.length) {
+    return new Map<string, Map<string, { id: string; remoteId: string }>>();
+  }
+
+  const { data } = await apolloClient.query({
+    query: miraklProductCategoriesQuery,
+    variables: {
+      filter: {
+        product: { id: { inList: productIds } },
+      },
+    },
+    fetchPolicy: policy,
+  });
+
+  const categoryMap = new Map<string, Map<string, { id: string; remoteId: string }>>();
+  const edges = data?.miraklProductCategories?.edges || [];
+  edges.forEach((edge: any) => {
+    const node = edge?.node;
+    const productId = node?.product?.id;
+    const rawSalesChannelId = node?.salesChannel?.id;
+    const channelId = resolveDisplayChannelId(rawSalesChannelId);
+    if (!productId || !channelId || !node?.remoteId) return;
+    const productMap = categoryMap.get(String(productId)) || new Map<string, { id: string; remoteId: string }>();
+    productMap.set(String(channelId), { id: String(node.id), remoteId: String(node.remoteId) });
+    categoryMap.set(String(productId), productMap);
+  });
+  return categoryMap;
+};
+
+const loadData = async (policy: FetchPolicy = 'cache-first') => {
+  loading.value = true;
+  try {
+    if (!miraklChannels.value.length) {
+      await fetchMiraklChannels();
+    }
+    let variationRows: VariationRow[] = [];
+    if (hasProductIds.value) {
+      variationRows = await fetchProducts(policy);
+    } else if (props.product) {
+      variationRows = await fetchVariations(policy);
+    }
+
+    const productIds = variationRows.map((row) => row.variation.id).filter(Boolean);
+    const [categoriesByProductId, productTypeValuesByProductId] = await Promise.all([
+      fetchProductCategories(productIds, policy),
+      fetchProductTypeValues(productIds, policy),
+    ]);
+    const remoteIdsByChannel: Record<string, Set<string>> = {};
+
+    categoriesByProductId.forEach((channelMap) => {
+      channelMap.forEach((entry, channelId) => {
+        if (!remoteIdsByChannel[channelId]) {
+          remoteIdsByChannel[channelId] = new Set<string>();
+        }
+        if (entry.remoteId) {
+          remoteIdsByChannel[channelId].add(entry.remoteId);
+        }
+      });
+    });
+
+    categoryMapByChannel.value = {};
+    await Promise.all(
+      Object.entries(remoteIdsByChannel).map(([channelId, ids]) =>
+        ensureCategoryMapForChannel(channelId, Array.from(ids), policy),
+      ),
+    );
+
+    const rowsWithCategories = variationRows.map((row) => {
+      const productMap = categoriesByProductId.get(row.variation.id) || new Map();
+      const categories: Record<string, CategorySelection> = {};
+      miraklChannels.value.forEach((channel) => {
+        const entry = productMap.get(channel.id) || null;
+        const remoteId = entry?.remoteId ?? null;
+        const map = categoryMapByChannel.value[channel.id] || {};
+        categories[channel.id] = {
+          productCategoryId: entry?.id ?? null,
+          remoteId,
+          path: remoteId ? buildCategoryPath(remoteId, channel.id) || map[remoteId]?.name || remoteId : null,
+        };
+      });
+      return {
+        ...row,
+        categories,
+        productRuleValue: productTypeValuesByProductId.get(row.variation.id) ?? null,
+      };
+    });
+
+    variations.value = rowsWithCategories;
+    originalVariations.value = JSON.parse(JSON.stringify(rowsWithCategories));
+    matrixRef.value?.resetHistory(rowsWithCategories);
+  } finally {
+    loading.value = false;
+  }
+};
+
+const save = async () => {
+  if (!hasChanges.value || saving.value) return;
+  if (!miraklChannels.value.length) {
+    Toast.error(t('products.products.mirakl.noChannels'));
+    return;
+  }
+  saving.value = true;
+  try {
+    const originalMap = new Map<string, VariationRow>();
+    originalVariations.value.forEach((row) => {
+      originalMap.set(row.id, row);
+    });
+
+    for (const row of variations.value) {
+      const original = originalMap.get(row.id);
+      for (const channel of miraklChannels.value) {
+        const channelId = channel.id;
+        const effectiveSalesChannelId = getEffectiveSalesChannelId(channelId);
+        const current = row.categories[channelId] || createEmptyCategory();
+        const originalCategory = original?.categories[channelId] || createEmptyCategory();
+        const currentRemoteId = current.remoteId;
+        const originalRemoteId = originalCategory.remoteId;
+        const productCategoryId = current.productCategoryId;
+        const originalCategoryId = originalCategory.productCategoryId;
+
+        if (currentRemoteId === originalRemoteId && productCategoryId === originalCategoryId) {
+          continue;
+        }
+
+        if (!currentRemoteId) {
+          if (productCategoryId) {
+            await apolloClient.mutate({
+              mutation: deleteMiraklProductCategoryMutation,
+              variables: { data: { id: productCategoryId } },
+            });
+            current.productCategoryId = null;
+          }
+          continue;
+        }
+
+        if (productCategoryId) {
+          await apolloClient.mutate({
+            mutation: updateMiraklProductCategoryMutation,
+            variables: {
+              data: {
+                id: productCategoryId,
+                remoteId: currentRemoteId,
+              },
+            },
+          });
+        } else if (effectiveSalesChannelId) {
+          const { data } = await apolloClient.mutate({
+            mutation: createMiraklProductCategoryMutation,
+            variables: {
+              data: {
+                product: { id: row.variation.id },
+                salesChannel: { id: effectiveSalesChannelId },
+                remoteId: currentRemoteId,
+              },
+            },
+          });
+          current.productCategoryId = data?.createMiraklProductCategory?.id || null;
+        }
+      }
+    }
+
+    Toast.success(t('shared.alert.toast.submitSuccessUpdate'));
+    await loadData('network-only');
+  } catch (error) {
+    displayApolloError(error);
+  } finally {
+    saving.value = false;
+  }
+};
+
+const openSelectionModal = (rowIndex: number, channelId: string | null) => {
+  if (!channelId) return;
+  modalSelection.value = null;
+  modalSelectionPath.value = null;
+  selectionModal.rowIndex = rowIndex;
+  selectionModal.channelId = channelId;
+  selectionModal.visible = true;
+};
+
+const closeSelectionModal = () => {
+  selectionModal.visible = false;
+  selectionModal.rowIndex = -1;
+  selectionModal.channelId = null;
+  modalSelection.value = null;
+  modalSelectionPath.value = null;
+};
+
+const handleModalSelection = (payload: { node: MiraklCategoryNode; path: MiraklCategoryNode[] }) => {
+  modalSelection.value = payload.node;
+  modalSelectionPath.value = payload.path.map((node) => node.name).filter(Boolean).join(' > ');
+  if (!selectionModal.channelId) return;
+  categoryMapByChannel.value = {
+    ...categoryMapByChannel.value,
+    [selectionModal.channelId]: {
+      ...(categoryMapByChannel.value[selectionModal.channelId] || {}),
+      [payload.node.remoteId]: payload.node,
+    },
+  };
+};
+
+const applyModalSelection = () => {
+  if (!modalSelection.value || selectionModal.rowIndex < 0 || !selectionModal.channelId) return;
+  const row = variations.value[selectionModal.rowIndex];
+  if (!row) return;
+  const category = ensureCategorySelection(row, selectionModal.channelId);
+  category.remoteId = modalSelection.value.remoteId;
+  category.path = modalSelectionPath.value || modalSelection.value.name;
+  closeSelectionModal();
+};
+
+const openPreview = async (rowIndex: number, channelId: string | null) => {
+  if (!channelId) return;
+  const row = variations.value[rowIndex];
+  const category = row?.categories[channelId];
+  if (!category?.remoteId) return;
+  const remoteId = category.remoteId;
+  const map = categoryMapByChannel.value[channelId] || {};
+  let node: MiraklCategoryNode | null = map[remoteId] ?? null;
+  if (!node) {
+    node = await fetchCategoryDetails(remoteId, channelId, 'cache-first');
+    if (node) {
+      categoryMapByChannel.value = {
+        ...categoryMapByChannel.value,
+        [channelId]: {
+          ...map,
+          [remoteId]: node,
+        },
+      };
+    }
+  }
+  previewRow.value = row;
+  previewNode.value = node;
+  previewChannelId.value = channelId;
+  previewVisible.value = true;
+};
+
+const closePreview = () => {
+  previewVisible.value = false;
+  previewNode.value = null;
+  previewRow.value = null;
+  previewChannelId.value = null;
+};
+
+onMounted(async () => {
+  await fetchMiraklChannels();
+  await loadData('network-only');
+});
+
+watch(
+  miraklChannels,
+  (list) => {
+    if (!list.length) {
+      selectedChannelId.value = null;
+      return;
+    }
+    if (selectedChannelId.value && list.some((channel) => channel.id === selectedChannelId.value)) {
+      return;
+    }
+    selectedChannelId.value = list[0].id;
+  },
+  { immediate: true },
+);
+
+watch(
+  () => [props.product?.id ?? null, props.productIds.join(',')],
+  async () => {
+    await loadData('network-only');
+  },
+);
+
+defineExpose({ hasUnsavedChanges });
+</script>
+
+<template>
+  <div class="relative w-full min-w-0">
+    <MatrixEditor
+      ref="matrixRef"
+      v-model:rows="variations"
+      :columns="columns"
+      :loading="loading"
+      :saving="saving"
+      :has-changes="hasChanges"
+      row-key="id"
+      :get-cell-value="getMatrixCellValue"
+      :set-cell-value="setMatrixCellValue"
+      :clone-cell-value="cloneMatrixCellValue"
+      :clear-cell-value="clearMatrixCellValue"
+      @save="save"
+    >
+      <template #filters>
+        <div class="flex flex-wrap items-center gap-3">
+          <Selector
+            v-if="channelOptions.length"
+            v-model="selectedChannelId"
+            :options="channelOptions"
+            class="w-64"
+            :placeholder="t('products.products.variations.mirakl.selectors.salesChannel')"
+            :removable="false"
+            labelBy="name"
+            valueBy="id"
+            filterable
+          />
+          <div
+            v-else
+            class="rounded border border-amber-200 bg-amber-50 px-4 py-3 text-sm text-amber-700"
+          >
+            {{ t('products.products.mirakl.noChannels') }}
+          </div>
+        </div>
+      </template>
+      <template #cell="{ row, column, rowIndex }">
+        <template v-if="column.key === productRuleColumnKey">
+          <span class="block truncate" :title="row.productRuleValue || ''">
+            {{ row.productRuleValue || '-' }}
+          </span>
+        </template>
+        <template v-else-if="column.key === 'name'">
+          <Link
+            :path="{ name: 'products.products.show', params: { id: row.variation.id }, query: { tab: 'mirakl' } }"
+            target="_blank"
+          >
+            <span class="block truncate" :title="row.variation.name">
+              {{ shortenText(row.variation.name, 32) }}
+            </span>
+          </Link>
+        </template>
+        <template v-else-if="column.key === 'sku'">
+          <div class="flex items-center gap-1">
+            <span class="block truncate" :title="row.variation.sku">
+              {{ row.variation.sku }}
+            </span>
+            <Button class="p-0" @click="copySkuToClipboard(row.variation.sku)">
+              <Icon name="clipboard" class="h-4 w-4 text-gray-500" aria-hidden="true" />
+            </Button>
+          </div>
+        </template>
+        <template v-else-if="column.key === 'active'">
+          <Icon v-if="row.variation.active" name="check-circle" class="text-green-500" />
+          <Icon v-else name="times-circle" class="text-red-500" />
+        </template>
+        <template v-else-if="column.key === categoryColumnKey">
+          <div class="flex flex-col gap-3 lg:flex-row lg:items-start lg:justify-between">
+            <div class="min-w-0">
+              <div
+                class="text-sm font-medium whitespace-normal break-words"
+                :title="getCategoryDisplayPath(row) || t('products.products.mirakl.noSelection')"
+              >
+                {{ getCategoryDisplayPath(row) || t('products.products.mirakl.noSelection') }}
+              </div>
+              <div v-if="getCategorySelection(row)?.remoteId" class="text-xs text-gray-500">
+                {{ t('products.products.variations.mirakl.labels.categoryId', { id: getCategorySelection(row)?.remoteId }) }}
+              </div>
+            </div>
+            <div class="flex flex-wrap gap-2">
+              <Button
+                class="p-2 text-primary hover:bg-blue-50 rounded"
+                :title="t('products.products.variations.mirakl.actions.set')"
+                :aria-label="t('products.products.variations.mirakl.actions.set')"
+                :disabled="saving || !selectedChannelId"
+                @click="openSelectionModal(rowIndex, selectedChannelId)"
+              >
+                <Icon name="edit" class="h-4 w-4" aria-hidden="true" />
+              </Button>
+              <Button
+                v-if="getCategorySelection(row)?.remoteId"
+                class="p-2 text-gray-600 hover:bg-gray-100 rounded"
+                :title="t('products.products.variations.mirakl.actions.preview')"
+                :aria-label="t('products.products.variations.mirakl.actions.preview')"
+                :disabled="saving || !selectedChannelId"
+                @click="openPreview(rowIndex, selectedChannelId)"
+              >
+                <Icon name="eye" class="h-4 w-4" aria-hidden="true" />
+              </Button>
+            </div>
+          </div>
+        </template>
+      </template>
+    </MatrixEditor>
+
+    <Modal v-model="selectionModal.visible" @closed="closeSelectionModal">
+      <Card class="modal-content w-[90vw] max-w-[90vw] h-[85vh] flex flex-col min-h-0 overflow-hidden">
+        <div class="mb-4">
+          <h3 class="text-xl font-semibold">
+            {{ t('products.products.variations.mirakl.modal.title') }}
+          </h3>
+          <div v-if="selectionModalChannel?.hostname" class="text-xs text-gray-500 mt-1">
+            {{ selectionModalChannel.hostname }}
+          </div>
+        </div>
+        <div class="flex-1 min-h-0">
+          <div class="grid gap-4 lg:grid-cols-2 h-full min-h-0">
+            <div class="rounded border bg-white p-4 min-h-0 h-full max-h-[65vh] overflow-hidden flex flex-col">
+              <MiraklCategoryBrowser
+                :sales-channel-id="selectionModalSalesChannelId"
+                @selected="handleModalSelection"
+              />
+            </div>
+            <div class="rounded border bg-white p-4 overflow-y-auto min-h-0 h-full max-h-[65vh]">
+              <div v-if="modalSelectionPath" class="text-xs text-gray-500 mb-2">
+                {{ modalSelectionPath }}
+              </div>
+              <MiraklCategoryDetails
+                v-if="modalSelection"
+                :category="modalSelection"
+                :sales-channel-id="selectionModalSalesChannelId"
+                :channel="selectionModalChannel"
+              />
+              <div v-else class="text-sm text-gray-500">
+                {{ t('products.products.mirakl.noSelection') }}
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="flex justify-end gap-2 mt-4">
+          <Button
+            class="btn btn-sm btn-primary"
+            :disabled="!modalSelection"
+            @click="applyModalSelection"
+          >
+            {{ t('products.products.variations.mirakl.actions.set') }}
+          </Button>
+          <Button class="btn btn-sm btn-outline-dark" @click="closeSelectionModal">
+            {{ t('shared.button.cancel') }}
+          </Button>
+        </div>
+      </Card>
+    </Modal>
+
+    <Modal v-model="previewVisible" @closed="closePreview">
+      <Card class="modal-content w-4/5 max-w-5xl max-h-[85vh] flex flex-col min-h-0 overflow-hidden">
+        <div class="flex justify-between items-center mb-4">
+          <div>
+            <h3 class="text-xl font-semibold">
+              {{ t('products.products.variations.mirakl.modal.previewTitle') }}
+            </h3>
+            <div v-if="previewRow" class="text-xs text-gray-500 mt-1">
+              {{ previewRow.variation.sku }}
+            </div>
+          </div>
+          <Button class="btn btn-outline-dark" @click="closePreview">
+            {{ t('shared.button.cancel') }}
+          </Button>
+        </div>
+        <div class="flex-1 min-h-0 overflow-y-auto max-h-[75vh]">
+          <MiraklCategoryDetails
+            v-if="previewNode"
+            :category="previewNode"
+            :sales-channel-id="previewSalesChannelId"
+            :channel="previewChannel"
+          />
+          <div v-else class="text-sm text-gray-500">
+            {{ t('products.products.mirakl.noSelection') }}
+          </div>
+        </div>
+      </Card>
+    </Modal>
+  </div>
+</template>
diff --git a/src/core/products/products/product-show/containers/tabs/variations/containers/variations-shein-bulk-edit/VariationsSheinBulkEdit.vue b/src/core/products/products/product-show/containers/tabs/variations/containers/variations-shein-bulk-edit/VariationsSheinBulkEdit.vue
index 690e05d1..27f4bb2a 100644
--- a/src/core/products/products/product-show/containers/tabs/variations/containers/variations-shein-bulk-edit/VariationsSheinBulkEdit.vue
+++ b/src/core/products/products/product-show/containers/tabs/variations/containers/variations-shein-bulk-edit/VariationsSheinBulkEdit.vue
@@ -952,7 +952,7 @@ defineExpose({ hasUnsavedChanges });
     </MatrixEditor>
 
     <Modal v-model="selectionModal.visible" @closed="closeSelectionModal">
-      <Card class="modal-content w-11/12 max-w-6xl h-[85vh] flex flex-col min-h-0 overflow-hidden">
+      <Card class="modal-content w-[90vw] max-w-[90vw] h-[85vh] flex flex-col min-h-0 overflow-hidden">
         <div class="mb-4">
           <h3 class="text-xl font-semibold">
             {{ t('products.products.variations.shein.modal.title') }}
diff --git a/src/core/products/products/products-edit/ProductsEditController.vue b/src/core/products/products/products-edit/ProductsEditController.vue
index 300272e8..7a42238b 100644
--- a/src/core/products/products/products-edit/ProductsEditController.vue
+++ b/src/core/products/products/products-edit/ProductsEditController.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
-
-import { computed, ref, watch } from 'vue';
+import { computed, ref, unref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import { Breadcrumbs } from "../../../../shared/components/molecules/breadcrumbs";
@@ -11,22 +10,40 @@ import VariationsContentBulkEdit from "../product-show/containers/tabs/variation
 import VariationsBulkEdit from "../product-show/containers/tabs/variations/containers/variations-bulk-edit/VariationsBulkEdit.vue";
 import VariationsPricesBulkEdit from "../product-show/containers/tabs/variations/containers/variations-prices-bulk-edit/VariationsPricesBulkEdit.vue";
 import VariationsImagesBulkEdit from "../product-show/containers/tabs/variations/containers/variations-images-bulk-edit/VariationsImagesBulkEdit.vue";
+import VariationsDocumentsBulkEdit from "../product-show/containers/tabs/variations/containers/variations-documents-bulk-edit/VariationsDocumentsBulkEdit.vue";
+import VariationsVideosBulkEdit from "../product-show/containers/tabs/variations/containers/variations-videos-bulk-edit/VariationsVideosBulkEdit.vue";
+import VariationsEanCodesBulkEdit from "../product-show/containers/tabs/variations/containers/variations-ean-codes-bulk-edit/VariationsEanCodesBulkEdit.vue";
 import VariationsAmazonBulkEdit from "../product-show/containers/tabs/variations/containers/variations-amazon-bulk-edit/VariationsAmazonBulkEdit.vue";
 import VariationsSheinBulkEdit from "../product-show/containers/tabs/variations/containers/variations-shein-bulk-edit/VariationsSheinBulkEdit.vue";
 import VariationsEbayBulkEdit from "../product-show/containers/tabs/variations/containers/variations-ebay-bulk-edit/VariationsEbayBulkEdit.vue";
+import VariationsMiraklBulkEdit from "../product-show/containers/tabs/variations/containers/variations-mirakl-bulk-edit/VariationsMiraklBulkEdit.vue";
 import { injectAuth } from "../../../../shared/modules/auth";
+import Swal from 'sweetalert2';
 
-type Mode = 'editGeneral' | 'editContent' | 'editProperties' | 'editPrices' | 'editImages' | 'editAmazon' | 'editShein' | 'editEbay';
+type Mode = 'editGeneral' | 'editContent' | 'editProperties' | 'editPrices' | 'editEanCodes' | 'editImages' | 'editDocuments' | 'editVideos' | 'editAmazon' | 'editShein' | 'editEbay' | 'editMirakl';
 
 const { t } = useI18n();
 const auth = injectAuth();
 const route = useRoute();
 const router = useRouter();
 const mode = ref<Mode>('editGeneral');
+const generalEditRef = ref<InstanceType<typeof VariationsGeneralBulkEdit> | null>(null);
+const contentEditRef = ref<InstanceType<typeof VariationsContentBulkEdit> | null>(null);
+const bulkEditRef = ref<InstanceType<typeof VariationsBulkEdit> | null>(null);
+const priceEditRef = ref<InstanceType<typeof VariationsPricesBulkEdit> | null>(null);
+const eanCodesEditRef = ref<InstanceType<typeof VariationsEanCodesBulkEdit> | null>(null);
+const imageEditRef = ref<InstanceType<typeof VariationsImagesBulkEdit> | null>(null);
+const documentEditRef = ref<InstanceType<typeof VariationsDocumentsBulkEdit> | null>(null);
+const videoEditRef = ref<InstanceType<typeof VariationsVideosBulkEdit> | null>(null);
+const amazonEditRef = ref<InstanceType<typeof VariationsAmazonBulkEdit> | null>(null);
+const sheinEditRef = ref<InstanceType<typeof VariationsSheinBulkEdit> | null>(null);
+const ebayEditRef = ref<InstanceType<typeof VariationsEbayBulkEdit> | null>(null);
+const miraklEditRef = ref<InstanceType<typeof VariationsMiraklBulkEdit> | null>(null);
 
 const hasAmazonIntegration = computed(() => Boolean(auth.user.company?.hasAmazonIntegration));
 const hasSheinIntegration = computed(() => Boolean(auth.user.company?.hasSheinIntegration));
 const hasEbayIntegration = computed(() => Boolean(auth.user.company?.hasEbayIntegration));
+const hasMiraklIntegration = computed(() => Boolean(auth.user.company?.hasMiraklIntegration));
 
 const tabs = computed<{ key: Mode; label: string; icon: string }[]>(() => {
   const items: { key: Mode; label: string; icon: string }[] = [
@@ -34,7 +51,10 @@ const tabs = computed<{ key: Mode; label: string; icon: string }[]>(() => {
     { key: 'editContent', label: t('products.products.variations.tabs.content'), icon: 'file-lines' },
     { key: 'editProperties', label: t('products.products.tabs.properties'), icon: 'screwdriver-wrench' },
     { key: 'editPrices', label: t('products.products.tabs.prices'), icon: 'coins' },
+    { key: 'editEanCodes', label: t('products.products.tabs.eanCodes'), icon: 'qrcode' },
     { key: 'editImages', label: t('products.products.variations.tabs.images'), icon: 'images' },
+    { key: 'editDocuments', label: t('products.products.variations.tabs.documents'), icon: 'file-text' },
+    { key: 'editVideos', label: t('products.products.variations.tabs.videos'), icon: 'video' },
   ];
 
   if (hasAmazonIntegration.value) {
@@ -49,6 +69,10 @@ const tabs = computed<{ key: Mode; label: string; icon: string }[]>(() => {
     items.push({ key: 'editShein', label: t('products.products.variations.tabs.shein'), icon: 'store' });
   }
 
+  if (hasMiraklIntegration.value) {
+    items.push({ key: 'editMirakl', label: t('products.products.variations.tabs.mirakl'), icon: 'store' });
+  }
+
   return items;
 });
 
@@ -63,12 +87,67 @@ const normalizeMode = (value: unknown): Mode | null => {
   return null;
 };
 
-const changeMode = (newMode: Mode) => {
+const getUnsavedChangesForMode = (currentMode: Mode) => {
+  if (currentMode === 'editGeneral') {
+    return unref(generalEditRef.value?.hasUnsavedChanges) ?? false;
+  }
+  if (currentMode === 'editContent') {
+    return unref(contentEditRef.value?.hasUnsavedChanges) ?? false;
+  }
+  if (currentMode === 'editProperties') {
+    return unref(bulkEditRef.value?.hasUnsavedChanges) ?? false;
+  }
+  if (currentMode === 'editPrices') {
+    return unref(priceEditRef.value?.hasUnsavedChanges) ?? false;
+  }
+  if (currentMode === 'editEanCodes') {
+    return unref(eanCodesEditRef.value?.hasUnsavedChanges) ?? false;
+  }
+  if (currentMode === 'editImages') {
+    return unref(imageEditRef.value?.hasUnsavedChanges) ?? false;
+  }
+  if (currentMode === 'editDocuments') {
+    return unref(documentEditRef.value?.hasUnsavedChanges) ?? false;
+  }
+  if (currentMode === 'editVideos') {
+    return unref(videoEditRef.value?.hasUnsavedChanges) ?? false;
+  }
+  if (currentMode === 'editAmazon') {
+    return unref(amazonEditRef.value?.hasUnsavedChanges) ?? false;
+  }
+  if (currentMode === 'editShein') {
+    return unref(sheinEditRef.value?.hasUnsavedChanges) ?? false;
+  }
+  if (currentMode === 'editEbay') {
+    return unref(ebayEditRef.value?.hasUnsavedChanges) ?? false;
+  }
+  if (currentMode === 'editMirakl') {
+    return unref(miraklEditRef.value?.hasUnsavedChanges) ?? false;
+  }
+  return false;
+};
+
+const changeMode = async (newMode: Mode) => {
   if (mode.value === newMode) {
     return;
   }
+
+  if (getUnsavedChangesForMode(mode.value)) {
+    const res = await Swal.fire({
+      icon: 'warning',
+      text: t('products.products.messages.unsavedChanges'),
+      showCancelButton: true,
+      confirmButtonText: t('shared.button.cancel'),
+      cancelButtonText: t('shared.button.leaveTab'),
+    });
+
+    if (res.dismiss !== Swal.DismissReason.cancel) {
+      return;
+    }
+  }
+
   mode.value = newMode;
-  router.replace({ query: { ...route.query, tab: newMode } });
+  await router.replace({ query: { ...route.query, tab: newMode } });
 };
 
 watch(
@@ -124,28 +203,40 @@ const productIds = computed(() => {
 
           <div class="flex-1 min-w-0 md:pl-4">
             <template v-if="mode === 'editGeneral'">
-              <VariationsGeneralBulkEdit :product-ids="productIds" />
+              <VariationsGeneralBulkEdit ref="generalEditRef" :product-ids="productIds" />
             </template>
             <template v-else-if="mode === 'editContent'">
-              <VariationsContentBulkEdit :product-ids="productIds" />
+              <VariationsContentBulkEdit ref="contentEditRef" :product-ids="productIds" />
             </template>
             <template v-else-if="mode === 'editProperties'">
-              <VariationsBulkEdit :product-ids="productIds" />
+              <VariationsBulkEdit ref="bulkEditRef" :product-ids="productIds" />
             </template>
             <template v-else-if="mode === 'editPrices'">
-              <VariationsPricesBulkEdit :product-ids="productIds" />
+              <VariationsPricesBulkEdit ref="priceEditRef" :product-ids="productIds" />
+            </template>
+            <template v-else-if="mode === 'editEanCodes'">
+              <VariationsEanCodesBulkEdit ref="eanCodesEditRef" :product-ids="productIds" />
             </template>
             <template v-else-if="mode === 'editImages'">
-              <VariationsImagesBulkEdit :product-ids="productIds" />
+              <VariationsImagesBulkEdit ref="imageEditRef" :product-ids="productIds" />
+            </template>
+            <template v-else-if="mode === 'editDocuments'">
+              <VariationsDocumentsBulkEdit ref="documentEditRef" :product-ids="productIds" />
+            </template>
+            <template v-else-if="mode === 'editVideos'">
+              <VariationsVideosBulkEdit ref="videoEditRef" :product-ids="productIds" />
             </template>
             <template v-else-if="mode === 'editAmazon'">
-              <VariationsAmazonBulkEdit :product-ids="productIds" />
+              <VariationsAmazonBulkEdit ref="amazonEditRef" :product-ids="productIds" />
             </template>
             <template v-else-if="mode === 'editEbay'">
-              <VariationsEbayBulkEdit :product-ids="productIds" />
+              <VariationsEbayBulkEdit ref="ebayEditRef" :product-ids="productIds" />
             </template>
             <template v-else-if="mode === 'editShein'">
-              <VariationsSheinBulkEdit :product-ids="productIds" />
+              <VariationsSheinBulkEdit ref="sheinEditRef" :product-ids="productIds" />
+            </template>
+            <template v-else-if="mode === 'editMirakl'">
+              <VariationsMiraklBulkEdit ref="miraklEditRef" :product-ids="productIds" />
             </template>
             <template v-else>
               <div class="py-6">
diff --git a/src/locale/de.json b/src/locale/de.json
index 3131e134..9a3d3d90 100644
--- a/src/locale/de.json
+++ b/src/locale/de.json
@@ -307,6 +307,10 @@
   },
   "products": {
     "eanCodes": {
+      "messages": {
+        "matchingExisting": "",
+        "matchExistingBlocked": ""
+      },
       "labels": {
         "excludeAttributeValue": ""
       }
@@ -594,7 +598,24 @@
           "general": "",
           "amazon": "",
           "ebay": "",
-          "shein": ""
+          "shein": "",
+          "mirakl": ""
+        },
+        "eanCodes": {
+          "labels": {
+            "disabledForConfigurable": ""
+          },
+          "status": {
+            "toBeAssigned": "",
+            "toBeReleased": "",
+            "toBeDeleted": "",
+            "willCreate": "",
+            "willUpdate": ""
+          },
+          "toast": {
+            "saved": "",
+            "failed": ""
+          }
         },
         "images": {
           "columns": {
@@ -689,14 +710,17 @@
           "labels": {
             "categoryId": ""
           },
-          "actions": {
-            "set": "",
-            "preview": ""
-          },
-          "modal": {
-            "title": "",
-            "previewTitle": ""
-          }
+        "actions": {
+          "set": "",
+          "preview": ""
+        },
+        "selectors": {
+          "salesChannel": ""
+        },
+        "modal": {
+          "title": "",
+          "previewTitle": ""
+        }
         },
         "ebay": {
           "columns": {
@@ -1153,6 +1177,14 @@
       "webhook": "Webhook",
       "mirakl": ""
     },
+    "shopify": {
+      "entry": {
+        "title": ""
+      },
+      "installed": {
+        "title": ""
+      }
+    },
     "amazon": {
       "actions": {
         "bulkForceUpdate": {
@@ -1446,6 +1478,13 @@
             "metadata": "",
             "translations": ""
           },
+          "setupRequired": {
+            "eyebrow": "",
+            "title": "",
+            "description": "",
+            "contact": "",
+            "details": ""
+          },
           "help": {
             "defaultValue": "",
             "language": "",
diff --git a/src/locale/en.json b/src/locale/en.json
index c00bd4ef..b80c1daf 100644
--- a/src/locale/en.json
+++ b/src/locale/en.json
@@ -1153,6 +1153,10 @@
       "help": {
         "externalEanCode": "An external EAN Code is one that is not generated by our platform."
       },
+      "messages": {
+        "matchingExisting": "Trying to match existent EAN codes.",
+        "matchExistingBlocked": "This EAN already exists and cannot be linked because it is assigned elsewhere or already marked as used."
+      },
       "labels": {
         "eanCode": "EAN code",
         "isAssigned": "Is assigned to product?",
@@ -1328,11 +1332,12 @@
           "images": "Images",
           "documents": "Documents",
           "videos": "Videos",
-          "general": "General",
-          "amazon": "Amazon",
-          "ebay": "eBay",
-          "shein": "Shein"
-        },
+        "general": "General",
+        "amazon": "Amazon",
+        "ebay": "eBay",
+        "shein": "Shein",
+        "mirakl": "Mirakl"
+      },
         "images": {
           "columns": {
             "upload": "Upload",
@@ -1427,6 +1432,22 @@
           },
           "optionLabel": "{name} ({rate}%)"
         },
+        "eanCodes": {
+          "labels": {
+            "disabledForConfigurable": "EAN codes are disabled for configurable products."
+          },
+          "status": {
+            "toBeAssigned": "To be assigned on save",
+            "toBeReleased": "To be released on save",
+            "toBeDeleted": "To be deleted on save",
+            "willCreate": "Will create an external EAN on save",
+            "willUpdate": "Will update the external EAN on save"
+          },
+          "toast": {
+            "saved": "Saved {count} EAN code change(s).",
+            "failed": "{count} EAN code change(s) failed. Review the highlighted rows."
+          }
+        },
         "media": {
           "filters": {
             "all": "All",
@@ -1521,14 +1542,17 @@
           "labels": {
             "categoryId": "ID: {id}"
           },
-          "actions": {
-            "set": "Set category",
-            "preview": "Preview category"
-          },
-          "modal": {
-            "title": "Select Mirakl category",
-            "previewTitle": "Category preview"
-          }
+        "actions": {
+          "set": "Set category",
+          "preview": "Preview category"
+        },
+        "selectors": {
+          "salesChannel": "Sales channel"
+        },
+        "modal": {
+          "title": "Select Mirakl category",
+          "previewTitle": "Category preview"
+        }
         },
         "ebay": {
           "columns": {
@@ -3889,6 +3913,13 @@
             "metadata": "Mirakl Metadata",
             "translations": "Translations"
           },
+          "setupRequired": {
+            "eyebrow": "Developer setup required",
+            "title": "This Mirakl property is not ready to map yet",
+            "description": "This field has not been configured by the developers, so it cannot be mapped in the frontend yet.",
+            "contact": "Please contact the development team if you need to use this Mirakl property.",
+            "details": "You can still review the basic property information on this page, but the mapping controls stay unavailable until the backend setup is completed."
+          },
           "help": {
             "defaultValue": "Use a fixed value when this Mirakl field is mapped as a default value.",
             "language": "Select the Mirakl remote language code that should be used for this field.",
@@ -4839,10 +4870,10 @@
               "integrationStep5Part1": "Open the new app and go to 'Configuration'.",
               "integrationStep5Part2": "Under 'Admin API integration' click 'Configure' and enable these scopes:",
               "integrationStep5Part3": "Click 'Save'.",
-              "integrationStep6Part1": "In 'API credentials' select 'Install app' and confirm. ",
-              "integrationStep6Part2": "Now the API key, API secret key and Admin API access token are ready for the last step of this wizard.",
+              "integrationStep6Part1": "In 'Configuration', set your app URL and allowed redirection URL so OneSila can send the Shopify authorization response back to the correct callback page.",
+              "integrationStep6Part2": "Use the backend-provided Shopify callback URL for the allowed redirection URL. OAuth will issue the access token after authorization, so you no longer need to copy API credentials into this wizard.",
               "integrationStep7": "From the Sales channels sidebar choose 'View your online store' and copy the URL from your browser and paste it in the step 2 of this wizard.",
-              "integrationStep8": "During step 4 of the wizard paste the API key, secret key and access token, then click Finish.",
+              "integrationStep8": "During step 4 of the wizard review the Shopify-specific settings and click Finish. OneSila will then redirect you to Shopify to authorize the connection.",
               "appUrlLabel": "App URL",
               "allowedRedirectUrlLabel": "Allowed redirection URL(s)",
               "customAppTitle": "Create Custom App",
@@ -4868,7 +4899,7 @@
           },
           "shopify": {
             "title": "Shopify Channel Details",
-            "content": "Provide Shopify-specific configuration to connect your store."
+            "content": "Review the Shopify-specific settings. When you finish, OneSila will redirect you to Shopify to authorize the connection."
           },
           "woocommerce": {
             "title": "WooCommerce Channel Details",
@@ -5074,6 +5105,14 @@
         "title": "Ebay Connected"
       }
     },
+    "shopify": {
+      "entry": {
+        "title": "Connect Shopify"
+      },
+      "installed": {
+        "title": "Shopify Connected"
+      }
+    },
     "salesChannel": {
       "shopify": {
         "installed": {
diff --git a/src/locale/fr.json b/src/locale/fr.json
index 31c7e32d..e916bdc3 100644
--- a/src/locale/fr.json
+++ b/src/locale/fr.json
@@ -307,6 +307,10 @@
   },
   "products": {
     "eanCodes": {
+      "messages": {
+        "matchingExisting": "",
+        "matchExistingBlocked": ""
+      },
       "labels": {
         "excludeAttributeValue": ""
       }
@@ -591,7 +595,24 @@
           "general": "",
           "amazon": "",
           "ebay": "",
-          "shein": ""
+          "shein": "",
+          "mirakl": ""
+        },
+        "eanCodes": {
+          "labels": {
+            "disabledForConfigurable": ""
+          },
+          "status": {
+            "toBeAssigned": "",
+            "toBeReleased": "",
+            "toBeDeleted": "",
+            "willCreate": "",
+            "willUpdate": ""
+          },
+          "toast": {
+            "saved": "",
+            "failed": ""
+          }
         },
         "images": {
           "columns": {
@@ -686,14 +707,17 @@
           "labels": {
             "categoryId": ""
           },
-          "actions": {
-            "set": "",
-            "preview": ""
-          },
-          "modal": {
-            "title": "",
-            "previewTitle": ""
-          }
+        "actions": {
+          "set": "",
+          "preview": ""
+        },
+        "selectors": {
+          "salesChannel": ""
+        },
+        "modal": {
+          "title": "",
+          "previewTitle": ""
+        }
         },
         "ebay": {
           "columns": {
@@ -1150,6 +1174,14 @@
       "webhook": "Webhook",
       "mirakl": ""
     },
+    "shopify": {
+      "entry": {
+        "title": ""
+      },
+      "installed": {
+        "title": ""
+      }
+    },
     "amazon": {
       "actions": {
         "bulkForceUpdate": {
@@ -1443,6 +1475,13 @@
             "metadata": "",
             "translations": ""
           },
+          "setupRequired": {
+            "eyebrow": "",
+            "title": "",
+            "description": "",
+            "contact": "",
+            "details": ""
+          },
           "help": {
             "defaultValue": "",
             "language": "",
diff --git a/src/locale/nl.json b/src/locale/nl.json
index 1f46938d..565688ac 100644
--- a/src/locale/nl.json
+++ b/src/locale/nl.json
@@ -804,6 +804,10 @@
       "edit": {
         "title": "Bewerk EAN Code"
       },
+      "messages": {
+        "matchingExisting": "",
+        "matchExistingBlocked": ""
+      },
       "labels": {
         "eanCode": "EAN Code",
         "isAssigned": "Toegewezen aan product?",
@@ -953,7 +957,8 @@
           "general": "",
           "amazon": "",
           "ebay": "",
-          "shein": ""
+          "shein": "",
+          "mirakl": ""
         },
         "content": {
           "ai": {
@@ -975,6 +980,22 @@
           },
           "optionLabel": ""
         },
+        "eanCodes": {
+          "labels": {
+            "disabledForConfigurable": ""
+          },
+          "status": {
+            "toBeAssigned": "",
+            "toBeReleased": "",
+            "toBeDeleted": "",
+            "willCreate": "",
+            "willUpdate": ""
+          },
+          "toast": {
+            "saved": "",
+            "failed": ""
+          }
+        },
         "images": {
           "columns": {
             "image": "Afbeelding #{index}"
@@ -1068,14 +1089,17 @@
           "labels": {
             "categoryId": ""
           },
-          "actions": {
-            "set": "",
-            "preview": ""
-          },
-          "modal": {
-            "title": "",
-            "previewTitle": ""
-          }
+        "actions": {
+          "set": "",
+          "preview": ""
+        },
+        "selectors": {
+          "salesChannel": ""
+        },
+        "modal": {
+          "title": "",
+          "previewTitle": ""
+        }
         },
         "ebay": {
           "columns": {
@@ -3909,6 +3933,14 @@
       "webhook": "Webhook",
       "mirakl": ""
     },
+    "shopify": {
+      "entry": {
+        "title": ""
+      },
+      "installed": {
+        "title": ""
+      }
+    },
     "amazon": {
       "actions": {
         "bulkForceUpdate": {
@@ -4182,6 +4214,13 @@
             "metadata": "",
             "translations": ""
           },
+          "setupRequired": {
+            "eyebrow": "",
+            "title": "",
+            "description": "",
+            "contact": "",
+            "details": ""
+          },
           "help": {
             "defaultValue": "",
             "language": "",
diff --git a/src/shared/api/mutations/eanCodes.js b/src/shared/api/mutations/eanCodes.js
index e217535b..bf8c3bf3 100644
--- a/src/shared/api/mutations/eanCodes.js
+++ b/src/shared/api/mutations/eanCodes.js
@@ -83,6 +83,20 @@ export const assignEanCodeMutation = gql`
   }
 `;
 
+export const manualAssignEanCodeMutation = gql`
+  mutation manualAssignEanCode($data: ManualAssignEancodeInput!) {
+    manualAssignEanCode(data: $data) {
+      id
+      eanCode
+      product {
+        id
+        sku
+        name
+      }
+    }
+  }
+`;
+
 export const assignEanCodesMutation = gql`
     mutation assignEanCodes($data: BulkAssignEancodesInput!) {
       assignEanCodes(instance: $data) {
diff --git a/src/shared/api/queries/products.js b/src/shared/api/queries/products.js
index e50cb4a4..23cd559e 100644
--- a/src/shared/api/queries/products.js
+++ b/src/shared/api/queries/products.js
@@ -193,6 +193,25 @@ export const productsWithSheinQuery = gql`
   }
 `;
 
+export const productsWithMiraklQuery = gql`
+  query ProductsWithMirakl($first: Int, $after: String, $filter: ProductFilter) {
+    products(first: $first, after: $after, filters: $filter) {
+      edges {
+        node {
+          id
+          sku
+          name
+          active
+        }
+      }
+      pageInfo {
+        endCursor
+        hasNextPage
+      }
+    }
+  }
+`;
+
 export const productsWithAmazonQuery = gql`
   query ProductsWithAmazon($first: Int, $after: String, $filter: ProductFilter) {
     products(first: $first, after: $after, filters: $filter) {
@@ -260,6 +279,26 @@ export const productsWithPricesQuery = gql`
   }
 `;
 
+export const productsWithEanCodesQuery = gql`
+  query ProductsWithEanCodes($first: Int, $after: String, $filter: ProductFilter) {
+    products(first: $first, after: $after, filters: $filter) {
+      edges {
+        node {
+          id
+          sku
+          name
+          active
+          type
+        }
+      }
+      pageInfo {
+        endCursor
+        hasNextPage
+      }
+    }
+  }
+`;
+
 export const productsWithImagesQuery = gql`
   query ProductsWithImages($first: Int, $after: String, $filter: ProductFilter) {
     products(first: $first, after: $after, filters: $filter) {
@@ -620,6 +659,28 @@ export const configurableVariationsWithSheinQuery = gql`
   }
 `;
 
+export const configurableVariationsWithMiraklQuery = gql`
+  query ConfigurableVariationsWithMirakl($first: Int, $after: String, $filter: ConfigurableVariationFilter) {
+    configurableVariations(first: $first, after: $after, filters: $filter) {
+      edges {
+        node {
+          id
+          variation {
+            id
+            sku
+            name
+            active
+          }
+        }
+      }
+      pageInfo {
+        endCursor
+        hasNextPage
+      }
+    }
+  }
+`;
+
 export const configurableVariationsWithAmazonQuery = gql`
   query ConfigurableVariationsWithAmazon($first: Int, $after: String, $filter: ConfigurableVariationFilter) {
     configurableVariations(first: $first, after: $after, filters: $filter) {
@@ -705,6 +766,28 @@ export const bundleVariationsWithSheinQuery = gql`
   }
 `;
 
+export const bundleVariationsWithMiraklQuery = gql`
+  query BundleVariationsWithMirakl($first: Int, $after: String, $filter: BundleVariationFilter) {
+    bundleVariations(first: $first, after: $after, filters: $filter) {
+      edges {
+        node {
+          id
+          variation {
+            id
+            sku
+            name
+            active
+          }
+        }
+      }
+      pageInfo {
+        endCursor
+        hasNextPage
+      }
+    }
+  }
+`;
+
 export const bundleVariationsWithAmazonQuery = gql`
   query BundleVariationsWithAmazon($first: Int, $after: String, $filter: BundleVariationFilter) {
     bundleVariations(first: $first, after: $after, filters: $filter) {
diff --git a/src/shared/api/queries/salesChannels.js b/src/shared/api/queries/salesChannels.js
index 98ebc769..4f1bf2d5 100644
--- a/src/shared/api/queries/salesChannels.js
+++ b/src/shared/api/queries/salesChannels.js
@@ -149,8 +149,6 @@ export const getShopifyChannelQuery = gql`
       syncEanCodes
       syncPrices
       importOrders
-      apiKey
-      apiSecret
       accessToken
       minNameLength
       minDescriptionLength
diff --git a/src/shared/components/organisms/matrix-editor/MatrixEditor.vue b/src/shared/components/organisms/matrix-editor/MatrixEditor.vue
index eeac77a4..eefa7a40 100644
--- a/src/shared/components/organisms/matrix-editor/MatrixEditor.vue
+++ b/src/shared/components/organisms/matrix-editor/MatrixEditor.vue
@@ -27,6 +27,9 @@ const props = withDefaults(
     loading?: boolean
     saving?: boolean
     hasChanges?: boolean
+    enableCellClipboard?: boolean
+    enableRowClipboard?: boolean
+    enableDragFill?: boolean
     getCellValue: (rowIndex: number, columnKey: string) => any
     setCellValue: (rowIndex: number, columnKey: string, value: any) => void
     cloneCellValue: (fromRow: number, toRow: number, columnKey: string) => void
@@ -38,6 +41,9 @@ const props = withDefaults(
     loading: false,
     saving: false,
     hasChanges: false,
+    enableCellClipboard: true,
+    enableRowClipboard: true,
+    enableDragFill: true,
   }
 )
 
@@ -371,6 +377,7 @@ const isEditableColumn = (columnKey: string) => {
 }
 
 const startDragFill = (row: number, col: string) => {
+  if (!props.enableDragFill) return
   if (!isEditableColumn(col)) return
   const columns = getColumnsForOperation(row, col).filter((columnKey) =>
     isEditableColumn(columnKey)
@@ -477,7 +484,7 @@ const handleKeydown = (event: KeyboardEvent) => {
     }
   }
 
-  if ((event.ctrlKey || event.metaKey) && event.key.toLowerCase() === 'c') {
+  if (props.enableCellClipboard && (event.ctrlKey || event.metaKey) && event.key.toLowerCase() === 'c') {
     if (isEditableColumn(col)) {
       const value = props.getCellValue(row, col)
       clipboard.value = {
@@ -488,7 +495,7 @@ const handleKeydown = (event: KeyboardEvent) => {
       Toast.success(t('products.products.alert.toast.copied'))
     }
     event.preventDefault()
-  } else if ((event.ctrlKey || event.metaKey) && event.key.toLowerCase() === 'v') {
+  } else if (props.enableCellClipboard && (event.ctrlKey || event.metaKey) && event.key.toLowerCase() === 'v') {
     if (clipboard.value) {
       const columns = getColumnsForOperation(row, col).filter((columnKey) =>
         isEditableColumn(columnKey)
@@ -939,7 +946,7 @@ defineExpose<MatrixEditorExpose>({ resetHistory })
                 </span>
               </slot>
               <div
-                v-if="columnIndex === 0 && hoveredRowForActions === rowIndex"
+                v-if="props.enableRowClipboard && columnIndex === 0 && hoveredRowForActions === rowIndex"
                 class="mt-2 flex flex-col space-y-2"
               >
                 <Button
@@ -961,7 +968,7 @@ defineExpose<MatrixEditorExpose>({ resetHistory })
                 class="absolute inset-0 border-2 border-blue-500 pointer-events-none"
               />
               <div
-                v-if="isDragHandleCell(rowIndex, column.key)"
+                v-if="props.enableDragFill && isDragHandleCell(rowIndex, column.key)"
                 class="absolute w-2 h-2 bg-blue-500 bottom-0 right-0 pointer-events-auto cursor-row-resize"
                 @mousedown.stop="startDragFill(rowIndex, column.key)"
               />