Merge branch 'trunk' into 12904-woo-pos---payments-onboarding-handle-…

…case-when-we-dont-know-country-and-currency # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/cardreader/onboarding/CardReaderOnboardingFragment.kt
woocommerce · Nov 18, 2024 · 3e60a27 · 3e60a27
2 parents ad138a9 + f191500
commit 3e60a27
Show file tree

Hide file tree

Showing 140 changed files with 4,803 additions and 1,960 deletions.
diff --git a/.gitignore b/.gitignore
@@ -110,3 +110,6 @@ local-builds.gradle
 # gitignore for retrocompatibility, so that it won't appear as a new file and
 # be accidentally checked in the repository.
 google-upload-credentials.json
+
+# Kotlin
+.kotlin/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 21.1
+Our latest update brings key enhancements to streamline your WooCommerce experience! We’ve fixed editing permissions for orders in different currencies, optimized the payments hub view, enabled easy receipt sharing via Google SMS, and fixed date range selection to correctly use your timezone. Enjoy smoother operations!
+
 ## 21.0
 Enjoy a smoother experience with improved design throughout the app. Plus, now your product images load faster and look even better with new AVIF format support. Update now for a cleaner, sharper WooCommerce app experience!
 

diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-gem 'danger-dangermattic', '~> 1.1'
+gem 'danger-dangermattic', '~> 1.2'
 gem 'fastlane', '~> 2.216'
 gem 'nokogiri'
 gem 'rubocop', '~> 1.65'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -23,7 +23,7 @@ GEM
     ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.999.0)
+    aws-partitions (1.1001.0)
     aws-sdk-core (3.211.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
@@ -72,7 +72,7 @@ GEM
       octokit (>= 4.0)
       pstore (~> 0.1)
       terminal-table (>= 1, < 4)
-    danger-dangermattic (1.1.2)
+    danger-dangermattic (1.2.1)
       danger (~> 9.4)
       danger-plugin-api (~> 1.0)
       danger-rubocop (~> 0.13)
@@ -231,7 +231,7 @@ GEM
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
-    json (2.7.5)
+    json (2.7.6)
     jwt (2.9.3)
       base64
     kramdown (2.4.0)
@@ -242,16 +242,24 @@ GEM
     logger (1.6.1)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
     minitest (5.25.1)
     multi_json (1.15.0)
     multipart-post (2.4.1)
     nanaimo (0.4.0)
     nap (1.1.0)
     naturally (2.2.1)
     nkf (0.2.0)
-    nokogiri (1.16.7)
-      mini_portile2 (~> 2.8.2)
+    nokogiri (1.16.7-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-arm-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     octokit (6.1.1)
       faraday (>= 1, < 3)
@@ -261,7 +269,7 @@ GEM
     optparse (0.5.0)
     os (1.1.4)
     parallel (1.26.3)
-    parser (3.3.5.0)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
     plist (3.7.1)
@@ -295,7 +303,7 @@ GEM
       rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.33.0)
+    rubocop-ast (1.34.0)
       parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
@@ -340,15 +348,21 @@ GEM
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
+  aarch64-linux
+  arm-linux
+  arm64-darwin
   ruby
+  x86-linux
+  x86_64-darwin
+  x86_64-linux
 
 DEPENDENCIES
-  danger-dangermattic (~> 1.1)
+  danger-dangermattic (~> 1.2)
   fastlane (~> 2.216)
   fastlane-plugin-wpmreleasetoolkit (~> 12.3)
   nokogiri
   rmagick (~> 4.1)
   rubocop (~> 1.65)
 
 BUNDLED WITH
-   2.4.19
+   2.5.20
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -3,11 +3,17 @@
 *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
 21.2
 - [Internal] Changed a way how authenticated web view opened in the IPP flows [https://github.com/woocommerce/woocommerce-android/pull/12908]
+-----
+- [**][Payments] Fixed a bug when IPP onboarding was not possible to finish from the app [https://github.com/woocommerce/woocommerce-android/pull/12917]
+- [*] Fixed shipping lines being editable at all states [https://github.com/woocommerce/woocommerce-android/pull/12890]
+- [*] Fixed a crash that occurred when tapping on the customer shipping address in the order details screen [https://github.com/woocommerce/woocommerce-android/pull/12920]
 
 21.1
 -----
+- [*] Disable Edit option for orders whose currency does not match with store currency [https://github.com/woocommerce/woocommerce-android/pull/12880]
 - [*] Show web views on the payments hub screen in 3/4 of the screen [https://github.com/woocommerce/woocommerce-android/pull/12875]
 - [*] Receipts can be shared via a google's sms application now [https://github.com/woocommerce/woocommerce-android/pull/12874]
+- [*] Fixed a bug where picking date ranges (for Stats and Analytics) did not use the correct timezone [https://github.com/woocommerce/woocommerce-android/pull/12887]
 
 21.0
 -----

diff --git a/WooCommerce-Wear/build.gradle b/WooCommerce-Wear/build.gradle
@@ -3,6 +3,7 @@ import io.sentry.android.gradle.extensions.InstrumentationFeature
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.google.dagger.hilt)
     alias(libs.plugins.ksp)
@@ -77,19 +78,13 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
+        sourceCompatibility libs.versions.java.get()
+        targetCompatibility libs.versions.java.get()
     }
     buildFeatures {
         buildConfig true
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.androidx.compose.compiler.get()
-    }
     packaging {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'

diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle
@@ -3,6 +3,7 @@ import io.sentry.android.gradle.extensions.InstrumentationFeature
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.google.dagger.hilt)
     alias(libs.plugins.sentry)
@@ -145,15 +146,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility libs.versions.java.get()
+        targetCompatibility libs.versions.java.get()
         coreLibraryDesugaringEnabled true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.androidx.compose.compiler.get()
-    }
-
     flavorDimensions "buildType"
 
     productFlavors {

diff --git a/...rc/androidTest/assets/mocks/mappings/jetpack-blogs/wc/orders/2787/2787_connect_label.json b/...rc/androidTest/assets/mocks/mappings/jetpack-blogs/wc/orders/2787/2787_connect_label.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "method": "GET",
+    "urlPathPattern": "/rest/v1.1/jetpack-blogs/161477129/rest-api/",
+    "queryParameters": {
+      "json": {
+        "equalTo": "true"
+      },
+      "path": {
+        "matches": "/wc/v1/connect/label/2787(.*)"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+      "data": {}
+    },
+    "headers": {
+      "Content-Type": "application/json",
+      "Connection": "keep-alive"
+    }
+  }
+}
diff --git a/...erce/src/androidTest/assets/mocks/mappings/jetpack-blogs/wc/orders/2787/2787_refunds.json b/...erce/src/androidTest/assets/mocks/mappings/jetpack-blogs/wc/orders/2787/2787_refunds.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "method": "GET",
+    "urlPathPattern": "/rest/v1.1/jetpack-blogs/161477129/rest-api/",
+    "queryParameters": {
+      "json": {
+        "equalTo": "true"
+      },
+      "path": {
+        "matches": "/wc/v3/orders/2787/refunds(.*)"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+      "data": []
+    },
+    "headers": {
+      "Content-Type": "application/json",
+      "Connection": "keep-alive"
+    }
+  }
+}
diff --git a/...androidTest/assets/mocks/mappings/jetpack-blogs/wc/orders/2787/2787_shipping_methods.json b/...androidTest/assets/mocks/mappings/jetpack-blogs/wc/orders/2787/2787_shipping_methods.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "method": "GET",
+    "urlPathPattern": "/rest/v1.1/jetpack-blogs/161477129/rest-api/",
+    "queryParameters": {
+      "json": {
+        "equalTo": "true"
+      },
+      "path": {
+        "equalTo": "/wc/v3/shipping_methods/&_method=get"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+      "data": []
+    },
+    "headers": {
+      "Content-Type": "application/json",
+      "Connection": "keep-alive"
+    }
+  }
+}
diff --git a/...ce/src/androidTest/assets/mocks/mappings/jetpack-blogs/wc/orders/orders_all_detailed.json b/...ce/src/androidTest/assets/mocks/mappings/jetpack-blogs/wc/orders/orders_all_detailed.json
@@ -9,9 +9,6 @@
             "path": {
                 "equalTo": "/wc/v3/orders/&_method=get"
             },
-            "query": {
-                "matches": "(.*)include(.*)"
-            },
             "locale": {
                 "matches": "(.*)"
             }

diff --git a/WooCommerce/src/androidTest/assets/mocks/mappings/jetpack-blogs/wc/payment_gateways.json b/WooCommerce/src/androidTest/assets/mocks/mappings/jetpack-blogs/wc/payment_gateways.json
@@ -8,7 +8,7 @@
             },
             "path": {
                 "matches": "/wc/v3/payment_gateways(.*)"
-            },         
+            },
             "locale": {
                 "matches": "(.*)"
             }
@@ -112,7 +112,7 @@
                 "title": "Cash on delivery",
                 "description": "Pay with cash upon delivery.",
                 "order": 2,
-                "enabled": false,
+                "enabled": true,
                 "method_title": "Cash on delivery",
                 "method_description": "Have your customers pay with cash (or by other means) upon delivery.",
                 "method_supports": ["products"],

diff --git a/WooCommerce/src/androidTest/assets/mocks/mappings/jetpack-blogs/wc/system_status.json b/WooCommerce/src/androidTest/assets/mocks/mappings/jetpack-blogs/wc/system_status.json
@@ -69,8 +69,8 @@
                 }, {
                     "plugin": "woocommerce-gateway-stripe/woocommerce-gateway-stripe.php",
                     "name": "WooCommerce Stripe Gateway",
-                    "version": "6.1.0",
-                    "version_latest": "6.1.0",
+                    "version": "8.8.2",
+                    "version_latest": "8.8.2",
                     "url": "https://wordpress.org/plugins/woocommerce-gateway-stripe/",
                     "author_name": "WooCommerce",
                     "author_url": "https://woocommerce.com/",

diff --git a/WooCommerce/src/androidTest/assets/mocks/mappings/woopos/stripe_account.json b/WooCommerce/src/androidTest/assets/mocks/mappings/woopos/stripe_account.json
@@ -19,9 +19,10 @@
     "jsonBody": {
       "data": {
         "country": "US",
-        "storeCurrencies": {
+        "store_currencies": {
           "default": "USD"
-        }
+        },
+        "status": "enabled"
       }
     },
     "headers": {

diff --git a/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/di/MockCardReaderManagerModule.kt b/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/di/MockCardReaderManagerModule.kt
@@ -42,7 +42,7 @@ class MockCardReaderManagerModule {
             override val id: String
                 get() = "ADEE123"
             override val type: String
-                get() = "reader"
+                get() = "COTS_DEVICE"
             override val currentBatteryLevel: Float
                 get() = 1f
             override val firmwareVersion: String

diff --git a/...erce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/orders/OrderListScreen.kt b/...erce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/orders/OrderListScreen.kt
@@ -15,8 +15,7 @@ import org.hamcrest.Matchers
 
 class OrderListScreen : Screen(R.id.ordersList) {
     fun selectOrder(index: Int): SingleOrderScreen {
-        val correctedIndex = index + 1 // account for the header
-        selectItemAtIndexInRecyclerView(correctedIndex, R.id.ordersList, R.id.linearLayout)
+        selectItemAtIndexInRecyclerView(index, R.id.ordersList, R.id.linearLayout)
         return SingleOrderScreen()
     }
 

diff --git a/...ce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/orders/SingleOrderScreen.kt b/...ce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/orders/SingleOrderScreen.kt
@@ -14,7 +14,7 @@ import com.woocommerce.android.e2e.helpers.util.ProductData
 import com.woocommerce.android.e2e.helpers.util.Screen
 import org.hamcrest.Matchers
 
-class SingleOrderScreen : Screen(R.id.toolbar) {
+class SingleOrderScreen : Screen(R.id.orderStatus_subtitle) {
     fun goBackToOrdersScreen(): OrderListScreen {
         if (isElementDisplayed(R.id.orderDetail_container)) {
             pressBack()
@@ -136,6 +136,7 @@ class SingleOrderScreen : Screen(R.id.toolbar) {
     }
 
     fun tapOnCollectPayment(): PaymentSelectionScreen {
+        scrollTo(R.id.paymentInfo_collectCardPresentPaymentButton)
         clickOn(R.id.paymentInfo_collectCardPresentPaymentButton)
         return PaymentSelectionScreen()
     }