Skip to content

Commit ee4b53a

Browse files
authored
Merge pull request #7054 from woocommerce/issue/6976-add-is-editable-cd-model
Unified Order Editing] Add new Order properties to Core Data
2 parents 2085fe6 + c42ae38 commit ee4b53a

File tree

6 files changed

+896
-2
lines changed

6 files changed

+896
-2
lines changed

Storage/Storage.xcodeproj/project.pbxproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@
302302
2685C107263C88B000D9EE97 /* AddOnGroup+CoreDataProperties.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "AddOnGroup+CoreDataProperties.swift"; sourceTree = "<group>"; };
303303
2685C11C263DEF0B00D9EE97 /* StorageTypeDeletionsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageTypeDeletionsTests.swift; sourceTree = "<group>"; };
304304
268BF6DA2642CBA5003948D8 /* Models+Copiable.generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Models+Copiable.generated.swift"; sourceTree = "<group>"; };
305+
268FEC8528513A470005E4C2 /* Model 69.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Model 69.xcdatamodel"; sourceTree = "<group>"; };
305306
26B64554259CE7A800EF3FB3 /* ProductAttributeTerm+CoreDataProperties.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ProductAttributeTerm+CoreDataProperties.swift"; sourceTree = "<group>"; };
306307
26B64555259CE7A800EF3FB3 /* ProductAttributeTerm+CoreDataClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ProductAttributeTerm+CoreDataClass.swift"; sourceTree = "<group>"; };
307308
26EA01D024EC3AEA00176A57 /* FeedbackType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbackType.swift; sourceTree = "<group>"; };
@@ -1779,6 +1780,7 @@
17791780
DEC51AA4275B41BE009F3DF4 /* WooCommerce.xcdatamodeld */ = {
17801781
isa = XCVersionGroup;
17811782
children = (
1783+
268FEC8528513A470005E4C2 /* Model 69.xcdatamodel */,
17821784
45260E412823E7990080C548 /* Model 68.xcdatamodel */,
17831785
265A462127FDDAAF003AB1DA /* Model 67.xcdatamodel */,
17841786
457E6E7F27D8B51E00173F69 /* Model 66.xcdatamodel */,
@@ -1848,7 +1850,7 @@
18481850
DEC51ADE275B41BE009F3DF4 /* Model 47.xcdatamodel */,
18491851
DEC51ADF275B41BE009F3DF4 /* Model 19.xcdatamodel */,
18501852
);
1851-
currentVersion = 45260E412823E7990080C548 /* Model 68.xcdatamodel */;
1853+
currentVersion = 268FEC8528513A470005E4C2 /* Model 69.xcdatamodel */;
18521854
path = WooCommerce.xcdatamodeld;
18531855
sourceTree = "<group>";
18541856
versionGroupType = wrapper.xcdatamodel;

Storage/Storage/Model/MIGRATIONS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
This file documents changes in the WCiOS Storage data model. Please explain any changes to the data model as well as any custom migrations.
44

5+
## Model 69 (Release 9.4.0.0)
6+
- @ecarrion 2022-06-08
7+
- Update `Order` entity to include the `needsProcessing`, `needsPayment`, and `isEditable` properties.
8+
59
## Model 68 (Release 9.2.0.0)
610
- @pmusolino 2022-05-05
711
- Update `Coupon` entity and make `usageLimit`, `usageLimitPerUser` and `limitUsageToXItems` properties as optional with default value equal to `null`.

Storage/Storage/Model/Order+CoreDataProperties.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ extension Order {
3030
@NSManaged public var discountTotal: String?
3131
@NSManaged public var exclusiveForSearch: Bool
3232
@NSManaged public var fees: Set<OrderFeeLine>?
33+
@NSManaged public var isEditable: Bool
34+
@NSManaged public var needsPayment: Bool
35+
@NSManaged public var needsProcessing: Bool
3336
@NSManaged public var number: String?
3437
@NSManaged public var orderID: Int64
3538
@NSManaged public var parentID: Int64

Storage/Storage/Model/WooCommerce.xcdatamodeld/.xccurrentversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<plist version="1.0">
44
<dict>
55
<key>_XCCurrentVersionName</key>
6-
<string>Model 68.xcdatamodel</string>
6+
<string>Model 69.xcdatamodel</string>
77
</dict>
88
</plist>

0 commit comments

Comments
 (0)