Re-generate OrderItem+CoreDataProperties

woocommerce · Oct 24, 2019 · bb25874 · bb25874
1 parent b2e06ff
commit bb25874
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/Storage/Storage/Model/OrderItem+CoreDataProperties.swift b/Storage/Storage/Model/OrderItem+CoreDataProperties.swift
@@ -25,19 +25,19 @@ extension OrderItem {
 
 }
 
-// MARK: Generated accessors for tax
+// MARK: Generated accessors for taxes
 extension OrderItem {
 
-    @objc(addTaxObject:)
+    @objc(addTaxesObject:)
     @NSManaged public func addToTaxes(_ value: OrderItemTax)
 
-    @objc(removeTaxObject:)
+    @objc(removeTaxesObject:)
     @NSManaged public func removeFromTaxes(_ value: OrderItemTax)
 
-    @objc(addTax:)
+    @objc(addTaxes:)
     @NSManaged public func addToTaxes(_ values: NSSet)
 
-    @objc(removeTax:)
+    @objc(removeTaxes:)
     @NSManaged public func removeFromTaxes(_ values: NSSet)
 
 }
diff --git a/Storage/Storage/Model/WooCommerce.xcdatamodeld/Model 21.xcdatamodel/contents b/Storage/Storage/Model/WooCommerce.xcdatamodeld/Model 21.xcdatamodel/contents
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="15400" systemVersion="19A583" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="15400" systemVersion="19A602" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="Account" representedClassName="Account" syncable="YES">
         <attribute name="displayName" optional="YES" attributeType="String"/>
         <attribute name="email" optional="YES" attributeType="String"/>

diff --git a/Yosemite/Yosemite/Stores/OrderStore.swift b/Yosemite/Yosemite/Stores/OrderStore.swift
@@ -286,15 +286,20 @@ private extension OrderStore {
     /// Updates, inserts, or prunes the provided StorageOrder's items using the provided read-only Order's items
     ///
     private func handleOrderItems(_ readOnlyOrder: Networking.Order, _ storageOrder: Storage.Order, _ storage: StorageType) {
+        var storageItem: Storage.OrderItem
         // Upsert the items from the read-only order
         for readOnlyItem in readOnlyOrder.items {
             if let existingStorageItem = storage.loadOrderItem(itemID: readOnlyItem.itemID) {
                 existingStorageItem.update(with: readOnlyItem)
+                storageItem = existingStorageItem
             } else {
                 let newStorageItem = storage.insertNewObject(ofType: Storage.OrderItem.self)
                 newStorageItem.update(with: readOnlyItem)
                 storageOrder.addToItems(newStorageItem)
+                storageItem = newStorageItem
             }
+
+            handleOrderItemTaxes(readOnlyItem, storageItem, storage)
         }
 
         // Now, remove any objects that exist in storageOrder.items but not in readOnlyOrder.items