-
- `;
+ return '';
},
fields: {
email: {
diff --git a/modules/ppcp-axo/resources/js/Views/CardView.js b/modules/ppcp-axo/resources/js/Views/CardView.js
index 9ca8670a2..82c15079c 100644
--- a/modules/ppcp-axo/resources/js/Views/CardView.js
+++ b/modules/ppcp-axo/resources/js/Views/CardView.js
@@ -20,10 +20,6 @@ class CardView {
if (data.isEmpty()) {
return `
-
- Billing
- Edit -${data.value('email')}
- ${data.value('company')}
- ${data.value('firstName')} ${data.value('lastName')}
- ${data.value('street1')}
- ${data.value('street2')}
- ${data.value('postCode')} ${data.value('city')}
- ${valueOfSelect('#billing_state', data.value('stateCode'))}
- ${valueOfSelect('#billing_country', data.value('countryCode'))}
-
-
`;
@@ -34,8 +30,8 @@ class CardView {
const cardIcons = {
'VISA': 'visa-light.svg',
'MASTER_CARD': 'mastercard-light.svg',
- 'AMEX': 'amex.svg',
- 'DISCOVER': 'discover.svg',
+ 'AMEX': 'amex-light.svg',
+ 'DISCOVER': 'discover-light.svg',
'DINERS': 'dinersclub-light.svg',
'JCB': 'jcb-light.svg',
'UNIONPAY': 'unionpay-light.svg',
@@ -52,7 +48,7 @@ class CardView {
-
- Please fill in your card details.
- Add card details
${selectOtherPaymentMethod()}]} "${data.value('brand')}")
diff --git a/modules/ppcp-axo/services.php b/modules/ppcp-axo/services.php
index 44253f22d..0020169a7 100644
--- a/modules/ppcp-axo/services.php
+++ b/modules/ppcp-axo/services.php
@@ -13,7 +13,10 @@ use WooCommerce\PayPalCommerce\Axo\Assets\AxoManager;
use WooCommerce\PayPalCommerce\Axo\Gateway\AxoGateway;
use WooCommerce\PayPalCommerce\Axo\Helper\ApmApplies;
use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
use WooCommerce\PayPalCommerce\WcGateway\Helper\CartCheckoutDetector;
+use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings;
return array(
@@ -58,7 +61,8 @@ return array(
$container->get( 'onboarding.environment' ),
$container->get( 'wcgateway.settings.status' ),
$container->get( 'api.shop.currency' ),
- $container->get( 'woocommerce.logger.woocommerce' )
+ $container->get( 'woocommerce.logger.woocommerce' ),
+ $container->get( 'wcgateway.url' )
);
},
@@ -191,6 +195,40 @@ return array(
return '';
}
+ return '' . $notice_content . '
Cart & Classic Cart Smart Button Locations cannot be disabled while Fastlane is active.',
+ 'woocommerce-paypal-payments'
+ ),
+ esc_url( $fastlane_settings_url )
+ );
+ } else {
+ return '';
+ }
+
return '' . $notice_content . '
';
+ }
+ );
+
+ add_action(
+ 'woocommerce_checkout_after_customer_details',
+ function () {
+ echo '
';
+ }
+ );
+
+ add_action(
+ 'woocommerce_checkout_billing',
+ function () {
+ echo '';
+ },
+ 8
+ );
+
+ add_action(
+ 'woocommerce_checkout_billing',
+ function () {
+ echo '
';
+ },
+ 12
+ );
+ }
+ }
}
diff --git a/modules/ppcp-axo/src/FrontendLoggerEndpoint.php b/modules/ppcp-axo/src/FrontendLoggerEndpoint.php
new file mode 100644
index 000000000..e17a819e4
--- /dev/null
+++ b/modules/ppcp-axo/src/FrontendLoggerEndpoint.php
@@ -0,0 +1,80 @@
+request_data = $request_data;
+ $this->logger = $logger;
+ }
+
+ /**
+ * Returns the nonce.
+ *
+ * @return string
+ */
+ public static function nonce(): string {
+ return self::ENDPOINT;
+ }
+
+ /**
+ * Handles the request.
+ *
+ * @return bool
+ * @throws Exception On Error.
+ */
+ public function handle_request(): bool {
+ $data = $this->request_data->read_request( $this->nonce() );
+ $level = $data['log']['level'] ?? 'info';
+
+ switch ( $level ) {
+ case 'error':
+ $this->logger->error( '[AXO] ' . $data['log']['message'] );
+ break;
+ default:
+ $this->logger->info( '[AXO] ' . $data['log']['message'] );
+ break;
+ }
+
+ wp_send_json_success();
+ return true;
+ }
+}
diff --git a/modules/ppcp-axo/src/Helper/PropertiesDictionary.php b/modules/ppcp-axo/src/Helper/PropertiesDictionary.php
index 024c3649c..a07c4ace3 100644
--- a/modules/ppcp-axo/src/Helper/PropertiesDictionary.php
+++ b/modules/ppcp-axo/src/Helper/PropertiesDictionary.php
@@ -26,4 +26,16 @@ class PropertiesDictionary {
);
}
+ /**
+ * Returns the list of possible cardholder name options.
+ *
+ * @return array
+ */
+ public static function cardholder_name_options(): array {
+ return array(
+ 'yes' => __( 'Yes', 'woocommerce-paypal-payments' ),
+ 'no' => __( 'No', 'woocommerce-paypal-payments' ),
+ );
+ }
+
}
diff --git a/modules/ppcp-blocks/extensions.php b/modules/ppcp-blocks/extensions.php
index c2b607780..b32f5bbc6 100644
--- a/modules/ppcp-blocks/extensions.php
+++ b/modules/ppcp-blocks/extensions.php
@@ -51,16 +51,7 @@ return array(
);
}
- $subscription_helper = $container->get( 'wc-subscriptions.helper' );
-
- if ( $subscription_helper->plugin_is_active() ) {
- $label .= __(
- 'Important: Cannot be deactivated while the WooCommerce Subscriptions plugin is active.