Merge remote-tracking branch 'remotes/upstream/BroadleafCommerce-4.0.x' into BroadleafCommerce-4.0.x

Author: jefffischer

admin/broadleaf-admin-functional-tests/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.broadleafcommerce</groupId>
         <artifactId>admin</artifactId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.0.10-SNAPSHOT</version>
     </parent>
     <artifactId>broadleaf-admin-functional-tests</artifactId>
     <name>BroadleafCommerce Admin Functional Tests</name>
@@ -51,20 +51,6 @@
     </developers>
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>${maven.source.plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <!-- Include Spock specifications, exclude the browser tests 
                 by default -->
             <plugin>

admin/broadleaf-admin-module/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>admin</artifactId>
         <groupId>org.broadleafcommerce</groupId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.0.10-SNAPSHOT</version>
     </parent>
     <artifactId>broadleaf-admin-module</artifactId>
     <packaging>jar</packaging>
@@ -51,22 +51,6 @@
         </developer>
     </developers>
     <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>${maven.source.plugin.version}</version>
-                <executions>
-                  <execution>
-                    <id>attach-sources</id>
-                    <phase>verify</phase>
-                    <goals>
-                      <goal>jar-no-fork</goal>
-                    </goals>
-                  </execution>
-                </executions>
-            </plugin>
-        </plugins>
         <resources>
             <resource>
                 <directory>src/main/resources/admin_style</directory>

admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/server/service/AdminCatalogServiceImpl.java

@@ -45,7 +45,7 @@
 
 /**
  * 
- * @author Phillip Verheyden
+ * @author Phillip Verheyden\
  *
  */
 @Service("blAdminCatalogService")
@@ -74,6 +74,12 @@ public Integer generateSkusFromProduct(Long productId) {
         }
 
         List<List<ProductOptionValue>> allPermutations = generatePermutations(0, new ArrayList<ProductOptionValue>(), product.getProductOptions());
+
+        // return -2 to indicate that one of the Product Options used in Sku generation has no Allowed Values
+        if (allPermutations == null) {
+            return -2;
+        }
+
         LOG.info("Total number of permutations: " + allPermutations.size());
         LOG.info(allPermutations);
 
@@ -156,6 +162,10 @@ public List<List<ProductOptionValue>> generatePermutations(int currentTypeIndex,
             result.addAll(generatePermutations(currentTypeIndex + 1, currentPermutation, options));
             return result;
         }
+        // Check to make sure there is at least 1 Allowed Value, else prevent generation
+        if (currentOption.getAllowedValues().isEmpty()) {
+            return null;
+        }
         for (ProductOptionValue option : currentOption.getAllowedValues()) {
             List<ProductOptionValue> permutation = new ArrayList<ProductOptionValue>();
             permutation.addAll(currentPermutation);

admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/server/service/extension/ProductCustomPersistenceHandlerExtensionHandler.java

@@ -47,4 +47,28 @@ public interface ProductCustomPersistenceHandlerExtensionHandler extends Extensi
      * @return
      */
     ExtensionResultStatusType manageParentCategoryForUpdate(PersistencePackage persistencePackage, Product product) throws ServiceException;
+
+    /**
+     * Perform any special handling for the remove
+     *
+     * @param product
+     * @return
+     */
+    ExtensionResultStatusType manageRemove(PersistencePackage persistencePackage, Product product) throws ServiceException;
+
+    /**
+     * Setup any special state to influence the fetch results
+     *
+     * @return
+     * @throws ServiceException
+     */
+    ExtensionResultStatusType initiateFetchState() throws ServiceException;
+
+    /**
+     * Cleanup any special state started by {@link #initiateFetchState()}
+     *
+     * @return
+     * @throws ServiceException
+     */
+    ExtensionResultStatusType endFetchState() throws ServiceException;
 }

admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/server/service/handler/CustomerCustomPersistenceHandler.java

@@ -22,6 +22,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.broadleafcommerce.common.exception.ServiceException;
+import org.broadleafcommerce.common.persistence.Status;
 import org.broadleafcommerce.common.presentation.client.OperationType;
 import org.broadleafcommerce.openadmin.dto.Entity;
 import org.broadleafcommerce.openadmin.dto.FieldMetadata;
@@ -32,10 +33,12 @@
 import org.broadleafcommerce.openadmin.server.service.persistence.module.RecordHelper;
 import org.broadleafcommerce.profile.core.dao.RoleDao;
 import org.broadleafcommerce.profile.core.domain.Customer;
+import org.broadleafcommerce.profile.core.domain.CustomerAddress;
 import org.broadleafcommerce.profile.core.service.CustomerService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Resource;
@@ -150,7 +153,27 @@ protected Entity validateUniqueUsername(Entity entity, Customer adminInstance) {
     public void remove(PersistencePackage persistencePackage, DynamicEntityDao dynamicEntityDao, RecordHelper helper) throws ServiceException {
     	Entity entity = persistencePackage.getEntity();
     	try {
-			roleDao.removeCustomerRolesByCustomerId(Long.parseLong(entity.findProperty("id").getValue()));
+    	    
+            Long customerId = Long.parseLong(entity.findProperty("id").getValue());
+            
+            Customer customer = customerService.readCustomerById(customerId);
+            if (Status.class.isAssignableFrom(customer.getClass())) {
+                ((Status) customer).setArchived('Y');
+                
+                // If the customer has a conditional weave on ArchiveStatus, nothing triggers the delete so other
+                // normally-cascaded deletes don't happen (like CustomerAddress)
+                List<CustomerAddress> addressList = customer.getCustomerAddresses();
+                for (CustomerAddress address : addressList) {
+                    address.setArchived('Y');
+                }
+                
+                customer = customerService.saveCustomer(customer);
+                return;
+            }
+            
+            // Remove the customer roles for the customer since it's not cascaded
+            roleDao.removeCustomerRolesByCustomerId(customerId);
+            
 			helper.getCompatibleModule(OperationType.BASIC).remove(persistencePackage);
 		} catch (Exception e) {
 			LOG.error("Unable to execute persistence activity", e);