From 0a016954f8b35e0e3e75f658c2f404eca204787b Mon Sep 17 00:00:00 2001
From: Spencer Transier <17955542+spencertransier@users.noreply.github.com>
Date: Fri, 8 Dec 2023 15:51:58 -0800
Subject: [PATCH 1/7] Bump version number

---
 version.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.properties b/version.properties
index fdab81a5ce5..e454ac3157c 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
-versionName=16.5
-versionCode=482
\ No newline at end of file
+versionName=16.6-rc-1
+versionCode=483
\ No newline at end of file

From 367fa573c7184bde17bf608ccf8642e413c76708 Mon Sep 17 00:00:00 2001
From: Spencer Transier <17955542+spencertransier@users.noreply.github.com>
Date: Fri, 8 Dec 2023 15:51:58 -0800
Subject: [PATCH 2/7] Update draft release notes for 16.6.

---
 WooCommerce/metadata/release_notes.txt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/metadata/release_notes.txt b/WooCommerce/metadata/release_notes.txt
index 9ff8ef6f01e..16ff365bf96 100644
--- a/WooCommerce/metadata/release_notes.txt
+++ b/WooCommerce/metadata/release_notes.txt
@@ -1 +1,8 @@
-The latest WooCommerce app version focuses on stability improvements! Additionally, WooPayments users can now seamlessly switch between currencies on the Deposits Summary view. Upgrade now for a smoother WooCommerce experience!
+- [**] Introduce ability to start creating a product by sharing images from other apps [https://github.com/woocommerce/woocommerce-android/pull/10331]
+- [*] [Internal] Improvements to the performance and internal logic of the barcode scanning screen [https://github.com/woocommerce/woocommerce-android/pull/10307]
+- [*] Add helper actions to allow the user to restore the cha-ching sound in case it was disabled from the device settings [https://github.com/woocommerce/woocommerce-android/issues/10327]
+- [***] Custom Amounts M4.2: Redesigned UI, Percentage based custom amounts support [https://github.com/woocommerce/woocommerce-android/pull/10298]
+- [*] [Internal] Custom Amounts: Fix RTL issue in the order creation screen [https://github.com/woocommerce/woocommerce-android/pull/10316]
+- [**] Quantity of the products in the order creation/editing flow can be changed by entering the amount [https://github.com/woocommerce/woocommerce-android/pull/10321]
+- [***] Added possibility to scan product's barcode in the Products page to update product's inventory quickly [https://github.com/woocommerce/woocommerce-android/pull/10250]
+

From 3195bbf5e5ca1c2bb1e9c9e6a2182cf3364ed674 Mon Sep 17 00:00:00 2001
From: Spencer Transier <17955542+spencertransier@users.noreply.github.com>
Date: Fri, 8 Dec 2023 15:52:35 -0800
Subject: [PATCH 3/7] Release Notes: add new section for next version (16.7)

---
 RELEASE-NOTES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index d5f7235e598..400b185f7d1 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -2,6 +2,8 @@
 16.7
 -----
 
+
+
 16.6
 -----
 - [**] Introduce ability to start creating a product by sharing images from other apps [https://github.com/woocommerce/woocommerce-android/pull/10331]

From d872ef499e90a444d181d1aa7e89060044bbee3a Mon Sep 17 00:00:00 2001
From: Spencer Transier <17955542+spencertransier@users.noreply.github.com>
Date: Fri, 8 Dec 2023 15:53:20 -0800
Subject: [PATCH 4/7] Update release_notes.txt

---
 WooCommerce/metadata/release_notes.txt | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/WooCommerce/metadata/release_notes.txt b/WooCommerce/metadata/release_notes.txt
index 16ff365bf96..5495660ca27 100644
--- a/WooCommerce/metadata/release_notes.txt
+++ b/WooCommerce/metadata/release_notes.txt
@@ -1,8 +1 @@
-- [**] Introduce ability to start creating a product by sharing images from other apps [https://github.com/woocommerce/woocommerce-android/pull/10331]
-- [*] [Internal] Improvements to the performance and internal logic of the barcode scanning screen [https://github.com/woocommerce/woocommerce-android/pull/10307]
-- [*] Add helper actions to allow the user to restore the cha-ching sound in case it was disabled from the device settings [https://github.com/woocommerce/woocommerce-android/issues/10327]
-- [***] Custom Amounts M4.2: Redesigned UI, Percentage based custom amounts support [https://github.com/woocommerce/woocommerce-android/pull/10298]
-- [*] [Internal] Custom Amounts: Fix RTL issue in the order creation screen [https://github.com/woocommerce/woocommerce-android/pull/10316]
-- [**] Quantity of the products in the order creation/editing flow can be changed by entering the amount [https://github.com/woocommerce/woocommerce-android/pull/10321]
-- [***] Added possibility to scan product's barcode in the Products page to update product's inventory quickly [https://github.com/woocommerce/woocommerce-android/pull/10250]
-
+Exciting news, everyone! The latest update enhances your WooCommerce experience in multiple ways. Enjoy swift inventory updates by effortlessly scanning barcodes directly from the Products page—imagine the convenience! Our revamped UI now introduces percentage-based custom amounts for added flexibility. Begin your product creation journey seamlessly by incorporating images from other apps. Internal optimizations guarantee a snappier performance, promising an exhilarating and more user-friendly exploration. Dive in now and explore these fantastic enhancements!

From ecd4665749f72d5dbcebae40950479bc7fb13670 Mon Sep 17 00:00:00 2001
From: Spencer Transier <17955542+spencertransier@users.noreply.github.com>
Date: Fri, 8 Dec 2023 15:53:59 -0800
Subject: [PATCH 5/7] Update `PlayStoreStrings.po` for 16.6

---
 WooCommerce/metadata/PlayStoreStrings.pot | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/WooCommerce/metadata/PlayStoreStrings.pot b/WooCommerce/metadata/PlayStoreStrings.pot
index 61de6f457cb..be6eb0b3527 100644
--- a/WooCommerce/metadata/PlayStoreStrings.pot
+++ b/WooCommerce/metadata/PlayStoreStrings.pot
@@ -11,16 +11,16 @@ msgstr ""
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
-msgctxt "release_note_165"
+msgctxt "release_note_166"
 msgid ""
-"16.5:\n"
-"The latest WooCommerce app version focuses on stability improvements! Additionally, WooPayments users can now seamlessly switch between currencies on the Deposits Summary view. Upgrade now for a smoother WooCommerce experience!\n"
+"16.6:\n"
+"Exciting news, everyone! The latest update enhances your WooCommerce experience in multiple ways. Enjoy swift inventory updates by effortlessly scanning barcodes directly from the Products page—imagine the convenience! Our revamped UI now introduces percentage-based custom amounts for added flexibility. Begin your product creation journey seamlessly by incorporating images from other apps. Internal optimizations guarantee a snappier performance, promising an exhilarating and more user-friendly exploration. Dive in now and explore these fantastic enhancements!\n"
 msgstr ""
 
-msgctxt "release_note_164"
+msgctxt "release_note_165"
 msgid ""
-"16.4:\n"
-"We're excited to introduce some new features! Our latest update allows you to charge tax for custom amounts and set one-time shipping for subscription products. You can also set subscription products as "virtual products". Plus, we've added an AI feature that generates a thank-you note on the completed order's details screen. Enjoy our new and improved WooCommerce app!\n"
+"16.5:\n"
+"The latest WooCommerce app version focuses on stability improvements! Additionally, WooPayments users can now seamlessly switch between currencies on the Deposits Summary view. Upgrade now for a smoother WooCommerce experience!\n"
 msgstr ""
 
 #. translators: Short description of the app to be displayed in the Play Store. Limit to 80 characters including spaces and commas!

From d12780097f855a735373b97898e7cb2842740f4d Mon Sep 17 00:00:00 2001
From: Spencer Transier <17955542+spencertransier@users.noreply.github.com>
Date: Fri, 8 Dec 2023 16:31:12 -0800
Subject: [PATCH 6/7] Update FluxC to tagged version

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ec04632da19..a90c304c812 100644
--- a/build.gradle
+++ b/build.gradle
@@ -94,7 +94,7 @@ tasks.register("installGitHooks", Copy) {
 }
 
 ext {
-    fluxCVersion = 'trunk-3f65981193242842166b7428f409fd2d290076ac'
+    fluxCVersion = '2.59.0'
     glideVersion = '4.13.2'
     coilVersion = '2.1.0'
     constraintLayoutVersion = '1.2.0'

From 937a01081676809fe65d2e54c7dc91b1c23f60f1 Mon Sep 17 00:00:00 2001
From: Spencer Transier <17955542+spencertransier@users.noreply.github.com>
Date: Fri, 8 Dec 2023 16:31:36 -0800
Subject: [PATCH 7/7] Send strings to translation.

---
 fastlane/resources/values/strings.xml | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/fastlane/resources/values/strings.xml b/fastlane/resources/values/strings.xml
index 81ba1e77c9f..47acdd7aff0 100644
--- a/fastlane/resources/values/strings.xml
+++ b/fastlane/resources/values/strings.xml
@@ -509,9 +509,16 @@
     <string name="custom_amounts_enter_amount">Amount</string>
     <string name="custom_amounts_name">Name</string>
     <string name="custom_amounts_add_custom_amount">Add Custom Amount</string>
+    <string name="custom_amounts_delete_custom_amount">Delete custom amount</string>
     <string name="custom_amounts_add_custom_name_hint">Enter Custom name</string>
     <string name="custom_amounts_creation_error">Unable to create custom amount order</string>
     <string name="custom_amounts_tax_label">Charge Taxes</string>
+    <string name="custom_amounts_percentage_label">Percentage of order total (%1$s)</string>
+    <string name="custom_amounts_bottom_sheet_heading">How do you want to add your custom amount?</string>
+    <string name="custom_amounts_bottom_sheet_fixed_amount_option">A fixed amount</string>
+    <string name="custom_amounts_bottom_sheet_percentage_amount_option">A percentage of the order total</string>
+    <string name="custom_amounts_percentage_hint">0</string>
+    <string name="custom_amounts_percentage_symbol">%</string>
 
     <!--
          Taxes
@@ -531,6 +538,7 @@
     <string name="order_list_barcode_scanning_scanning_failed">Scanning failed. Please try again later</string>
     <string name="order_creation_fragment_title">New order</string>
     <string name="order_creation_price_after_discount">Price after discount</string>
+    <string name="order_creation_products_order_count">Order count</string>
     <string name="order_creation_status_edit_content_description">Edit order status</string>
     <string name="order_creation_customer">Customer</string>
     <string name="order_creation_customer_edit_content_description">Edit customer details</string>
@@ -1688,6 +1696,14 @@
     <string name="more_notifications">and %d more.</string>
     <string name="notification_order_title">You have a new order! 🎉</string>
     <string name="notification_review_title">You have a new review! 🌟</string>
+    <string name="cha_ching_sound_issue_dialog_title">Cha-ching sound off</string>
+    <string name="cha_ching_sound_issue_dialog_message">Turn it back on to hear the \'cha-ching\' with every new sale. Keep in tune with your customers\' orders!</string>
+    <string name="cha_ching_sound_issue_dialog_turn_on_sound">ENABLE SOUND</string>
+    <string name="cha_ching_sound_issue_dialog_keep_silent">KEEP SILENT</string>
+    <string name="cha_ching_sound_succcess_snackbar">All set! The \'cha-ching\' will now sound for every new order.</string>
+    <string name="cha_ching_sound_succcess_snackbar_action">TEST SOUND</string>
+    <string name="cha_ching_sound_test_notification_title">Test notification</string>
+    <string name="cha_ching_sound_test_notification_message">This is just a test notification to check the Cha-Ching sound.\nYou can swipe it away.</string>
     <!--
         Product Review Detail
     -->
@@ -2016,6 +2032,7 @@
     <string name="product_creation_package_photo_no_text_detected">No text detected. Please select another packaging photo or enter product details manually.</string>
     <string name="product_creation_package_photo_error">An error occurred while generating product name &amp; description.</string>
     <string name="product_filter_explore_plugin">Explore!</string>
+    <string name="scan_barcode_to_update_inventory_menu_item_title">Scan barcode to update inventory</string>
 
     <!--
         Product Add more details Bottom sheet
@@ -2237,6 +2254,8 @@
     <string name="settings_notifs_tone_detail">Play Cha-Ching sound on new order</string>
     <string name="settings_notifs_reviews">Product reviews</string>
     <string name="settings_notifs_reviews_detail">Get alerts for new product reviews</string>
+    <string name="settings_notifs_enable_chaching_sound">Enable Cha-Ching sound</string>
+    <string name="settings_notifs_enable_chaching_sound_description">Orders notifications sound has been disabled, turn it back on to hear the \'cha-ching\' with every new sale.</string>
     <string name="settings_image_optimization_title">Image optimization</string>
     <string name="settings_image_optimization_message">Resize and compress images for faster uploading</string>
     <string name="settings_about">About the app</string>
@@ -3386,6 +3405,7 @@
     <string name="theme_preview_activate_theme_button">Use this theme</string>
     <string name="theme_preview_theme_name">Theme: %1$s</string>
     <string name="theme_activated_successfully">Theme activated successfully</string>
+    <string name="theme_activation_failed">Theme activation failed, please try again!</string>
 
     <!--
     Store onboarding
@@ -3853,6 +3873,19 @@
     <string name="login_error_security_key">There was some trouble with the Security key login</string>
     <string name="notification_security_key_needed">Please provide your security key to continue.</string>
 
+    <!--
+    Scan to update inventory
+    -->
+    <string name="scan_to_update_inventory_unable_to_find_product">Product with SKU: %s not found. Please try again.</string>
+    <string name="scan_to_update_inventory_product_not_stock_managed">Product with SKU: %s is not stock-managed. Please try again.</string>
+    <string name="scan_to_update_inventory_increment_quantity_button">Quantity + 1</string>
+    <string name="scan_to_update_inventory_update_quantity_button">Update Quantity</string>
+    <string name="scan_to_update_inventory_product_details_button">View Product Details</string>
+    <string name="scan_to_update_inventory_success_snackbar">Quantity updated: %s</string>
+    <string name="scan_to_update_inventory_failure_snackbar">Something went wrong. Please try again</string>
+    <string name="scan_to_update_inventory_original_quantity_label">Original quantity</string>
+    <string name="scan_to_update_inventory_quantity_label">Quantity</string>
+    <string name="scan_to_update_inventory_product_label">Product</string>
 
     <string name="extension_configure_button">Configure</string>
     <string name="default_product_title">Product %s</string>