Skip to content

Merge release/21.8 into trunk #15237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
staskus merged 11 commits into from
Feb 21, 2025
Merged

Merge release/21.8 into trunk #15237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
748d371
Do not show cash button for validating order state
staskus Feb 21, 2025
232a21d
Cancel payment task only when exiting POS
staskus Feb 21, 2025
67982d8
Merge branch 'release/21.8' into beta-fix/revert-showing-cash-poyment…
staskus Feb 21, 2025
a6287af
Hide cash payment button for idle and preparingReader states if eligi…
staskus Feb 21, 2025
350dbab
Update PointOfSaleAggregateModelTests.swift
staskus Feb 21, 2025
88a1015
Fix payment success test
joshheald Feb 21, 2025
4f4f837
[Woo POS] [Beta fix] Cash payment issues - hide button when checking …
staskus Feb 21, 2025
3726cac
Update app translations – `Localizable.strings`
wpmobilebot Feb 21, 2025
b669dd2
Update metadata translations
wpmobilebot Feb 21, 2025
b2dc723
Bump version number
wpmobilebot Feb 21, 2025
3107322
Merge branch 'trunk' into merge/release-21.8-into-trunk
staskus Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions WooCommerce/Classes/POS/Card Present Payments/CardPresentPaymentService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,6 @@ final class CardPresentPaymentService: CardPresentPaymentFacade {

@MainActor
func cancelPayment() async throws {
cancelPaymentTask()

try await withCheckedThrowingContinuation { continuation in
var nillableContinuation: CheckedContinuation<Void, any Error>? = continuation
let action = CardPresentPaymentAction.cancelPayment { result in
Expand Down
3 changes: 3 additions & 0 deletions WooCommerce/Classes/POS/Models/PointOfSaleAggregateModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,9 @@ extension PointOfSaleAggregateModel {
try await cardPresentPaymentService.cancelPayment()
}

// Cancels payment task
cardPresentPaymentService.cancelPayment()

// Before exiting Point of Sale, we warn the merchant about losing their in-progress order.
// We need to clear it down as any accidental retention can cause issues especially when reconnecting card readers.
orderController.clearOrder()
Expand Down
3 changes: 2 additions & 1 deletion WooCommerce/Classes/POS/Presentation/TotalsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ struct TotalsView: View {
.padding(.horizontal, Constants.buttonHorizontalPadding)
.safeAreaPadding(.bottom, Constants.cashButtonBottomPadding)
.renderedIf(viewHelper.shouldShowCollectCashPaymentButton(orderState: posModel.orderState,
paymentState: posModel.paymentState))
paymentState: posModel.paymentState,
cardReaderConnectionStatus: posModel.cardReaderConnectionStatus))
}
.animation(.default, value: isShowingPaymentView)
case .error(let viewModel):
Expand Down
16 changes: 11 additions & 5 deletions WooCommerce/Classes/POS/ViewHelpers/TotalsViewHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,23 @@ final class TotalsViewHelper {
}

func shouldShowCollectCashPaymentButton(orderState: PointOfSaleOrderState,
paymentState: PointOfSalePaymentState) -> Bool {
paymentState: PointOfSalePaymentState,
cardReaderConnectionStatus: CardPresentPaymentReaderConnectionStatus) -> Bool {
guard orderState != .syncing,
case .card(let cardState) = paymentState else {
return false
}

if cardReaderConnectionStatus == .disconnected {
return true
}

if case let .loaded(totals) = orderState, totals.orderTotalDecimal.isZero {
return true
}

switch cardState {
case .idle,
.validatingOrder,
.validatingOrderError,
.preparingReader,
case .validatingOrderError,
.acceptingCard:
return true
default:
Expand Down
58 changes: 2 additions & 56 deletions WooCommerce/Resources/ar.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1266,8 +1266,7 @@ which should be translated separately and considered part of this sentence. */
/* Title of the notice when there is an error updating selected products */
"Cannot update products" = "يتعذر تحديث المنتجات";

/* The title of the alert when there is an error uploading an image
Title of the alert when there is an error uploading image(s) */
/* Title of the alert when there is an error uploading image(s) */
"Cannot upload image" = "تعذر تحميل الصورة";

/* Error message displayed when failed to check for Jetpack connection. */
Expand Down Expand Up @@ -3638,9 +3637,6 @@ If your translation of that term also happens to contains a hyphen, please be su
/* Title for the unfinished application password alert */
"It seems that you have not approved the app connection yet. Are you sure you want to exit?" = "يبدو أنك لم توافق على ربط التطبيق حتى الآن. هل تريد بالتأكيد الإنهاء؟";

/* An error message displayed when the user tries to log in to the app with site credentials but has application password disabled. Reads like: It seems that your site google.com has Application Password disabled. Please enable it to use the WooCommerce app. */
"It seems that your site %@ has Application Password disabled. Please enable it to use the WooCommerce app." = "يبدو أن ميزة كلمة مرور التطبيق معطّلة في موقع %@ الخاص بك. يرجى تمكينها لاستخدام تطبيق WooCommerce.";

/* An error message displayed when the user tries to log in to the app with a simple WP.com site. Reads like: It seems that your site google.com is a simple WordPress.com site that cannot install plugins. Please upgrade your plan to use WooCommerce. */
"It seems that your site %@ is a simple WordPress.com site that cannot install plugins. Please upgrade your plan to use WooCommerce." = "يبدو أن موقعك %@ عبارة عن موقع ووردبريس.كوم بسيط يتعذر عليه تثبيت إضافات. يرجى ترقية خطتك لاستخدام WooCommerce.";

Expand Down Expand Up @@ -3939,7 +3935,6 @@ If your translation of that term also happens to contains a hyphen, please be su
Action button that will restart the login flow.Presented when logging in with a site address that does not have a valid Jetpack installation
Action button that will restart the login flow.Presented when logging in with a site address that does not have WooCommerce
Action button that will restart the login flow.Presented when the user tries to log in to the app with a simple WP.com site.
Action button that will restart the login flow.Presented when the user tries to log in to the app with site credentials but has application password disabled.
Button to restart the login flow.
Button to trigger connection to another account in store picker */
"Log In With Another Account" = "تسجيل الدخول باستخدام حساب آخر";
Expand Down Expand Up @@ -3977,9 +3972,6 @@ If your translation of that term also happens to contains a hyphen, please be su
/* Instruction text on the login's email address screen. */
"Log in to your WordPress.com account with your email address." = "سجِّل الدخول إلى حساب وردبرس.كوم الخاص بك باستخدام عنوان بريدك الإلكتروني.";

/* Button that will navigate to the authentication flow with WP.com */
"Log in with WordPress.com" = "تسجيل دخول باستخدام WordPress.com";

/* Action button that will restart the login flow.Presented when logging in with an email address that does not match a WordPress.com account */
"Log in with another account" = "تسجيل الدخول باستخدام حساب آخر";

Expand Down Expand Up @@ -5156,8 +5148,7 @@ If your translation of that term also happens to contains a hyphen, please be su
/* Subtitle message displayed when the merchant already has one store upgraded under the same Apple ID. */
"Please try again, or contact support for assistance" = "ترجى المحاولة مجددًا أو الاتصال بالدعم للحصول على المساعدة";

/* Account creation error when an unexpected error occurs.
The message of the alert when there is an error uploading an image */
/* Account creation error when an unexpected error occurs. */
"Please try again." = "يُرجى المحاولة مرة أخرى.";

/* Error message when Jetpack activation fails */
Expand Down Expand Up @@ -8438,9 +8429,6 @@ If your translation of that term also happens to contains a hyphen, please be su
/* Title of alert informing users of what email they can use to sign in.Presented when users attempt to log in with an email that does not match a WP.com account */
"What email do I use to sign in?" = "ما البريد الإلكتروني الذي أستخدمه لتسجيل الدخول؟";

/* Button that will navigate to a web page explaining Application Password */
"What is Application Password?" = "ما المقصود بكلمة مرور التطبيق؟";

/* Button linking to webview that explains what Jetpack isPresented when logging in with a site address that does not have a valid Jetpack installation
Title of alert informing users of what Jetpack is. Presented when users attempt to log in without Jetpack installed or connected */
"What is Jetpack?" = "ما المقصود بـ Jetpack؟";
Expand Down Expand Up @@ -11374,15 +11362,9 @@ which should be translated separately and considered part of this sentence. */
/* Button to try to collect a payment again. Presented to users after collecting a payment intention creation fails on the Point of Sale Checkout */
"pointOfSale.cardPresent.paymentIntentCreationError.tryPaymentAgain.button.title" = "محاولة الدفع مجددًا";

/* Indicates to wait while payment is processing. Presented to users when payment collection starts */
"pointOfSale.cardPresent.paymentProcessing.message" = "يرجى الانتظار...";

/* Indicates the status of a card reader. Presented to users when payment collection starts */
"pointOfSale.cardPresent.paymentProcessing.title" = "معالجة الدفع";

/* Message shown on the Point of Sale checkout while the reader is being prepared. */
"pointOfSale.cardPresent.preparingForPayment.message" = "بطاقة التحضير للدفع";

/* Title shown on the Point of Sale checkout while the reader is being prepared. */
"pointOfSale.cardPresent.preparingForPayment.title" = "الاستعداد";

Expand All @@ -11404,12 +11386,6 @@ which should be translated separately and considered part of this sentence. */
/* Indicates the status of a card reader. Presented to users when payment collection starts */
"pointOfSale.cardPresent.presentCard.title" = "مستعد للدفع";

/* Button to connect to the card reader, shown on the Point of Sale Checkout as a primary CTA. */
"pointOfSale.cardPresent.readerNotConnected.button.title" = "الربط بالقارئ";

/* Instruction to merchants shown on the Point of Sale Checkout, so they can take a card payment. */
"pointOfSale.cardPresent.readerNotConnected.instruction" = "لمتابعة عملية الدفع هذه، يرجى ربط القارئ الخاص بك.";

/* Error message. Presented to users when card reader is not connected on the Point of Sale Checkout */
"pointOfSale.cardPresent.readerNotConnected.title" = "لم يتم ربط القارئ";

Expand All @@ -11428,9 +11404,6 @@ which should be translated separately and considered part of this sentence. */
/* Error title when the order amount is below the minimum amount allowed for a card payment on POS. */
"pointOfSale.cardPresent.validatingOrderError.belowMinimumAmount.title" = "يتعذر قبول الدفع بالبطاقة";

/* Button title to retry order validation. */
"pointOfSale.cardPresent.validatingOrderError.retry" = "إعادة المحاولة";

/* Title shown on the Point of Sale checkout while the order validation fails. */
"pointOfSale.cardPresent.validatingOrderError.title" = "خطأ في أثناء التحقق من الطلب";

Expand Down Expand Up @@ -11656,12 +11629,6 @@ which should be translated separately and considered part of this sentence. */
/* Title of the error when failing to synchronize order and calculate order totals */
"pointOfSale.orderSync.error.title" = "تعذر تحميل الإجماليات";

/* Message shown to users when payment is made. %1$@ is a placeholder for the order total, e.g $10.50. Please include %1$@ in your formatted string */
"pointOfSale.paymentSuccessful.message.card" = "تم سداد دفعة بالبطاقة قدرها %1$@ بنجاح";

/* Message shown to users when payment is made. %1$@ is a placeholder for the order total, e.g $10.50. Please include %1$@ in your formatted string */
"pointOfSale.paymentSuccessful.message.cash" = "تم سداد دفعة نقدية قدرها %1$@ بنجاح";

/* Title shown to users when payment is made successfully. */
"pointOfSale.paymentSuccessful.title" = "نجح الدفع";

Expand Down Expand Up @@ -11755,27 +11722,15 @@ which should be translated separately and considered part of this sentence. */
/* Title at the top of the Point of Sale item list full screen. */
"pos.itemListFullscreen.title" = "المنتجات";

/* Accessibility label for button to dismiss the product selector header banner. The banner explains current POS limitations. Tapping the button prevents it being shown again. */
"pos.itemListView.headerBanner.dismiss.button.accessibiltyLabel" = "تجاهل";

/* Additional text within the product selector header banner, which explains current POS limitations */
"pos.itemlistview.headerBanner.hint" = "أما أنواع المنتجات الأخرى، مثل: المنتجات المتغيرة والظاهرية، ستصبح متوفرة في التحديثات المستقبلية.";

/* Additional text within the product selector header banner, which explains current POS limitations */
"pos.itemlistview.headerBanner.hint.simpleAndVariable" = "أما أنواع المنتجات الأخرى، فستصبح التحديثات المستقبلية متوفرة.";

/* Link to more information within the product selector header banner, which explains current POS limitations */
"pos.itemlistview.headerBanner.learnMoreHint" = "التعرُّف على المزيد";

/* Subtitle of the product selector header banner, which explains current POS limitations */
"pos.itemlistview.headerBanner.subtitle" = "لا تتوفر سوى المنتجات المادية البسيطة التي تتضمن نقاط بيع الآن.";

/* Subtitle of the product selector header banner, which explains current POS limitations */
"pos.itemlistview.headerBanner.subtitle.simpleAndVariable" = "لا يمكن استخدام سوى المنتجات غير القابلة للتنزيل البسيطة والمتغيرة التي تتضمن نقطة بيع الآن.";

/* Title of the product selector header banner, which explains current POS limitations */
"pos.itemlistview.headerBanner.title" = "إظهار المنتجات البسيطة فقط";

/* Title of the product selector header banner, which explains current POS limitations */
"pos.itemlistview.headerBanner.title.simpleAndVariable" = "إظهار المنتجات البسيطة والمتغيرة فقط";

Expand Down Expand Up @@ -11806,21 +11761,12 @@ which should be translated separately and considered part of this sentence. */
/* Action text in the simple products information modal in POS */
"pos.simpleProductsModal.action" = "إنشاء طلب في إدارة المتجر";

/* Hint in the simple products information modal in POS */
"pos.simpleProductsModal.hint" = "لتلقي دفعة مقابل منتج غير بسيط، اخرج من نقطة البيع وأنشئ طلبًا جديدًا من علامة تبويب الطلبات.";

/* Hint in the simple products information modal in POS, explaining future plans when variable products are supported */
"pos.simpleProductsModal.hint.variableAndSimple" = "لتلقي دفعة مقابل منتج غير مدعوم، اخرج من نقطة البيع وأنشئ طلبًا جديدًا من علامة تبويب الطلبات.";

/* Message in the simple products information modal in POS, explaining future plans */
"pos.simpleProductsModal.message.future" = "أما أنواع المنتجات الأخرى، مثل: المنتجات المتغيرة والظاهرية، ستتوفر في التحديثات المستقبلية.";

/* Message in the simple products information modal in POS, explaining future plans when variable products are supported */
"pos.simpleProductsModal.message.future.variableAndSimple" = "أما أنواع المنتجات الأخرى، فستتوفر في التحديثات المستقبلية.";

/* Message in the simple products information modal in POS */
"pos.simpleProductsModal.message.issue" = "لا يمكن استخدام إلا المنتجات المادية البسيطة التي تتضمن نقطة بيع الآن.";

/* Message in the simple products information modal in POS when variable products are supported */
"pos.simpleProductsModal.message.issue.variableAndSimple" = "لا يمكن استخدام سوى المنتجات غير القابلة للتنزيل البسيطة والمتغيرة التي تتضمن نقطة بيع الآن.";

Expand Down
Loading