Multiple fixes for configurable products and add tests.

modules/acm/config/install/acm.connector.yml

@@ -8,3 +8,5 @@ product_publish: false
 api_version: v2
 filter_root_category: false
 text_format: rich_text
+delete_disabled_skus: true
+product_title_use_sku: false

modules/acm/config/schema/acm.schema.yml

@@ -99,6 +99,12 @@ acm.connector:
     category_field_name:
       type: string
       label: 'category_field_name'
+    delete_disabled_skus:
+      type: boolean
+      label: 'delete_disabled_skus'
+    product_title_use_sku:
+      type: boolean
+      label: 'product_title_use_sku'
 
 acm.session:
   type: config_object

modules/acm_cart/src/Cart.php

@@ -652,4 +652,18 @@ public function get($property_name) {
     return NULL;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function hasItem(string $sku) {
+    $items = $this->items();
+
+    if (empty($items)) {
+      return FALSE;
+    }
+
+    $skus = array_column($items, 'sku');
+    return in_array($sku, $skus);
+  }
+
 }

modules/acm_cart/src/CartInterface.php

@@ -327,4 +327,15 @@ public function setGuestCartEmail($email);
    */
   public function get($property_name);
 
+  /**
+   * Check if Cart has an sku.
+   *
+   * @param string $sku
+   *   SKU to check.
+   *
+   * @return bool
+   *   TRUE if sku is already in cart.
+   */
+  public function hasItem(string $sku);
+
 }

modules/acm_cart/src/CartStorage.php

@@ -871,4 +871,15 @@ public function clearPayment() {
     unset($this->cart->payment);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function hasItem(string $sku) {
+    if ($this->isEmpty()) {
+      return FALSE;
+    }
+
+    return $this->cart->hasItem($sku);
+  }
+
 }

modules/acm_sku/acm_sku.api.php

@@ -5,6 +5,7 @@
  * Hooks specific to the acm_sku module.
  */
 
+use Drupal\acm_sku\Entity\SKU;
 use Drupal\node\NodeInterface;
 use Drupal\taxonomy\TermInterface;
 
@@ -69,6 +70,41 @@ function hook_acm_sku_commerce_category_alter(TermInterface $term, array $catego
 
 }
 
+/**
+ * Alter the children of configurable products.
+ *
+ * @param array $children
+ *   Variants for the SKU.
+ * @param \Drupal\acm_sku\Entity\SKU $sku
+ *   Parent sku which is being added to cart.
+ */
+function hook_acm_sku_configurable_variants_alter(array &$children, SKU $sku) {
+
+}
+
+/**
+ * Alter the configurations for configurable product.
+ *
+ * @param array $configurations
+ *   Configurations available for configurable product.
+ * @param \Drupal\acm_sku\Entity\SKU $sku
+ *   Parent sku which is being added to cart.
+ */
+function hook_acm_sku_configurable_product_configurations_alter(array &$configurations, SKU $sku) {
+
+}
+/**
+ * Alter the options added to cart item.
+ *
+ * @param array $options
+ *   Options to be added to cart item.
+ * @param \Drupal\acm_sku\Entity\SKU $sku
+ *   Parent sku which is being added to cart.
+ */
+function hook_acm_sku_configurable_cart_options_alter(array &$options, SKU $sku) {
+
+}
+
 /**
  * @} End of "addtogroup hooks".
  */

modules/acm_sku/acm_sku.install

@@ -322,3 +322,37 @@ function acm_sku_update_8109() {
   $field->setTranslatable(FALSE);
   $field->save();
 }
+
+/**
+ * Implements hook_update_N().
+ *
+ * Re-structure attribute weights to make it schema compatible.
+ */
+function acm_sku_update_8110() {
+  $config = \Drupal::configFactory()->getEditable('acm_sku.configurable_form_settings');
+
+  $attribute_weights = [];
+  foreach ($config->get('attribute_weights') ?? [] as $attribute_set => $weights) {
+    $fields = [];
+
+    foreach ($weights as $field => $weight) {
+      if (is_array($weight)) {
+        // Ignore corrupt data created because of buggy code.
+        continue;
+      }
+
+      $fields[] = [
+        'field' => $field,
+        'weight' => $weight,
+      ];
+    }
+
+    $attribute_weights[] = [
+      'attribute_set' => $attribute_set,
+      'fields' => $fields,
+    ];
+  }
+
+  $config->set('attribute_weights', $attribute_weights);
+  $config->save(TRUE);
+}

modules/acm_sku/config/install/acm_sku.configurable_form_settings.yml

@@ -1,4 +1,8 @@
 attribute_weights:
-  default:
-    size: 1
+  -
+    attribute_set: default
+    fields:
+      -
+        field: 'size'
+        weight: 1
 show_quantity: TRUE

modules/acm_sku/config/schema/acm_sku.schema.yml

@@ -29,9 +29,21 @@ acm_sku.configurable_form_settings:
       sequence:
         type: mapping
         mapping:
-          size:
-            label: 'Size'
-            type: integer
+          attribute_set:
+            label: 'attribute_set'
+            type: string
+          fields:
+            label: 'fields'
+            type: sequence
+            sequence:
+              type: mapping
+              mapping:
+                field:
+                  label: 'field'
+                  type: 'string'
+                weight:
+                  label: 'weight'
+                  type: integer
     show_quantity:
       type: boolean
       label: 'show_quantity'

modules/acm_sku/src/CartFormHelper.php

@@ -50,7 +50,15 @@ public function __construct(ConfigFactoryInterface $config_factory) {
   public function getConfigurableAttributeWeights($attribute_set = 'default') {
     $attribute_set = strtolower($attribute_set);
     $weights = $this->config->get('attribute_weights');
-    $set_weights = $weights[$attribute_set] ?? $weights['default'];
+
+    $processed_weights = [];
+    foreach ($weights as $weight) {
+      foreach ($weight['fields'] ?? [] as $field) {
+        $processed_weights[$weight['attribute_set']][$field['field']] = $field['weight'];
+      }
+    }
+
+    $set_weights = $processed_weights[$attribute_set] ?? $processed_weights['default'];
     asort($set_weights);
     return $set_weights;
   }
@@ -66,9 +74,32 @@ public function getConfigurableAttributeWeights($attribute_set = 'default') {
   public function setConfigurableAttributeWeights($attribute_set = 'default', array $weights = []) {
     $attribute_set = strtolower($attribute_set);
 
+    $fields = [];
+    foreach ($weights as $field => $weight) {
+      $fields[] = [
+        'field' => $field,
+        'weight' => $weight,
+      ];
+    }
+
     // Update weights for particular attribute set in config.
     $existing_weights = $this->config->get('attribute_weights');
-    $existing_weights[$attribute_set] = $weights;
+
+    $exists = FALSE;
+    foreach ($existing_weights as &$weight) {
+      if ($weight['attribute_set'] == $attribute_set) {
+        $weight['fields'] = $fields;
+        $exists = TRUE;
+        break;
+      }
+    }
+
+    if (!$exists) {
+      $existing_weights[] = [
+        'attribute_set' => $attribute_set,
+        'fields' => $fields,
+      ];
+    }
 
     $config = $this->configFactory->getEditable(self::CONFIG_KEY);
     $config->set('attribute_weights', $existing_weights);