Skip to content
Merged
16 changes: 16 additions & 0 deletions Networking/Networking/Model/Address.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,22 @@ public struct Address: Decodable {
public let country: String
public let phone: String?
public let email: String?

/// Designated Initializer.
///
public init(firstName: String, lastName: String, company: String?, address1: String, address2: String?, city: String, state: String, postcode: String, country: String, phone: String?, email: String?) {
self.firstName = firstName
self.lastName = lastName
self.company = company
self.address1 = address1
self.address2 = address2
self.city = city
self.state = state
self.postcode = postcode
self.country = country
self.phone = phone
self.email = email
}
}


Expand Down
2 changes: 1 addition & 1 deletion Networking/Networking/Model/Order.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public struct Order: Decodable {

/// Order struct initializer.
///
init(orderID: Int, parentID: Int, customerID: Int, number: String, status: OrderStatus, currency: String, customerNote: String?, dateCreated: Date, dateModified: Date, datePaid: Date?, discountTotal: String, discountTax: String, shippingTotal: String, shippingTax: String, total: String, totalTax: String, paymentMethodTitle: String, items: [OrderItem], billingAddress: Address, shippingAddress: Address, coupons: [OrderCouponLine]) {
public init(orderID: Int, parentID: Int, customerID: Int, number: String, status: OrderStatus, currency: String, customerNote: String?, dateCreated: Date, dateModified: Date, datePaid: Date?, discountTotal: String, discountTax: String, shippingTotal: String, shippingTax: String, total: String, totalTax: String, paymentMethodTitle: String, items: [OrderItem], billingAddress: Address, shippingAddress: Address, coupons: [OrderCouponLine]) {

self.orderID = orderID
self.parentID = parentID
Expand Down
9 changes: 9 additions & 0 deletions Networking/Networking/Model/OrderCouponLine.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ public struct OrderCouponLine: Decodable {
public let code: String
public let discount: String
public let discountTax: String

/// OrderCouponLine struct initializer.
///
public init(couponID: Int, code: String, discount: String, discountTax: String) {
self.couponID = couponID
self.code = code
self.discount = discount
self.discountTax = discountTax
}
}


Expand Down
16 changes: 16 additions & 0 deletions Networking/Networking/Model/OrderItem.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,22 @@ public struct OrderItem: Decodable {
public let total: String
public let totalTax: String
public let variationID: Int

/// OrderItem struct initializer.
///
public init(itemID: Int, name: String, productID: Int, quantity: Int, sku: String, subtotal: String, subtotalTax: String, taxClass: String, total: String, totalTax: String, variationID: Int) {
self.itemID = itemID
self.name = name
self.productID = productID
self.quantity = quantity
self.sku = sku
self.subtotal = subtotal
self.subtotalTax = subtotalTax
self.taxClass = taxClass
self.total = total
self.totalTax = totalTax
self.variationID = variationID
}
}


Expand Down
2 changes: 1 addition & 1 deletion Networking/Networking/Model/OrderNote.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public struct OrderNote: Decodable {
public let note: String
public let isCustomerNote: Bool

/// Order struct initializer.
/// OrderNote struct initializer.
///
init(noteId: Int, dateCreated: Date, note: String, isCustomerNote: Bool) {
self.noteId = noteId
Expand Down
24 changes: 24 additions & 0 deletions Storage/Storage.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
/* Begin PBXBuildFile section */
68BC97FB41770051C287D1A8 /* Pods_StorageTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47556EE256120BEE49FF5FD3 /* Pods_StorageTests.framework */; };
7028A41485A08AC748206184 /* Pods_Storage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF3D3B298350F68191CD1DAD /* Pods_Storage.framework */; };
7426A04720F68F27002A4E07 /* Order+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7426A04320F68F27002A4E07 /* Order+CoreDataClass.swift */; };
7426A04820F68F27002A4E07 /* Order+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7426A04420F68F27002A4E07 /* Order+CoreDataProperties.swift */; };
7426A05020F69D00002A4E07 /* OrderCoupon+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7426A04E20F69D00002A4E07 /* OrderCoupon+CoreDataClass.swift */; };
7426A05120F69D00002A4E07 /* OrderCoupon+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7426A04F20F69D00002A4E07 /* OrderCoupon+CoreDataProperties.swift */; };
7426A05420F69DA4002A4E07 /* OrderItem+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7426A05220F69DA4002A4E07 /* OrderItem+CoreDataClass.swift */; };
7426A05520F69DA4002A4E07 /* OrderItem+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7426A05320F69DA4002A4E07 /* OrderItem+CoreDataProperties.swift */; };
B505255420EE6914008090F5 /* StorageType+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B505255320EE6914008090F5 /* StorageType+Extensions.swift */; };
B505F6DA20BEEA3200BB1B69 /* Account+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = B505F6D820BEEA3100BB1B69 /* Account+CoreDataProperties.swift */; };
B505F6DB20BEEA3200BB1B69 /* Account+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = B505F6D920BEEA3200BB1B69 /* Account+CoreDataClass.swift */; };
Expand Down Expand Up @@ -46,6 +52,12 @@
/* Begin PBXFileReference section */
47556EE256120BEE49FF5FD3 /* Pods_StorageTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_StorageTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5D12CAE2D0EA6AB66F162FF9 /* Pods-StorageTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StorageTests.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-StorageTests/Pods-StorageTests.debug.xcconfig"; sourceTree = "<group>"; };
7426A04320F68F27002A4E07 /* Order+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Order+CoreDataClass.swift"; sourceTree = "<group>"; };
7426A04420F68F27002A4E07 /* Order+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Order+CoreDataProperties.swift"; sourceTree = "<group>"; };
7426A04E20F69D00002A4E07 /* OrderCoupon+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OrderCoupon+CoreDataClass.swift"; sourceTree = "<group>"; };
7426A04F20F69D00002A4E07 /* OrderCoupon+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OrderCoupon+CoreDataProperties.swift"; sourceTree = "<group>"; };
7426A05220F69DA4002A4E07 /* OrderItem+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OrderItem+CoreDataClass.swift"; sourceTree = "<group>"; };
7426A05320F69DA4002A4E07 /* OrderItem+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OrderItem+CoreDataProperties.swift"; sourceTree = "<group>"; };
7C81935EDD982072BBDCC837 /* Pods-Storage.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Storage.release.xcconfig"; path = "../Pods/Target Support Files/Pods-Storage/Pods-Storage.release.xcconfig"; sourceTree = "<group>"; };
A3821B262583F14863740A37 /* Pods-Storage.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Storage.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-Storage/Pods-Storage.debug.xcconfig"; sourceTree = "<group>"; };
B505255320EE6914008090F5 /* StorageType+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "StorageType+Extensions.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -226,6 +238,12 @@
B505F6D820BEEA3100BB1B69 /* Account+CoreDataProperties.swift */,
B5B914C320EFF03500F2F832 /* Site+CoreDataClass.swift */,
B5B914C420EFF03500F2F832 /* Site+CoreDataProperties.swift */,
7426A04320F68F27002A4E07 /* Order+CoreDataClass.swift */,
7426A04420F68F27002A4E07 /* Order+CoreDataProperties.swift */,
7426A04E20F69D00002A4E07 /* OrderCoupon+CoreDataClass.swift */,
7426A04F20F69D00002A4E07 /* OrderCoupon+CoreDataProperties.swift */,
7426A05220F69DA4002A4E07 /* OrderItem+CoreDataClass.swift */,
7426A05320F69DA4002A4E07 /* OrderItem+CoreDataProperties.swift */,
);
path = Model;
sourceTree = "<group>";
Expand Down Expand Up @@ -411,16 +429,22 @@
files = (
B5B914C520EFF03500F2F832 /* Site+CoreDataClass.swift in Sources */,
B54CA5BB20A4BD2800F38CD1 /* NSManagedObject+Object.swift in Sources */,
7426A05120F69D00002A4E07 /* OrderCoupon+CoreDataProperties.swift in Sources */,
B5B914C620EFF03500F2F832 /* Site+CoreDataProperties.swift in Sources */,
7426A04820F68F27002A4E07 /* Order+CoreDataProperties.swift in Sources */,
B505F6DB20BEEA3200BB1B69 /* Account+CoreDataClass.swift in Sources */,
7426A05520F69DA4002A4E07 /* OrderItem+CoreDataProperties.swift in Sources */,
7426A04720F68F27002A4E07 /* Order+CoreDataClass.swift in Sources */,
B54CA5BD20A4BD3B00F38CD1 /* NSManagedObjectContext+Storage.swift in Sources */,
B59E11DA20A9D00C004121A4 /* WooCommerce.xcdatamodeld in Sources */,
B52B0F7920AA287C00477698 /* StorageManagerType.swift in Sources */,
7426A05420F69DA4002A4E07 /* OrderItem+CoreDataClass.swift in Sources */,
B505F6E020BEEA8100BB1B69 /* StorageType.swift in Sources */,
B54CA5C920A4C17800F38CD1 /* NSObject+Storage.swift in Sources */,
B505F6DA20BEEA3200BB1B69 /* Account+CoreDataProperties.swift in Sources */,
B505255420EE6914008090F5 /* StorageType+Extensions.swift in Sources */,
B52B0F7B20AA28A800477698 /* Object.swift in Sources */,
7426A05020F69D00002A4E07 /* OrderCoupon+CoreDataClass.swift in Sources */,
B505F6DE20BEEA4F00BB1B69 /* CoreDataManager.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
8 changes: 8 additions & 0 deletions Storage/Storage/Model/Order+CoreDataClass.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import Foundation
import CoreData


@objc(Order)
public class Order: NSManagedObject {

}
86 changes: 86 additions & 0 deletions Storage/Storage/Model/Order+CoreDataProperties.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
import Foundation
import CoreData


extension Order {

@nonobjc public class func fetchRequest() -> NSFetchRequest<Order> {
return NSFetchRequest<Order>(entityName: "Order")
}

@NSManaged public var currency: String?
@NSManaged public var customerID: Int64
@NSManaged public var customerNote: String?
@NSManaged public var dateCreated: Date?
@NSManaged public var dateModified: Date?
@NSManaged public var datePaid: Date?
@NSManaged public var discountTax: String?
@NSManaged public var discountTotal: String?
@NSManaged public var number: String?
@NSManaged public var orderID: Int64
@NSManaged public var parentID: Int64
@NSManaged public var paymentMethodTitle: String?
@NSManaged public var shippingTax: String?
@NSManaged public var shippingTotal: String?
@NSManaged public var status: String
@NSManaged public var total: String?
@NSManaged public var totalTax: String?
@NSManaged public var billingFirstName: String?
@NSManaged public var billingLastName: String?
@NSManaged public var billingCountry: String?
@NSManaged public var billingPostcode: String?
@NSManaged public var billingState: String?
@NSManaged public var billingCity: String?
@NSManaged public var billingAddress2: String?
@NSManaged public var billingAddress1: String?
@NSManaged public var billingCompany: String?
@NSManaged public var billingPhone: String?
@NSManaged public var billingEmail: String?
@NSManaged public var shippingFirstName: String?
@NSManaged public var shippingLastName: String?
@NSManaged public var shippingCompany: String?
@NSManaged public var shippingAddress1: String?
@NSManaged public var shippingAddress2: String?
@NSManaged public var shippingCity: String?
@NSManaged public var shippingPostcode: String?
@NSManaged public var shippingCountry: String?
@NSManaged public var shippingPhone: String?
@NSManaged public var shippingEmail: String?
@NSManaged public var shippingState: String?
@NSManaged public var coupons: Set<OrderCoupon>?
@NSManaged public var items: Set<OrderItem>?
}

// MARK: Generated accessors for coupons
extension Order {

@objc(addCouponsObject:)
@NSManaged public func addToCoupons(_ value: OrderCoupon)

@objc(removeCouponsObject:)
@NSManaged public func removeFromCoupons(_ value: OrderCoupon)

@objc(addCoupons:)
@NSManaged public func addToCoupons(_ values: NSSet)

@objc(removeCoupons:)
@NSManaged public func removeFromCoupons(_ values: NSSet)

}

// MARK: Generated accessors for items
extension Order {

@objc(addItemsObject:)
@NSManaged public func addToItems(_ value: OrderItem)

@objc(removeItemsObject:)
@NSManaged public func removeFromItems(_ value: OrderItem)

@objc(addItems:)
@NSManaged public func addToItems(_ values: NSSet)

@objc(removeItems:)
@NSManaged public func removeFromItems(_ values: NSSet)

}
8 changes: 8 additions & 0 deletions Storage/Storage/Model/OrderCoupon+CoreDataClass.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import Foundation
import CoreData


@objc(OrderCoupon)
public class OrderCoupon: NSManagedObject {

}
16 changes: 16 additions & 0 deletions Storage/Storage/Model/OrderCoupon+CoreDataProperties.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import Foundation
import CoreData


extension OrderCoupon {

@nonobjc public class func fetchRequest() -> NSFetchRequest<OrderCoupon> {
return NSFetchRequest<OrderCoupon>(entityName: "OrderCoupon")
}

@NSManaged public var couponID: Int64
@NSManaged public var code: String?
@NSManaged public var discount: String?
@NSManaged public var discountTax: String?
@NSManaged public var order: Order
}
8 changes: 8 additions & 0 deletions Storage/Storage/Model/OrderItem+CoreDataClass.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import Foundation
import CoreData


@objc(OrderItem)
public class OrderItem: NSManagedObject {

}
23 changes: 23 additions & 0 deletions Storage/Storage/Model/OrderItem+CoreDataProperties.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import Foundation
import CoreData


extension OrderItem {

@nonobjc public class func fetchRequest() -> NSFetchRequest<OrderItem> {
return NSFetchRequest<OrderItem>(entityName: "OrderItem")
}

@NSManaged public var itemID: Int64
@NSManaged public var name: String?
@NSManaged public var quantity: Int16
@NSManaged public var productID: Int64
@NSManaged public var sku: String?
@NSManaged public var subtotal: String?
@NSManaged public var subtotalTax: String?
@NSManaged public var taxClass: String?
@NSManaged public var total: String?
@NSManaged public var totalTax: String?
@NSManaged public var variationID: Int64
@NSManaged public var order: Order
}
Loading