BackPort Update from Main

commerce/domain/orchestrators/classes/CartCalculateSample.cls

@@ -30,12 +30,13 @@ global class CartCalculateSample extends CartExtension.CartCalculate {
 
         // Use BuyerActions to decide which calculators to invoke
         CartExtension.BuyerActions buyerActions = request.getBuyerActions();
+        boolean isCouponAppliedInCheckout = isCouponAppliedInCheckout(buyerActions, cart);
         boolean runPricing = buyerActions.isCheckoutStarted() || buyerActions.isCartItemChanged();
         boolean runPromotions = buyerActions.isCheckoutStarted() || buyerActions.isCouponChanged() || buyerActions.isCartItemChanged();
         boolean runInventory = buyerActions.isCheckoutStarted();
-        boolean runShipping = buyerActions.isDeliveryGroupChanged();
-        boolean runPostShipping = buyerActions.isDeliveryGroupChanged() || buyerActions.isDeliveryMethodSelected();
-        boolean runTaxes = buyerActions.isDeliveryGroupChanged() || buyerActions.isDeliveryMethodSelected();
+        boolean runShipping = buyerActions.isDeliveryGroupChanged() || isCouponAppliedInCheckout;
+        boolean runPostShipping = buyerActions.isDeliveryGroupChanged() || buyerActions.isDeliveryMethodSelected() || isCouponAppliedInCheckout;
+        boolean runTaxes = buyerActions.isDeliveryGroupChanged() || buyerActions.isDeliveryMethodSelected() || isCouponAppliedInCheckout;
 
         // OptionalBuyerActionDetails can be used to optimize the various calculators that are invoked
         CartExtension.CartCalculateCalculatorRequest calculatorRequest = new CartExtension.CartCalculateCalculatorRequest(cart, request.getOptionalBuyerActionDetails());
@@ -103,4 +104,8 @@ global class CartCalculateSample extends CartExtension.CartCalculate {
 
         return false;
     }
+
+    private Boolean isCouponAppliedInCheckout(CartExtension.BuyerActions buyerActions, CartExtension.Cart cart) {
+        return cart.getStatus() == CartExtension.CartStatusEnum.CHECKOUT && buyerActions.isCouponChanged();
+    }
 }

commerce/domain/orchestrators/classes/CartCalculateSampleUnitTest.cls

@@ -1,3 +1,9 @@
+/*
+ * Copyright 2023 salesforce.com, inc.
+ * All Rights Reserved
+ * Company Confidential
+ */
+
 /**
  * @description A Sample unit test for CartCalculateSample.
  */
@@ -109,12 +115,33 @@ global class CartCalculateSampleUnitTest {
         assertUnexpectedCalculations(cart, new List<String>{CART_REPRICED, INVENTORY_CHECKED, SHIPPING_RECALCULATED, POST_SHIPPING_COMPLETED, TAXES_RECALCULATED});
     }
 
+    @IsTest
+    public static void shouldRunPromotionsAndShippingAndPostShippingAndTaxesWhenBuyerAddsCouponDuringCheckout() {
+        // Arrange Cart
+        CartExtension.Cart cart = arrangeCart('Checkout');
+
+        // Arrange BuyerActions and BuyerActionDetails as if the Buyer added a coupon at checkout
+        CartExtension.BuyerActionsMock buyerActions = getBuyerActionsForApplyCouponAtCheckout(cart);
+        CartExtension.BuyerActionDetails buyerActionDetails = getBuyerActionDetailsForApplyCoupon(cart.getCartAdjustmentBases().get(0));
+        CartExtension.OptionalBuyerActionDetails optionalBuyerActionDetails = CartExtension.OptionalBuyerActionDetails.of(buyerActionDetails);
+
+        // Act
+        act(new CartExtension.CartCalculateOrchestratorRequest(cart, buyerActions, optionalBuyerActionDetails));
+
+        // Assert
+        assertNoCartValidationOutputs(cart);
+        assertExpectedCalculations(cart, new List<String>{PROMOTIONS_RECALCULATED, SHIPPING_RECALCULATED, POST_SHIPPING_COMPLETED, TAXES_RECALCULATED});
+        assertUnexpectedCalculations(cart, new List<String>{CART_REPRICED, INVENTORY_CHECKED});
+
+
+    }
+
     @IsTest
     public static void shouldRunPromotionsWhenBuyerRemovesCoupon() {
         // Arrange Cart
         CartExtension.Cart cart = arrangeCart();
 
-        // Arrange BuyerActions and BuyerActionDetails as if the Buyer added a coupon
+        // Arrange BuyerActions and BuyerActionDetails as if the Buyer deleted a coupon
         CartExtension.BuyerActionsMock buyerActions = getBuyerActionsForDeleteCoupon(cart);
         CartExtension.BuyerActionDetails buyerActionDetails = getBuyerActionDetailsForDeleteCoupon();
         CartExtension.OptionalBuyerActionDetails optionalBuyerActionDetails = CartExtension.OptionalBuyerActionDetails.of(buyerActionDetails);
@@ -225,6 +252,28 @@ global class CartCalculateSampleUnitTest {
         return CartExtension.CartTestUtil.getCart(testCart.Id);
     }
 
+    private static CartExtension.Cart arrangeCart(String cartStatus) {
+        Account testAccount = new Account(Name='My Account');
+        insert testAccount;
+
+        WebStore testWebStore = new WebStore(Name='My WebStore');
+        insert testWebStore;
+
+        WebCart testCart = new WebCart(Name='My Cart', WebStoreId=testWebStore.Id, AccountId=testAccount.Id, Status=cartStatus);
+        insert testCart;
+
+        CartDeliveryGroup testDeliveryGroup = new CartDeliveryGroup(Name='My Delivery Group', CartId=testCart.Id);
+        insert testDeliveryGroup;
+
+        CartItem testCartItem = new CartItem(Name='My Cart Item', CartId=testCart.Id, CartDeliveryGroupId=testDeliveryGroup.Id);
+        insert testCartItem;
+
+        WebCartAdjustmentBasis testCartAdjustmentBasis = new WebCartAdjustmentBasis(Name='My Coupon', WebCartId=testCart.Id);
+        insert testCartAdjustmentBasis;
+
+        return CartExtension.CartTestUtil.getCart(testCart.Id);
+    }
+
     private static void act(CartExtension.CartCalculateOrchestratorRequest request) {
         Test.startTest();
         cartCalculateSample.calculate(request);
@@ -357,6 +406,10 @@ global class CartCalculateSampleUnitTest {
         return getCouponChangedBuyerActions(cart);
     }
 
+    private static CartExtension.BuyerActionsMock getBuyerActionsForApplyCouponAtCheckout(CartExtension.Cart cart) {
+        return getCouponChangedAtCheckoutBuyerActions(cart);
+    }
+
     private static CartExtension.BuyerActionDetails getBuyerActionDetailsForApplyCoupon(CartExtension.CartAdjustmentBasis cartAdjustmentBasis) {
         CartExtension.CouponChange couponChange = new CartExtension.CouponChange.Builder()
                                                             .withChangedAdjustmentBasis(CartExtension.OptionalCartAdjustmentBasis.of(cartAdjustmentBasis))
@@ -462,4 +515,10 @@ global class CartCalculateSampleUnitTest {
         buyerActions.setCouponChanged(True);
         return buyerActions;
     }
-}
+
+    private static CartExtension.BuyerActionsMock getCouponChangedAtCheckoutBuyerActions(CartExtension.Cart cart) {
+        CartExtension.BuyerActionsMock buyerActions = new CartExtension.BuyerActionsMock(cart);
+        buyerActions.setCouponChanged(True);
+        return buyerActions;
+    }
+}

commerce/domain/pricing/cart/calculator/EstimatedActualPricingCalculator.cls

@@ -65,7 +65,7 @@ public class EstimatedActualPricingCalculator extends CartExtension.PricingCartC
         if (pricingDataMap == Null) {
             // No data returned means there is an issue with underlying 3rd party service. Populate generic error message for the Buyer.
             CartExtension.CartValidationOutput cvo = new CartExtension.CartValidationOutput(
-                                                        CartExtension.CartValidationOutputTypeEnum.SHIPPING,
+                                                        CartExtension.CartValidationOutputTypeEnum.PRICING,
                                                         CartExtension.CartValidationOutputLevelEnum.ERROR);
             String errorMessage = getGenericErrorMessage();
             cvo.setMessage(errorMessage);

commerce/domain/pricing/service/classes/PricingServiceSample.cls

@@ -100,6 +100,9 @@ public class PricingServiceSample extends commercestorepricing.PricingService {
   // amount, total adjustment amount and total amount. Item level - line id, product id, unit price,
   // list price, unit pricebook entry id, unit adjustment amount, total line amount, total adjustment
   // amount, total price, and total list price.
+  //
+  // Caution: If you're overriding fields containing Salesforce IDs, ensure that they are valid IDs. Otherwise,
+  // subsequent operations may fail unexpectedly.
   public override commercestorepricing.TransactionalPricingResponse processTransactionalPrice(
     commercestorepricing.TransactionalPricingRequest request2
   ) {
@@ -123,7 +126,6 @@ public class PricingServiceSample extends commercestorepricing.PricingService {
     commercestorepricing.TxnPricingResponseItemCollection txnItemCollection = txnResponse.getTxnPricingResponseItems();
     for (Integer j = 0; j < txnItemCollection.size(); j++) {
       commercestorepricing.TransactionalPricingResponseItem txnItem = txnItemCollection.get(j);
-      txnItem.setLineId(appendField(prefix, txnItem.getLineId()));
       txnItem.setProductId(appendField(prefix, txnItem.getProductId()));
       txnItem.setUnitPricePriceBookEntryId(
         appendField(prefix, txnItem.getUnitPricePriceBookEntryId())
@@ -139,13 +141,18 @@ public class PricingServiceSample extends commercestorepricing.PricingService {
       txnResponse.getTotalProductAmount() + txnResponse.getTotalAdjustmentAmount()
     );
 
-    if (!txnItemCollection.isEmpty()) {
-      // Override success/failure of a product easily by adding an error message to the product. Here
-      // we are failing the first product in the response.
-      String customErrorMessage = 'We no longer sell this particular product.';
-      String localizedErrorMessage = 'Wir verkaufen dieses spezielle Produkt nicht mehr.';
-      txnItemCollection.get(0).setError(customErrorMessage, localizedErrorMessage);
-    }
+    /**
+     * Override success/failure of a product easily by adding an error message to the product.
+     * Here is a sample code demonstrating how to set error messages for products.
+     * We are failing the first product in the response.
+     * Warning: Uncommenting the code below will cause cart operations to fail.
+     */
+    // if (!txnItemCollection.isEmpty()) {
+    //  String customErrorMessage = 'We no longer sell this particular product.';
+    //  String localizedErrorMessage = 'Wir verkaufen dieses spezielle Produkt nicht mehr.';
+    //  txnItemCollection.get(0).setError(customErrorMessage, localizedErrorMessage);
+    // }
+
     return txnResponse;
   }