Rename Quick Order to Simple Payments

ealeksandrov · ealeksandrov · commit 77e13e355798 · 2021-11-19T17:24:43.000+03:00
diff --git a/WooCommerce/Classes/Extensions/UIImage+Woo.swift b/WooCommerce/Classes/Extensions/UIImage+Woo.swift
@@ -584,10 +584,10 @@ extension UIImage {
             .imageWithTintColor(tintColor)!
     }
 
-    /// Quick Order Icon
+    /// Simple Payments Icon
     ///
-    static var quickOrderImage: UIImage {
-        return UIImage(named: "icon-quick-order")!
+    static var simplePaymentsImage: UIImage {
+        return UIImage(named: "icon-simple-payments")!
     }
 
     /// Work In Progress banner icon on the Products Tab
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Creation/AddOrderCoordinator.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Creation/AddOrderCoordinator.swift
@@ -36,7 +36,7 @@ final class AddOrderCoordinator: Coordinator {
         case (true, true):
             presentOrderTypeBottomSheet()
         case (false, true):
-            presentOrderCreationFlow(bottomSheetOrderType: .quick)
+            presentOrderCreationFlow(bottomSheetOrderType: .simple)
         case (true, false):
             presentOrderCreationFlow(bottomSheetOrderType: .full)
         case (false, false):
@@ -60,7 +60,7 @@ private extension AddOrderCoordinator {
 
     func presentOrderCreationFlow(bottomSheetOrderType: BottomSheetOrderType) {
         switch bottomSheetOrderType {
-        case .quick:
+        case .simple:
             presentSimplePaymentsAmountController()
         case .full:
             presentNewOrderController()
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Creation/BottomSheetOrderType.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Creation/BottomSheetOrderType.swift
@@ -1,41 +1,41 @@
 import Yosemite
 
 public enum BottomSheetOrderType: Hashable {
-    case quick
+    case simple
     case full
 
     /// Title shown on the action sheet.
     ///
     var actionSheetTitle: String {
         switch self {
+        case .simple:
+            return NSLocalizedString("Simple Payments",
+                                     comment: "Action sheet option when the user wants to create Simple Payments order")
         case .full:
             return NSLocalizedString("Create order",
                                      comment: "Action sheet option when the user wants to create full manual order")
-        case .quick:
-            return NSLocalizedString("Quick order",
-                                     comment: "Action sheet option when the user wants to create quick order")
         }
     }
 
     /// Description shown on the action sheet.
     ///
     var actionSheetDescription: String {
         switch self {
+        case .simple:
+            return NSLocalizedString("Create an order with minimal information",
+                                     comment: "Description of the Action sheet option when the user wants to create Simple Payments order")
         case .full:
             return NSLocalizedString("Create a new manual order",
                                      comment: "Description of the Action sheet option when the user wants to create full manual order")
-        case .quick:
-            return NSLocalizedString("Create an order with minimal information",
-                                     comment: "Description of the Action sheet option when the user wants to create quick order")
         }
     }
 
     /// Image shown on the action sheet.
     ///
     var actionSheetImage: UIImage {
         switch self {
-        case .quick:
-            return UIImage.quickOrderImage
+        case .simple:
+            return UIImage.simplePaymentsImage
         case .full:
             return UIImage.pagesImage
         }
@@ -48,7 +48,7 @@ final class OrderTypeBottomSheetListSelectorCommand: BottomSheetListSelectorComm
 
     var data: [BottomSheetOrderType] = [
         .full,
-        .quick
+        .simple
     ]
 
     var selected: BottomSheetOrderType? = nil
diff --git a/WooCommerce/Resources/Images.xcassets/icon-simple-payments.imageset/Contents.json b/WooCommerce/Resources/Images.xcassets/icon-simple-payments.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "icon-quick-order.pdf",
+      "filename" : "icon-simple-payments.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/WooCommerce/Resources/Images.xcassets/icon-simple-payments.imageset/icon-simple-payments.pdf b/WooCommerce/Resources/Images.xcassets/icon-simple-payments.imageset/icon-simple-payments.pdf
diff --git a/WooCommerce/WooCommerceTests/Extensions/IconsTests.swift b/WooCommerce/WooCommerceTests/Extensions/IconsTests.swift
@@ -541,7 +541,7 @@ final class IconsTests: XCTestCase {
         XCTAssertNotNil(UIImage.cardReaderManualIcon)
     }
 
-    func test_quickOrderImage_is_not_nil() {
-        XCTAssertNotNil(UIImage.quickOrderImage)
+    func test_simplePaymentsImage_is_not_nil() {
+        XCTAssertNotNil(UIImage.simplePaymentsImage)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -584,10 +584,10 @@ extension UIImage {`
`584`	`584`	`.imageWithTintColor(tintColor)!`
`585`	`585`	`}`
`586`	`586`
`587`		`- /// Quick Order Icon`
	`587`	`+ /// Simple Payments Icon`
`588`	`588`	`///`
`589`		`- static var quickOrderImage: UIImage {`
`590`		`- return UIImage(named: "icon-quick-order")!`
	`589`	`+ static var simplePaymentsImage: UIImage {`
	`590`	`+ return UIImage(named: "icon-simple-payments")!`
`591`	`591`	`}`
`592`	`592`
`593`	`593`	`/// Work In Progress banner icon on the Products Tab`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"images" : [`
`3`	`3`	`{`
`4`		`- "filename" : "icon-quick-order.pdf",`
	`4`	`+ "filename" : "icon-simple-payments.pdf",`
`5`	`5`	`"idiom" : "universal"`
`6`	`6`	`}`
`7`	`7`	`],`
Original file line number	Diff line number	Diff line change
`@@ -541,7 +541,7 @@ final class IconsTests: XCTestCase {`
`541`	`541`	`XCTAssertNotNil(UIImage.cardReaderManualIcon)`
`542`	`542`	`}`
`543`	`543`
`544`		`- func test_quickOrderImage_is_not_nil() {`
`545`		`- XCTAssertNotNil(UIImage.quickOrderImage)`
	`544`	`+ func test_simplePaymentsImage_is_not_nil() {`
	`545`	`+ XCTAssertNotNil(UIImage.simplePaymentsImage)`
`546`	`546`	`}`
`547`	`547`	`}`