diff --git a/Model/Config/WebapiConfigProvider.php b/Model/Config/WebapiConfigProvider.php
index c141ce4..2d1008c 100644
--- a/Model/Config/WebapiConfigProvider.php
+++ b/Model/Config/WebapiConfigProvider.php
@@ -31,8 +31,8 @@
class WebapiConfigProvider implements WebapiValidationConfigProviderInterface
{
const PROTECTED_METHODS = [
- 'airwallexGuestPlaceOrder' => true,
- 'airwallexPlaceOrder' => true
+// 'airwallexGuestPlaceOrder' => true,
+// 'airwallexPlaceOrder' => true
];
protected IsCaptchaEnabledInterface $isEnabled;
protected ValidationConfigResolverInterface $configResolver;
diff --git a/Model/Service.php b/Model/Service.php
index 2662227..d515828 100644
--- a/Model/Service.php
+++ b/Model/Service.php
@@ -69,7 +69,7 @@ public function __construct(
PlaceOrderResponseInterfaceFactory $placeOrderResponseFactory,
CacheInterface $cache,
QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId,
- StoreManagerInterface $storeManager,
+ StoreManagerInterface $storeManager
)
{
$this->paymentIntents = $paymentIntents;
diff --git a/view/frontend/layout/catalog_product_view.xml b/view/frontend/layout/catalog_product_view.xml
index c377b56..f82e736 100644
--- a/view/frontend/layout/catalog_product_view.xml
+++ b/view/frontend/layout/catalog_product_view.xml
@@ -2,17 +2,7 @@
-
-
-
- -
-
-
-
- Airwallex_Payments/js/view/payment/method-renderer/express-checkout
-
-
-
-
-
+
diff --git a/view/frontend/templates/onepage/express.phtml b/view/frontend/templates/onepage/express.phtml
index c91a979..4c52cb5 100644
--- a/view/frontend/templates/onepage/express.phtml
+++ b/view/frontend/templates/onepage/express.phtml
@@ -11,3 +11,6 @@
+
diff --git a/view/frontend/templates/product_express.phtml b/view/frontend/templates/product_express.phtml
index 0e53901..9a30df8 100644
--- a/view/frontend/templates/product_express.phtml
+++ b/view/frontend/templates/product_express.phtml
@@ -2,8 +2,7 @@
require(['domReady!', 'Airwallex_Payments/js/view/payment/method-renderer/express-checkout'],
function (domReady, airwallexPayments) {
let obj = airwallexPayments()
- console.log('why')
- obj.loadPayment()
+ // obj.loadPayment()
});
@@ -12,7 +11,7 @@
-
+
diff --git a/view/frontend/web/css/airwallex_payment.css b/view/frontend/web/css/airwallex_payment.css
index 18f717c..4fae9aa 100644
--- a/view/frontend/web/css/airwallex_payment.css
+++ b/view/frontend/web/css/airwallex_payment.css
@@ -53,3 +53,7 @@
font-size: 2.6rem;
color: #333333;
}
+
+.cart-page-awx-express {
+ margin: 0 10px 15px
+}
diff --git a/view/frontend/web/js/view/payment/method-renderer/express-checkout.js b/view/frontend/web/js/view/payment/method-renderer/express-checkout.js
index 2745874..353a465 100644
--- a/view/frontend/web/js/view/payment/method-renderer/express-checkout.js
+++ b/view/frontend/web/js/view/payment/method-renderer/express-checkout.js
@@ -4,9 +4,9 @@ define(
'ko',
'mage/storage',
'Magento_Customer/js/customer-data',
- 'Magento_Checkout/js/model/error-processor', // todo
'mage/url',
'uiComponent',
+ 'Magento_Ui/js/modal/modal',
'Airwallex_Payments/js/view/payment/method-renderer/card-method-recaptcha' // todo
],
function (
@@ -14,9 +14,9 @@ define(
ko,
storage,
customerData,
- errorProcessor,
url,
Component,
+ modal,
cardMethodRecaptcha
) {
'use strict';
@@ -25,12 +25,11 @@ define(
defaults: {
paymentConfig: {},
recaptcha: null,
- validationError: ko.observable(),
isExpressActive: ko.observable(false),
googlepay: null,
isExpressLoaded: false,
quoteRemote: {},
- guestEmail: "", // todo how about the checkout page
+ guestEmail: "",
billingAddress: {},
shippingMethods: [],
methods: [],
@@ -147,9 +146,12 @@ define(
},
isShippingRequired() {
- return !this.quoteRemote.is_virtual && location.hash !== '#payment'
+ return !(this.quoteRemote.is_virtual || this.isCheckoutPage())
},
+ isCheckoutPage() {
+ return location.hash === '#payment'
+ },
setGuestEmail(email) {
this.guestEmail = email
@@ -227,7 +229,7 @@ define(
);
},
- async loadPayment() {
+ init() {
if (this.isExpressLoaded) {
return;
}
@@ -241,12 +243,37 @@ define(
this.storeCode = parts[parts.length - 1]
}
+ modal({
+ type: 'popup',
+ responsive: true,
+ title: 'Error',
+ buttons: [{
+ text: $.mage.__('OK'),
+ class: '',
+ click: function () {
+ this.closeModal();
+ window.location.reload()
+ }
+ }]
+ }, $('#awx-modal'));
+ },
+
+ async loadPayment(from) {
+ console.log('xx')
+ this.init()
+ // this is cart page, there can only one express checkout button
+ if (from === 'minicart' && (window.location.pathname.endsWith('/checkout/cart/')
+ || $('.product-info-main').length)) {
+ $(".cart-page-awx-express").remove()
+ return
+ }
+
let self = this;
await this.fetchQuote();
this.isExpressActive(this.paymentConfig.is_express_active)
this.recaptcha = cardMethodRecaptcha();
- this.recaptcha.renderReCaptcha();
+ // this.recaptcha.renderReCaptcha();
Airwallex.init({
env: this.paymentConfig.mode,
@@ -263,12 +290,14 @@ define(
// 1. estimateShippingMethods
let addr = self.getIntermediateShippingAddressFromGoogle(event.detail.intermediatePaymentData.shippingAddress)
this.methods = await this.estimateShippingMethods(addr)
+
// 2. postShippingInformation
let {information, selectedMethod} = self.constructAddressInformationForGoogle(
event.detail.intermediatePaymentData,
this.methods
)
- let newQuote = await self.postShippingInformation(information)
+ await self.postShippingInformation(information)
+
// 3. update quote
await self.fetchQuote()
@@ -285,13 +314,12 @@ define(
self.setGuestEmail(event.detail.paymentData.email)
if (self.isShippingRequired()) {
- let {
- information,
- selectedMethod
- } = self.constructAddressInformationForGoogle(event.detail.paymentData, this.methods)
+ // this time google provide full billing address, we should post to magento
+ let {information} = self.constructAddressInformationForGoogle(
+ event.detail.paymentData, this.methods
+ )
await self.postShippingInformation(information)
-
- self.setBillingAddressFromGoogle(event.detail.paymentData);
+ self.setIntentConfirmBillingAddressFromGoogle(event.detail.paymentData);
}
this.placeOrder()
});
@@ -310,18 +338,12 @@ define(
processPlaceOrderError: function (response) {
$('body').trigger('processStop');
- if (response?.getResponseHeader) {
- errorProcessor.process(response, this.messageContainer);
- const redirectURL = response.getResponseHeader('errorRedirectAction');
-
- if (redirectURL) {
- setTimeout(function () {
- errorProcessor.redirectTo(redirectURL);
- }, 3000);
- }
- } else if (response?.message) {
- this.validationError(response.message);
+ let errorMessage = response.message
+ if (response.responseText && response.responseText.indexOf('shipping address') !== -1) {
+ errorMessage = $.mage.__('Placing an order is failed: please try another address.')
}
+ $("#awx-modal .modal-body-content").html(errorMessage)
+ $('#awx-modal').modal('openModal');
},
getCartId() {
@@ -360,13 +382,15 @@ define(
payload.xReCaptchaValue = await (new Promise(function (resolve) {
self.getRecaptchaToken(resolve);
}));
+
if (!self.isLoggedIn()) {
- payload.email = self.guestEmail;
+ payload.email = self.isCheckoutPage() ? $("#customer-email").val() : self.guestEmail;
}
const intentResponse = await storage.post(
serviceUrl, JSON.stringify(payload), true, 'application/json'
);
+
const params = {};
params.id = intentResponse.intent_id;
params.client_secret = intentResponse.client_secret;
@@ -377,8 +401,6 @@ define(
payload.xReCaptchaValue = null;
if (self.isShippingRequired()) {
payload.billingAddress = self.getBillingAddressToPlaceOrder()
- } else {
- // payload.billingAddress = quote.billingAddress();
}
await self.googlepay.confirmIntent(params);
@@ -407,13 +429,15 @@ define(
customerData.reload(['cart'], true);
}
- window.location.replace(url.build( '/checkout/onepage/success/'));
+ window.location.replace(url.build('/checkout/onepage/success/'));
}).catch(
self.processPlaceOrderError.bind(self)
).finally(
function () {
self.recaptcha.reset();
- $('body').trigger('processStop');
+ setTimeout(() => {
+ $('body').trigger('processStop')
+ }, 2000)
}
);
},
@@ -457,7 +481,6 @@ define(
let names = addr.name.split(' ')
billingAddress = {
countryId: addr.countryCode,
- // "regionCode": "DC",
region: addr.administrativeArea,
street: [addr.address1 + addr.address2 + addr.address3],
telephone: addr.phoneNumber,
@@ -513,7 +536,7 @@ define(
}
},
- setBillingAddressFromGoogle(data) {
+ setIntentConfirmBillingAddressFromGoogle(data) {
let addr = data.paymentMethodData.info.billingAddress
let names = addr.name.split(' ')
this.billingAddress = {
@@ -530,24 +553,6 @@ define(
telephone: addr.phoneNumber
}
},
-
- setBillingAddressFromOfficial() {
- const billingAddress = quote.billingAddress();
-
- this.billingAddress = {
- address: {
- city: billingAddress.city,
- country_code: billingAddress.countryId,
- postcode: billingAddress.postcode,
- state: billingAddress.region,
- street: billingAddress.street
- },
- first_name: billingAddress.firstname,
- last_name: billingAddress.lastname,
- email: this.quoteRemote.email,
- telephone: billingAddress.telephone
- }
- },
});
}
);
diff --git a/view/frontend/web/template/payment/express-checkout-minicart.html b/view/frontend/web/template/payment/express-checkout-minicart.html
index 49cfc73..49915f0 100644
--- a/view/frontend/web/template/payment/express-checkout-minicart.html
+++ b/view/frontend/web/template/payment/express-checkout-minicart.html
@@ -1,6 +1,12 @@
-
-
+
+
+
+
+
here is applepay
-
here is applepay
+
+