Merge branch '10648-backed-receipt-download-and-share-a-file-not-a-li…

…nk' into 10633-backend-receipts-add-tracking

# Conflicts:
#	WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/cardreader/payment/CardReaderPaymentViewModel.kt

RELEASE-NOTES.txt

@@ -1,7 +1,7 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 17.2
 -----
-- [**] Every order have a receipt now. The receipts can be shared via many apps installed on the phone [https://github.com/woocommerce/woocommerce-android/pull/10650]
+- [**] [Available for users with WooCommerce version of 8.7+, which is not released yet] Every order have a receipt now. The receipts can be shared via many apps installed on the phone [https://github.com/woocommerce/woocommerce-android/pull/10650]
 
 17.1
 -----

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/cardreader/payment/CardReaderPaymentViewModel.kt

@@ -745,7 +745,7 @@ class CardReaderPaymentViewModel
                     }
                     is PaymentReceiptShare.ReceiptShareResult.Error.Sharing -> {
                         tracker.trackPaymentsReceiptSharingFailed(sharingResult)
-                        triggerEvent(ShowSnackbar(R.string.card_reader_payment_receipt_app_to_share_not_found))
+                        triggerEvent(ShowSnackbar(R.string.card_reader_payment_email_client_not_found))
                     }
                     PaymentReceiptShare.ReceiptShareResult.Success -> {
                         // no-op

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/payments/receipt/preview/ReceiptPreviewViewModel.kt

@@ -62,7 +62,7 @@ class ReceiptPreviewViewModel
                 }
                 is PaymentReceiptShare.ReceiptShareResult.Error.Sharing -> {
                     paymentsFlowTracker.trackPaymentsReceiptSharingFailed(sharingResult)
-                    triggerEvent(ShowSnackbar(string.card_reader_payment_receipt_app_to_share_not_found))
+                    triggerEvent(ShowSnackbar(string.card_reader_payment_email_client_not_found))
                 }
                 PaymentReceiptShare.ReceiptShareResult.Success -> {
                     // no-op

WooCommerce/src/main/res/values-ar/strings.xml

@@ -1910,7 +1910,7 @@ Language: ar
     <string name="variable_product_attributes">سمات المجموعات</string>
     <string name="card_reader_detail_not_connected_third_hint_label">تشغيل بلوتوث الجهاز المحمول</string>
     <string name="card_reader_refetching_order_failed">حدث خطأ في أثناء إحضار الطلب. قد تكون حالة الطلب الموجودة في التطبيق قديمة.</string>
-    <string name="card_reader_payment_receipt_app_to_share_not_found">لا يمكن اكتشاف تطبيق عميل البريد الإلكتروني الخاص بك</string>
+    <string name="card_reader_payment_email_client_not_found">لا يمكن اكتشاف تطبيق عميل البريد الإلكتروني الخاص بك</string>
     <string name="card_reader_payment_receipt_email_subject">إيصالك من %s</string>
     <string name="card_reader_payment_fetch_order_loading_payment_state">تحديث الطلب</string>
     <string name="card_reader_payment_fetch_order_loading_header">تحديث حالة التطبيق</string>

WooCommerce/src/main/res/values-de/strings.xml

@@ -1910,7 +1910,7 @@ Language: de
     <string name="variable_product_attributes">Variantenattribute</string>
     <string name="card_reader_detail_not_connected_third_hint_label">Aktiviere Bluetooth auf dem Mobilgerät</string>
     <string name="card_reader_refetching_order_failed">Fehler beim Abrufen der Bestellung Der Bestellstatus in der App ist eventuell nicht aktuell.</string>
-    <string name="card_reader_payment_receipt_app_to_share_not_found">E-Mail-Client-App wird nicht erkannt.</string>
+    <string name="card_reader_payment_email_client_not_found">E-Mail-Client-App wird nicht erkannt.</string>
     <string name="card_reader_payment_receipt_email_subject">Dein Beleg vom %s</string>
     <string name="card_reader_payment_fetch_order_loading_payment_state">Bestellung aktualisieren</string>
     <string name="card_reader_payment_fetch_order_loading_header">App-Status aktualisieren</string>

WooCommerce/src/main/res/values-es/strings.xml

@@ -1910,7 +1910,7 @@ Language: es
     <string name="variable_product_attributes">Atributos de variaciones</string>
     <string name="card_reader_detail_not_connected_third_hint_label">Activa Bluetooth en el dispositivo móvil</string>
     <string name="card_reader_refetching_order_failed">Error al recuperar el pedido. El estado del pedido en la aplicación podría estar desactualizado.</string>
-    <string name="card_reader_payment_receipt_app_to_share_not_found">No se pudo detectar una aplicación cliente de correo electrónico</string>
+    <string name="card_reader_payment_email_client_not_found">No se pudo detectar una aplicación cliente de correo electrónico</string>
     <string name="card_reader_payment_receipt_email_subject">Tu recibo de %s</string>
     <string name="card_reader_payment_fetch_order_loading_payment_state">Actualizando pedido</string>
     <string name="card_reader_payment_fetch_order_loading_header">Actualizando estado en la aplicación</string>

WooCommerce/src/main/res/values-fr/strings.xml

@@ -1910,7 +1910,7 @@ Language: fr
     <string name="variable_product_attributes">Attributs des variantes</string>
     <string name="card_reader_detail_not_connected_third_hint_label">Activer le Bluetooth de l’appareil mobile</string>
     <string name="card_reader_refetching_order_failed">Erreur lors de l’extraction de la commande. L’état de la commande dans l’application est peut-être obsolète.</string>
-    <string name="card_reader_payment_receipt_app_to_share_not_found">Aucune application de messagerie détectée</string>
+    <string name="card_reader_payment_email_client_not_found">Aucune application de messagerie détectée</string>
     <string name="card_reader_payment_receipt_email_subject">Votre reçu de %s</string>
     <string name="card_reader_payment_fetch_order_loading_payment_state">Actualisation de la commande</string>
     <string name="card_reader_payment_fetch_order_loading_header">Mise à jour de l’état de l’application</string>

WooCommerce/src/main/res/values-he/strings.xml

@@ -1910,7 +1910,7 @@ Language: he_IL
     <string name="variable_product_attributes">מאפייני סוגים</string>
     <string name="card_reader_detail_not_connected_third_hint_label">יש להפעיל את חיבור ה-Bluetooth של המכשיר הנייד</string>
     <string name="card_reader_refetching_order_failed">שגיאה בהבאת ההזמנה. ייתכן שמצב ההזמנה באפליקציה לא מעודכן.</string>
-    <string name="card_reader_payment_receipt_app_to_share_not_found">לא ניתן לאתר את האפליקציה של שירות האימייל שלך</string>
+    <string name="card_reader_payment_email_client_not_found">לא ניתן לאתר את האפליקציה של שירות האימייל שלך</string>
     <string name="card_reader_payment_receipt_email_subject">הקבלה שלך מאת %s</string>
     <string name="card_reader_payment_fetch_order_loading_payment_state">מרענן את ההזמנה</string>
     <string name="card_reader_payment_fetch_order_loading_header">מעדכן את מצב האפליקציה</string>

WooCommerce/src/main/res/values-id/strings.xml

@@ -1910,7 +1910,7 @@ Language: id
     <string name="variable_product_attributes">Atribut variasi</string>
     <string name="card_reader_detail_not_connected_third_hint_label">Aktifkan bluetooth perangkat seluler</string>
     <string name="card_reader_refetching_order_failed">Terjadi error saat mengambil pesanan. Status pesanan pada aplikasi mungkin telah usang.</string>
-    <string name="card_reader_payment_receipt_app_to_share_not_found">Tidak dapat mendeteksi aplikasi klien email Anda</string>
+    <string name="card_reader_payment_email_client_not_found">Tidak dapat mendeteksi aplikasi klien email Anda</string>
     <string name="card_reader_payment_receipt_email_subject">Tanda terima Anda dari %s</string>
     <string name="card_reader_payment_fetch_order_loading_payment_state">Menyegarkan pesanan</string>
     <string name="card_reader_payment_fetch_order_loading_header">Memperbarui status aplikasi</string>

WooCommerce/src/main/res/values-it/strings.xml

@@ -1910,7 +1910,7 @@ Language: it
     <string name="variable_product_attributes">Attributi della variante</string>
     <string name="card_reader_detail_not_connected_third_hint_label">Attiva il Bluetooth del dispositivo mobile</string>
     <string name="card_reader_refetching_order_failed">Errore durante il recupero dell\'ordine. Lo stato nell\'ordine dell\'app potrebbe essere obsoleto.</string>
-    <string name="card_reader_payment_receipt_app_to_share_not_found">Impossibile rilevare il client e-mail della tua app</string>
+    <string name="card_reader_payment_email_client_not_found">Impossibile rilevare il client e-mail della tua app</string>
     <string name="card_reader_payment_receipt_email_subject">La tua ricevuta da %s</string>
     <string name="card_reader_payment_fetch_order_loading_payment_state">Aggiornamento dell\'ordine</string>
     <string name="card_reader_payment_fetch_order_loading_header">Aggiornamento dello stato dell\'app</string>

WooCommerce/src/main/res/values-ja/strings.xml

@@ -1910,7 +1910,7 @@ Language: ja_JP
     <string name="variable_product_attributes">バリエーション属性</string>
     <string name="card_reader_detail_not_connected_third_hint_label">モバイルデバイスの Bluetooth をオンにする</string>
     <string name="card_reader_refetching_order_failed">注文を取得する際にエラーが発生しました。 アプリの注文状態が古い可能性があります。</string>
-    <string name="card_reader_payment_receipt_app_to_share_not_found">メールクライアントアプリを検出できません</string>
+    <string name="card_reader_payment_email_client_not_found">メールクライアントアプリを検出できません</string>
     <string name="card_reader_payment_receipt_email_subject">%s のレシート</string>
     <string name="card_reader_payment_fetch_order_loading_payment_state">注文を更新する</string>
     <string name="card_reader_payment_fetch_order_loading_header">アプリの状態を更新する</string>

WooCommerce/src/main/res/values-ko/strings.xml

@@ -1910,7 +1910,7 @@ Language: ko_KR
     <string name="variable_product_attributes">변형 속성</string>
     <string name="card_reader_detail_not_connected_third_hint_label">모바일 장치 블루투스 켜기</string>
     <string name="card_reader_refetching_order_failed">주문을 가져오는 중 오류가 발생했습니다. 앱의 주문 상태가 기한이 지났을 수 있습니다.</string>
-    <string name="card_reader_payment_receipt_app_to_share_not_found">이메일 클라이언트 앱을 감지할 수 없습니다.</string>
+    <string name="card_reader_payment_email_client_not_found">이메일 클라이언트 앱을 감지할 수 없습니다.</string>
     <string name="card_reader_payment_receipt_email_subject">%s에서 받은 영수증</string>
     <string name="card_reader_payment_fetch_order_loading_payment_state">주문 새로 고치기</string>
     <string name="card_reader_payment_fetch_order_loading_header">앱 상태 업데이트하기</string>

WooCommerce/src/main/res/values-nl/strings.xml

@@ -1903,7 +1903,7 @@ Language: nl
     <string name="variable_product_attributes">Variatie-eigenschappen</string>
     <string name="card_reader_detail_not_connected_third_hint_label">Zet de Bluetooth aan op je mobiele apparaat</string>
     <string name="card_reader_refetching_order_failed">Fout bij ophalen bestelling. De bestellingsstatus in de app kan verouderd zijn.</string>
-    <string name="card_reader_payment_receipt_app_to_share_not_found">Detectie van mailclient-app mislukt</string>
+    <string name="card_reader_payment_email_client_not_found">Detectie van mailclient-app mislukt</string>
     <string name="card_reader_payment_receipt_email_subject">Je kwitantie van %s</string>
     <string name="card_reader_payment_fetch_order_loading_payment_state">Bestelling aan het vernieuwen…</string>
     <string name="card_reader_payment_fetch_order_loading_header">Status in de app aan het bijwerken…</string>

WooCommerce/src/main/res/values-pt-rBR/strings.xml

@@ -1910,7 +1910,7 @@ Language: pt_BR
     <string name="variable_product_attributes">Atributos das variações</string>
     <string name="card_reader_detail_not_connected_third_hint_label">Ativar o Bluetooth do dispositivo móvel</string>
     <string name="card_reader_refetching_order_failed">Erro ao buscar o pedido. O status do pedido pode estar desatualizado no aplicativo.</string>
-    <string name="card_reader_payment_receipt_app_to_share_not_found">Não é possível detectar seu aplicativo cliente de e-mail</string>
+    <string name="card_reader_payment_email_client_not_found">Não é possível detectar seu aplicativo cliente de e-mail</string>
     <string name="card_reader_payment_receipt_email_subject">Seu recibo de %s</string>
     <string name="card_reader_payment_fetch_order_loading_payment_state">Atualizando pedido</string>
     <string name="card_reader_payment_fetch_order_loading_header">Atualizando estado do aplicativo</string>

WooCommerce/src/main/res/values-ru/strings.xml

@@ -1910,7 +1910,7 @@ Language: ru
     <string name="variable_product_attributes">Атрибуты вариантов</string>
     <string name="card_reader_detail_not_connected_third_hint_label">Включите Bluetooth на мобильном устройстве</string>
     <string name="card_reader_refetching_order_failed">Ошибка при загрузке заказа. Состояние заказа в приложении могло устареть.</string>
-    <string name="card_reader_payment_receipt_app_to_share_not_found">Не удалось определить ваш почтовый клиент</string>
+    <string name="card_reader_payment_email_client_not_found">Не удалось определить ваш почтовый клиент</string>
     <string name="card_reader_payment_receipt_email_subject">Ваша квитанция от %s</string>
     <string name="card_reader_payment_fetch_order_loading_payment_state">Обновление заказа</string>
     <string name="card_reader_payment_fetch_order_loading_header">Обновление состояния приложения</string>

WooCommerce/src/main/res/values-sv/strings.xml

@@ -1917,7 +1917,7 @@ Language: sv_SE
     <string name="empty_product_message">Börja sälja idag genom att lägga till din första produkt i butiken.</string>
     <string name="variable_product_attributes">Variationsattribut</string>
     <string name="card_reader_detail_not_connected_third_hint_label">Aktivera Bluetooth på den mobila enheten</string>
-    <string name="card_reader_payment_receipt_app_to_share_not_found">Lyckas inte hitta ditt e-postprogram</string>
+    <string name="card_reader_payment_email_client_not_found">Lyckas inte hitta ditt e-postprogram</string>
     <string name="card_reader_payment_fetch_order_loading_payment_state">Uppdaterar beställning</string>
     <string name="card_reader_payment_fetch_order_loading_header">Uppdaterar appstatusen</string>
     <string name="card_reader_refetching_order_failed">Det gick inte att hämta beställningen. Beställningens status i appen kan vara föråldrad.</string>

WooCommerce/src/main/res/values-tr/strings.xml

@@ -1910,7 +1910,7 @@ Language: tr
     <string name="variable_product_attributes">Varyasyon nitelikleri.</string>
     <string name="card_reader_detail_not_connected_third_hint_label">Mobil cihazda Bluetooth\'u açın</string>
     <string name="card_reader_refetching_order_failed">Sipariş alınırken hata oluştu Uygulamadaki sipariş durumu eski olabilir.</string>
-    <string name="card_reader_payment_receipt_app_to_share_not_found">E-posta istemcisi uygulamanızı tespit edemiyoruz</string>
+    <string name="card_reader_payment_email_client_not_found">E-posta istemcisi uygulamanızı tespit edemiyoruz</string>
     <string name="card_reader_payment_receipt_email_subject">%s makbuzunuz</string>
     <string name="card_reader_payment_fetch_order_loading_payment_state">Sipariş yenileniyor</string>
     <string name="card_reader_payment_fetch_order_loading_header">Uygulama durumu güncelleniyor</string>

WooCommerce/src/main/res/values-zh-rCN/strings.xml

@@ -1909,7 +1909,7 @@ Language: zh_CN
     <string name="empty_product_add_product_button">添加产品</string>
     <string name="variable_product_attributes">变体属性</string>
     <string name="card_reader_detail_not_connected_third_hint_label">打开移动设备蓝牙</string>
-    <string name="card_reader_payment_receipt_app_to_share_not_found">未侦测到您的电子邮件客户端应用</string>
+    <string name="card_reader_payment_email_client_not_found">未侦测到您的电子邮件客户端应用</string>
     <string name="card_reader_payment_receipt_email_subject">来自 %s 的收据</string>
     <string name="card_reader_payment_fetch_order_loading_payment_state">刷新订单</string>
     <string name="card_reader_payment_fetch_order_loading_header">更新应用程序状态</string>

WooCommerce/src/main/res/values-zh-rTW/strings.xml

@@ -1910,7 +1910,7 @@ Language: zh_TW
     <string name="variable_product_attributes">款式屬性</string>
     <string name="card_reader_detail_not_connected_third_hint_label">開啟行動裝置的藍牙</string>
     <string name="card_reader_refetching_order_failed">擷取訂單時發生錯誤。 應用程式中的訂單狀態可能已過期。</string>
-    <string name="card_reader_payment_receipt_app_to_share_not_found">無法偵測電子郵件用戶端應用程式</string>
+    <string name="card_reader_payment_email_client_not_found">無法偵測電子郵件用戶端應用程式</string>
     <string name="card_reader_payment_receipt_email_subject">你的 %s 收據</string>
     <string name="card_reader_payment_fetch_order_loading_payment_state">正在重新整理訂單</string>
     <string name="card_reader_payment_fetch_order_loading_header">正在更新應用程式狀態</string>

WooCommerce/src/main/res/values/strings.xml

@@ -1507,7 +1507,7 @@
     <string name="card_reader_payment_description_v2">In-Person Payment for Order #%1$s for %2$s blog_id %3$s.</string>
     <string name="card_reader_payment_receipt_email_subject">Your receipt from %s</string>
     <string name="card_reader_payment_receipt_email_content">Thank you for your purchase! Click the link below for your payment receipt.\n\n%s</string>
-    <string name="card_reader_payment_receipt_app_to_share_not_found">Unable to detect any application to which the receipt can be shared</string>
+    <string name="card_reader_payment_email_client_not_found">Unable to detect any application to which the receipt can be shared</string>
     <string name="card_reader_payment_receipt_can_not_be_downloaded">Unable to download the receipt</string>
     <string name="card_reader_payment_receipt_can_not_be_stored">Unable to store the receipt</string>
     <string name="card_reader_refetching_order_failed">Error fetching order. Order state in the app might be outdated.</string>

WooCommerce/src/test/kotlin/com/woocommerce/android/ui/payments/cardreader/CardReaderPaymentViewModelTest.kt

@@ -2440,7 +2440,7 @@ class CardReaderPaymentViewModelTest : BaseUnitTest() {
             (viewModel.viewStateData.value as ExternalReaderPaymentSuccessfulState).onSecondaryActionClicked.invoke()
 
             assertThat((viewModel.event.value as ShowSnackbar).message).isEqualTo(
-                R.string.card_reader_payment_receipt_app_to_share_not_found
+                R.string.card_reader_payment_email_client_not_found
             )
             verify(tracker).trackPaymentsReceiptSharingFailed(sharing)
         }

WooCommerce/src/test/kotlin/com/woocommerce/android/ui/payments/receipt/preview/ReceiptPreviewViewModelTest.kt

@@ -140,7 +140,7 @@ class ReceiptPreviewViewModelTest : BaseUnitTest() {
 
             // THEN
             assertThat((viewModel.event.value as MultiLiveEvent.Event.ShowSnackbar).message).isEqualTo(
-                R.string.card_reader_payment_receipt_app_to_share_not_found
+                R.string.card_reader_payment_email_client_not_found
             )
             verify(paymentsFlowTracker).trackPaymentsReceiptSharingFailed(
                 sharing