Commit graph

448 commits

Author SHA1 Message Date
Emili Castells
4bedeab529
Merge pull request #1689 from woocommerce/wip/apple-google-combined
Combined Apple Pay and Google Pay integration (154, 1744)
2023-09-13 13:56:45 +02:00
Emili Castells Guasch
b116d6cb20 Remove subscriptions api feature flag 2023-09-13 09:14:57 +02:00
carmenmaymo
f05cba555c
Merge branch 'feat/PCP-154-apple-pay-payment' into wip/apple-google-combined 2023-09-12 11:55:42 +02:00
carmenmaymo
2f77020d2f
Merge branch 'trunk' into feat/PCP-154-apple-pay-payment 2023-09-12 11:55:01 +02:00
Pedro Silva
2e7f9b46b0
Merge branch 'PCP-1744-google-pay-integration' into wip/apple-google-combined
# Conflicts:
#	modules.php
2023-09-11 10:50:34 +01:00
Narek Zakarian
4747d9d224
Create trait to check if tracking is enabled 2023-09-08 19:30:36 +04:00
carmenmaymo
ff6b3bf5ce
Merge branch 'trunk' into feat/PCP-154-apple-pay-payment 2023-09-08 11:58:33 +02:00
Emili Castells
867949cce0
Merge pull request #1562 from woocommerce/PCP-1742-upgrade-tracking-integration
Upgrade tracking integration (1742)
2023-09-07 09:54:11 +02:00
Pedro Silva
318217acb9
Fix GooglePay general fixes / improvements 2023-09-06 11:55:26 +01:00
carmenmaymo
614a37f234
Merge branch 'trunk' into feat/PCP-154-apple-pay-payment 2023-09-06 10:55:11 +02:00
Emili Castells
104aa3b22a
Merge pull request #1588 from woocommerce/PCP-1926-improve-invalid-currency-backend-notice
improve invalid currency backend notice (1926)
2023-09-04 17:17:08 +02:00
Emili Castells Guasch
eedcbea51b Fix merge conflicts 2023-08-30 15:57:03 +02:00
Pedro Silva
c4c433ac8e
Refactor APM admin settings 2023-08-30 11:33:40 +01:00
Pedro Silva
d6f6d05431
Refactor APM admin settings 2023-08-30 11:28:18 +01:00
Emili Castells
2571d31ad8
Merge pull request #1578 from woocommerce/PCP-1512-pay-pal-fee-and-pay-pal-payout-do-not-change-on-order-if-we-do-partial-refund
PayPal fee and PayPal Payout do not change on order if we do partial refund (1512)
2023-08-30 11:05:34 +02:00
Pedro Silva
1b87257fdb
Refactor unsupported currency notice to show only on payment pages and under the PayPal plugin. 2023-08-11 10:35:50 +01:00
Emili Castells
402b87face
Merge pull request #1443 from woocommerce/PCP-991-v2-detach-vaulting-from-wc-subscriptions-support
PayPal Subscriptions API fixes and improvements (991)
2023-08-10 11:29:03 +02:00
Pedro Silva
d32aaab1af
Add updating refund fees in order 2023-08-04 17:51:32 +01:00
Narek Zakarian
f524909c00
Merge branch 'trunk' into PCP-1742-upgrade-tracking-integration 2023-08-03 18:27:35 +04:00
Pedro Silva
c035cdaf3e
Add previous token validation for OnboardingUrl
Add retries on listen_for_merchant_id() to wait for client_id and signature
2023-07-31 18:20:39 +01:00
Narek Zakarian
c8e87120d4
refactor tracking integration 2023-07-25 13:17:32 +04:00
Emili Castells Guasch
d6c12ce29d Merge branch 'trunk' into PCP-991-v2-detach-vaulting-from-wc-subscriptions-support 2023-07-19 14:26:15 +02:00
Emili Castells
75f73ea090
Merge pull request #1427 from woocommerce/feat/PCP-1709_soft_descriptor
Include soft descriptor for card's activity
2023-07-18 15:40:04 +02:00
Emili Castells
0aac0cf4e5
Merge pull request #1490 from woocommerce/PCP-1842-auto-disabled-acdc-vaulting-after-updating-to-2-1-0
Auto-disabled ACDC vaulting after updating to 2.1.0 (1842)
2023-07-18 15:38:56 +02:00
Emili Castells Guasch
96e434d4b0 Merge trunk 2023-07-12 11:14:23 +02:00
Pedro Silva
aa2889472d
Add subscriptions mode to WooCommerce status page. 2023-07-11 15:47:45 +01:00
Pedro Silva
a9e56a3ff3
Remove dependency of ACDC Vault with Reference Transaction enabled 2023-07-04 17:53:59 +01:00
Alex P
2b566fcf44
Merge branch 'trunk' into PCP-860-apm 2023-06-27 15:54:06 +03:00
Emili Castells
70412a8f27
Merge pull request #1358 from woocommerce/pcp-1583-card-button-no-location
Do not show broken card button gateway when no checkout location
2023-06-27 11:37:18 +02:00
carmenmaymo
356fc38698
Use api currency service 2023-06-15 11:39:29 +02:00
carmenmaymo
013ffb5213
Check supported currencies in notice method 2023-06-14 12:36:55 +02:00
carmenmaymo
d3249b140a
Add unsupported currency admin notice 2023-06-14 12:15:20 +02:00
Alex P
e29ef9c7d6
Use continuation mode when APM does not redirect back 2023-06-14 08:59:30 +03:00
Emili Castells Guasch
7f25e1edd9 Update subscription mode description 2023-06-13 12:17:49 +02:00
carmenmaymo
b7c4055610
Fix CS 2023-06-12 09:00:08 +02:00
carmenmaymo
65858c5f42
Merge branch 'trunk' into feat/PCP-1709_soft_descriptor 2023-06-12 08:47:23 +02:00
Alex P
8979c9e605
Stop searching for prefix in custom IDs
we are not creating such IDs for 2 years already
2023-06-08 16:00:21 +03:00
Alex P
eb4418931a
Improve return url handling when no WC order 2023-06-07 20:12:28 +03:00
Alex P
e3bd42b93b
Add return-url error logging 2023-06-07 16:27:31 +03:00
Emili Castells Guasch
5082a0d17b Do not render PayPal subscription button if no plan is connected 2023-06-07 12:50:18 +02:00
Alex P
c0368e9ada
Do not show broken card button gateway when no checkout location
Removes the card button gateway together with the PayPal gateway when disabled in checkout (since it gets broken anyway).
Also refactored the admin notice about disabled gateway to add a message about disabled location.
2023-06-06 15:41:05 +03:00
carmenmaymo
220da3cfea
Add soft descriptor setting PCP-1709 2023-06-02 10:48:47 +02:00
Alex P
df81e5e411
Remove unused 2023-05-31 16:17:09 +03:00
carmenmaymo
f812d043af
Add soft descriptor to PurchaseUnitFactory PCP-1709 2023-05-30 15:11:13 +02:00
Emili Castells Guasch
3c0e807758 Fix merge conflicts 2023-05-16 12:44:14 +02:00
Emili Castells
918f09f47d
Merge pull request #1346 from woocommerce/pcp-157-blocks
Add express cart/checkout block
2023-05-16 11:14:53 +02:00
Emili Castells Guasch
9c1750c174 Add subscriptions api feature flag (WIP) 2023-05-15 15:38:40 +02:00
Emili Castells Guasch
b126d77dfb Merge branch 'trunk' into PCP-991-detach-vaulting-from-wc-subscriptions-support 2023-05-15 12:16:20 +02:00
Alex P
8dc0079a41
Merge branch 'trunk' into PCP-1480-order-left-on-hold-after-payment-trough-pui-if-merchant-connected-account-trough-manual-credential-input 2023-05-12 15:03:31 +03:00
Emili Castells Guasch
69542e37f3 Add subscriptions mode tooltip description 2023-05-08 14:32:55 +02:00