Add shipping row to the payment section of the new order screen

Author: ealeksandrov

WooCommerce/Classes/ViewRelated/Orders/Order Creation/NewOrderViewModel.swift

@@ -387,10 +387,17 @@ extension NewOrderViewModel {
         let itemsTotal: String
         let orderTotal: String
 
+        let shouldShowShippingTotal: Bool
+        let shippingTotal: String
+
         init(itemsTotal: String = "",
+             shouldShowShippingTotal: Bool = false,
+             shippingTotal: String = "",
              orderTotal: String = "",
              currencyFormatter: CurrencyFormatter = CurrencyFormatter(currencySettings: ServiceLocator.currencySettings)) {
             self.itemsTotal = currencyFormatter.formatAmount(itemsTotal) ?? ""
+            self.shouldShowShippingTotal = shouldShowShippingTotal
+            self.shippingTotal = currencyFormatter.formatAmount(shippingTotal) ?? ""
             self.orderTotal = currencyFormatter.formatAmount(orderTotal) ?? ""
         }
     }
@@ -493,10 +500,15 @@ private extension NewOrderViewModel {
                     .map { $0.orderItem.subtotal }
                     .compactMap { self.currencyFormatter.convertToDecimal(from: $0) }
                     .reduce(NSDecimalNumber(value: 0), { $0.adding($1) })
-                    .stringValue
 
-                // For now, the order total is the same as the items total
-                return PaymentDataViewModel(itemsTotal: itemsTotal, orderTotal: itemsTotal, currencyFormatter: self.currencyFormatter)
+                let shippingTotal = NSDecimalNumber(value: 0)
+                let orderTotal = itemsTotal.adding(shippingTotal)
+
+                return PaymentDataViewModel(itemsTotal: itemsTotal.stringValue,
+                                            shouldShowShippingTotal: false,
+                                            shippingTotal: shippingTotal.stringValue,
+                                            orderTotal: orderTotal.stringValue,
+                                            currencyFormatter: self.currencyFormatter)
             }
             .assign(to: &$paymentDataViewModel)
     }

WooCommerce/Classes/ViewRelated/Orders/Order Creation/PaymentSection/OrderPaymentSection.swift

@@ -20,6 +20,16 @@ struct OrderPaymentSection: View {
 
             TitleAndValueRow(title: Localization.productsTotal, value: .content(viewModel.itemsTotal), selectable: false) {}
 
+            if viewModel.shouldShowShippingTotal {
+                TitleAndValueRow(title: Localization.shippingTotal, value: .content(viewModel.shippingTotal), selectable: true) {
+                }
+            } else {
+                Button(Localization.addShipping) {
+                }
+                .buttonStyle(PlusButtonStyle())
+                .padding()
+            }
+
             TitleAndValueRow(title: Localization.orderTotal, value: .content(viewModel.orderTotal), bold: true, selectable: false) {}
 
             Text(Localization.taxesInfo)
@@ -41,6 +51,8 @@ private extension OrderPaymentSection {
         static let orderTotal = NSLocalizedString("Order Total", comment: "Label for the the row showing the total cost of the order")
         static let taxesInfo = NSLocalizedString("Taxes will be automatically calculated based on your store settings.",
                                                  comment: "Information about taxes and the order total when creating a new order")
+        static let addShipping = NSLocalizedString("Add shipping", comment: "Title text of the button that adds shipping line when creating a new order")
+        static let shippingTotal = NSLocalizedString("Shipping", comment: "Label for the row showing the cost of shipping in the order")
     }
 }