Fix Bot Framework Payments Sample to generate receipt cards that have…

… sales tax and shipping as facts instead of line items (microsoft#161)
gerryhendrickx · Aug 16, 2017 · f122076 · f122076
1 parent 729fab7
commit f122076
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/CSharp/sample-payments/PaymentsBot/Dialogs/RootDialog.cs b/CSharp/sample-payments/PaymentsBot/Dialogs/RootDialog.cs
@@ -169,6 +169,14 @@ private static async Task<Attachment> BuildReceiptCardAsync(PaymentRecord paymen
 
             var receiptItems = new List<ReceiptItem>();
 
+            var facts = new List<Fact>
+            {
+                new Fact(Resources.RootDialog_Receipt_OrderID, paymentRecord.OrderId.ToString()),
+                new Fact(Resources.RootDialog_Receipt_PaymentMethod, paymentRecord.MethodName),
+                new Fact(Resources.RootDialog_Shipping_Address, paymentRecord.ShippingAddress.FullInline()),
+                new Fact(Resources.RootDialog_Shipping_Option, shippingOption != null ? shippingOption.Label : "N/A")
+            };
+
             receiptItems.AddRange(paymentRecord.Items.Select<PaymentItem, ReceiptItem>(item =>
             {
                 if (catalogItem.Title.Equals(item.Label))
@@ -181,24 +189,16 @@ private static async Task<Attachment> BuildReceiptCardAsync(PaymentRecord paymen
                 }
                 else
                 {
-                    return RootDialog.BuildReceiptItem(
-                        item.Label,
-                        null,
-                        $"{item.Amount.Currency} {item.Amount.Value}",
-                        null);
+                    facts.Add(new Fact(item.Label, $"{item.Amount.Currency} {item.Amount.Value}"));
+                    return null;
                 }
-            }));
+            })
+            .Where(item => item != null));
 
             var receiptCard = new ReceiptCard
             {
                 Title = Resources.RootDialog_Receipt_Title,
-                Facts = new List<Fact>
-                {
-                    new Fact(Resources.RootDialog_Receipt_OrderID, paymentRecord.OrderId.ToString()),
-                    new Fact(Resources.RootDialog_Receipt_PaymentMethod, paymentRecord.MethodName),
-                    new Fact(Resources.RootDialog_Shipping_Address, paymentRecord.ShippingAddress.FullInline()),
-                    new Fact(Resources.RootDialog_Shipping_Option, shippingOption != null ? shippingOption.Label : "N/A")
-                },
+                Facts = facts,
                 Items = receiptItems,
                 Tax = null, // Sales Tax is a displayed line item, leave this blank
                 Total = $"{paymentRecord.Total.Amount.Currency} {paymentRecord.Total.Amount.Value}"