Merge branch 'trunk' into woomob-1112-woo-poslocal-catalog-implement-product-search

Author: joshheald

.periphery.yml

@@ -58,8 +58,7 @@ index_exclude:
 - Pods/*
 - vendor/**
 - BuildTools/.build/**
-- "**/Tests/*"
-- "**/Test*/*"
+- "**/*Test*/*"
 - "docs/*"
 - "fastlane/*"
 - "config/*"

Modules/Sources/Networking/Model/Bookings/BookingCustomerInfo.swift

@@ -2,8 +2,10 @@ import Foundation
 
 public struct BookingCustomerInfo: Hashable {
     public let billingAddress: Address
+    public let note: String?
 
-    public init(billingAddress: Address) {
+    public init(billingAddress: Address, note: String? = nil) {
         self.billingAddress = billingAddress
+        self.note = note
     }
 }

Modules/Sources/Networking/Model/Bookings/BookingOrderInfo.swift

@@ -22,7 +22,10 @@ public struct BookingOrderInfo: Hashable {
             guard let billingAddress = order.billingAddress else {
                 return nil
             }
-            return BookingCustomerInfo(billingAddress: billingAddress)
+            return BookingCustomerInfo(
+                billingAddress: billingAddress,
+                note: order.customerNote
+            )
         }()
         self.productInfo = BookingProductInfo(name: order.items.first(where: { $0.productID == booking.productID })?.name ?? "")
         self.paymentInfo = BookingPaymentInfo(

Modules/Sources/Networking/Model/Stats/TopEarnerStatsItem.swift

@@ -73,3 +73,91 @@ extension TopEarnerStatsItem: Identifiable {
         productID
     }
 }
+
+// MARK: - Helper to init Product
+//
+public extension Product {
+    init(siteID: Int64,
+         productID: Int64,
+         name: String,
+         images: [ProductImage]) {
+        self.init(siteID: siteID,
+                  productID: productID,
+                  name: name,
+                  slug: "",
+                  permalink: "",
+                  date: Date(),
+                  dateCreated: Date(),
+                  dateModified: nil,
+                  dateOnSaleStart: nil,
+                  dateOnSaleEnd: nil,
+                  productTypeKey: ProductType.simple.rawValue,
+                  statusKey: ProductStatus.draft.rawValue,
+                  featured: false,
+                  catalogVisibilityKey: ProductCatalogVisibility.visible.rawValue,
+                  fullDescription: "",
+                  shortDescription: "",
+                  sku: "",
+                  globalUniqueID: "",
+                  price: "",
+                  regularPrice: "",
+                  salePrice: "",
+                  onSale: false,
+                  purchasable: false,
+                  totalSales: 0,
+                  virtual: false,
+                  downloadable: false,
+                  downloads: [],
+                  downloadLimit: -1,
+                  downloadExpiry: -1,
+                  buttonText: "",
+                  externalURL: "",
+                  taxStatusKey: ProductTaxStatus.taxable.rawValue,
+                  taxClass: "",
+                  manageStock: false,
+                  stockQuantity: nil,
+                  stockStatusKey: ProductStockStatus.inStock.rawValue,
+                  backordersKey: ProductBackordersSetting.notAllowed.rawValue,
+                  backordersAllowed: false,
+                  backordered: false,
+                  soldIndividually: false,
+                  weight: "",
+                  dimensions: ProductDimensions(length: "", width: "", height: ""),
+                  shippingRequired: true,
+                  shippingTaxable: true,
+                  shippingClass: "",
+                  shippingClassID: 0,
+                  productShippingClass: nil,
+                  reviewsAllowed: true,
+                  averageRating: "",
+                  ratingCount: 0,
+                  relatedIDs: [],
+                  upsellIDs: [],
+                  crossSellIDs: [],
+                  parentID: 0,
+                  purchaseNote: "",
+                  categories: [],
+                  tags: [],
+                  images: images,
+                  attributes: [],
+                  defaultAttributes: [],
+                  variations: [],
+                  groupedProducts: [],
+                  menuOrder: 0,
+                  addOns: [],
+                  isSampleItem: false,
+                  bundleStockStatus: nil,
+                  bundleStockQuantity: nil,
+                  bundleMinSize: nil,
+                  bundleMaxSize: nil,
+                  bundledItems: [],
+                  password: nil,
+                  compositeComponents: [],
+                  subscription: nil,
+                  minAllowedQuantity: nil,
+                  maxAllowedQuantity: nil,
+                  groupOfQuantity: nil,
+                  combineVariationQuantities: nil,
+                  customFields: [])
+    }
+}

Modules/Sources/Storage/Model/Booking/BookingCustomerInfo+CoreDataProperties.swift

@@ -13,6 +13,7 @@ extension BookingCustomerInfo {
     @NSManaged public var billingPhone: String?
     @NSManaged public var billingPostcode: String?
     @NSManaged public var billingState: String?
+    @NSManaged public var note: String?
     @NSManaged public var orderInfo: BookingOrderInfo?
 
 }

Modules/Sources/Storage/Resources/WooCommerce.xcdatamodeld/.xccurrentversion

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>Model 130.xcdatamodel</string>
+	<string>Model 131.xcdatamodel</string>
 </dict>
 </plist>