Show modified total price for payment instruments.

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.payments;
 
 import android.app.Activity;
 import android.graphics.Bitmap;
 import android.os.Handler;
 import android.support.v4.util.ArrayMap;
@@ skipping 201 matching lines @@
      */
     private PaymentItem mRawTotal;
 
     /**
      * The raw items in the shopping cart, as they were received from the website. This data is
      * passed to the payment app.
      */
     private List<PaymentItem> mRawLineItems;
 
     /**
+     * A mapping from method names to modified totals. Used to display modified totals for each
+     * payment instrument.
+     */
+    private Map<String, PaymentItem> mModifiedTotals;
+
+    /**
      * The UI model of the shopping cart, including the total. Each item includes a label and a
      * price string. This data is passed to the UI.
      */
     private ShoppingCart mUiShoppingCart;
 
     /**
      * The UI model for the shipping options. Includes the label and sublabel for each shipping
      * option. Also keeps track of the selected shipping option. This data is passed to the UI.
      */
     private SectionInformation mUiShippingOptions;
 
     private Map<String, PaymentMethodData> mMethodData;
     private SectionInformation mShippingAddressesSection;
     private SectionInformation mContactSection;
     private List<PaymentApp> mPendingApps;
     private List<PaymentInstrument> mPendingInstruments;
     private List<PaymentInstrument> mPendingAutofillInstruments;
     private SectionInformation mPaymentMethodsSection;
     private PaymentRequestUI mUI;
     private Callback<PaymentInformation> mPaymentInformationCallback;
     private boolean mPaymentAppRunning;
     private boolean mMerchantSupportsAutofillPaymentInstruments;
     private ContactEditor mContactEditor;
     private boolean mHasRecordedAbortReason;
     private boolean mQueriedCanMakeActivePayment;
+    private CurrencyStringFormatter mFormatter;
 
     /** True if any of the requested payment methods are supported. */
     private boolean mArePaymentMethodsSupported;
 
     /** The helper to create and fill the response to send to the merchant. */
     private PaymentResponseHelper mPaymentResponseHelper;
 
     /**
      * Builds the PaymentRequest service implementation.
      *
@@ skipping 332 matching lines @@
      */
     private boolean parseAndValidateDetailsOrDisconnectFromClient(PaymentDetails details) {
         if (!PaymentValidator.validatePaymentDetails(details)) {
             disconnectFromClientWithDebugMessage("Invalid payment details");
             recordAbortReasonHistogram(
                     PaymentRequestMetrics.ABORT_REASON_INVALID_DATA_FROM_RENDERER);
             return false;
         }
 
         String totalCurrency = details.total.amount.currency;
-        CurrencyStringFormatter formatter =
-                new CurrencyStringFormatter(totalCurrency, Locale.getDefault());
+        if (mFormatter == null) {
+            mFormatter = new CurrencyStringFormatter(totalCurrency, Locale.getDefault());
+        }
 
         // Total is never pending.
         LineItem uiTotal = new LineItem(
-                details.total.label, formatter.getFormattedCurrencyCode(),
-                formatter.format(details.total.amount.value), /* isPending */ false);
+                details.total.label, mFormatter.getFormattedCurrencyCode(),
+                mFormatter.format(details.total.amount.value), /* isPending */ false);
 
-        List<LineItem> uiLineItems = getLineItems(details.displayItems, totalCurrency, formatter);
+        List<LineItem> uiLineItems = getLineItems(details.displayItems, totalCurrency, mFormatter);
 
         mUiShoppingCart = new ShoppingCart(uiTotal, uiLineItems);
         mRawTotal = details.total;
         mRawLineItems = Collections.unmodifiableList(Arrays.asList(details.displayItems));
 
-        mUiShippingOptions = getShippingOptions(details.shippingOptions, totalCurrency, formatter);
+        mUiShippingOptions = getShippingOptions(details.shippingOptions, totalCurrency, mFormatter);
+
+        for (int i = 0; i < details.modifiers.length; i++) {
+            PaymentItem total = details.modifiers[i].total;
+            String[] methods = details.modifiers[i].methodData.supportedMethods;
+            if (total != null) {
+                for (int j = 0; j < methods.length; j++) {
+                    if (mModifiedTotals == null) mModifiedTotals = new ArrayMap<>();
+                    mModifiedTotals.put(methods[j], total);
+                }
+            }
+        }
+
+        updateInstrumentModifiedTotals();
 
         return true;
     }
 
+    /** Updates the modified totals for payment instruments. */
+    private void updateInstrumentModifiedTotals() {
+        if (!ChromeFeatureList.isEnabled(ChromeFeatureList.WEB_PAYMENTS_MODIFIERS)) return;
+        if (mModifiedTotals == null) return;
+        if (mPaymentMethodsSection == null) return;
+
+        for (int i = 0; i < mPaymentMethodsSection.getSize(); i++) {
+            PaymentOption option = mPaymentMethodsSection.getItem(i);
+            assert option instanceof PaymentInstrument;
+            PaymentInstrument instrument = (PaymentInstrument) option;
+            PaymentItem modifiedTotal = mModifiedTotals.get(instrument.getInstrumentMethodName());
+            instrument.setModifiedTotal(
+                    modifiedTotal == null ? null : mFormatter.format(modifiedTotal.amount.value));
+        }
+    }
+
     /**
      * Returns true if all fields in the payment item are non-null and non-empty.
      *
      * @param item The payment item to examine.
      * @return True if all fields are present and non-empty.
      */
     private static boolean hasAllPaymentItemFields(PaymentItem item) {
         // "label", "currency", and "value" should be non-empty.
         return item != null && !TextUtils.isEmpty(item.label) && item.amount != null
                 && !TextUtils.isEmpty(item.amount.currency)
@@ skipping 492 matching lines @@
 
         ActivePaymentQuery query = sCanMakeActivePaymentQueries.get(mOrigin);
         if (query != null) query.setResponse(selection == 0);
 
         // The list of payment instruments is ready to display.
         mPaymentMethodsSection = new SectionInformation(PaymentRequestUI.TYPE_PAYMENT_METHODS,
                 selection, mPendingInstruments);
 
         mPendingInstruments.clear();
 
+        updateInstrumentModifiedTotals();
+
         // UI has requested the full list of payment instruments. Provide it now.
         if (mPaymentInformationCallback != null) providePaymentInformation();
     }
 
     /**
      * If no payment methods are supported, disconnect from the client and return true.
      *
      * @return True if no payment methods are supported
      */
     private boolean disconnectIfNoPaymentMethodsSupported() {
@@ skipping 183 matching lines @@
                 "PaymentRequest.CheckoutFunnel.Aborted", abortReason,
                 PaymentRequestMetrics.ABORT_REASON_MAX);
 
         if (abortReason == PaymentRequestMetrics.ABORT_REASON_ABORTED_BY_USER) {
             mJourneyLogger.recordJourneyStatsHistograms("UserAborted");
         } else {
             mJourneyLogger.recordJourneyStatsHistograms("OtherAborted");
         }
     }
 }