Deprecated Api Updates

degica · Mar 29, 2023 · cadadb4 · cadadb4
1 parent 63ef463
commit cadadb4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/cartridges/app_komoju_controllers/cartridge/controllers/COBilling.js b/cartridges/app_komoju_controllers/cartridge/controllers/COBilling.js
@@ -606,7 +606,7 @@ function billing() {
                     // Mark step as fulfilled
 
                     app.getForm('billing').object.fulfilled.value = true;
-                    if (currentBasket.paymentInstrument.paymentMethod !== 'KOMOJU_HOSTED_PAGE') {
+                    if (selectedPaymentMethod.ID !== 'KOMOJU_HOSTED_PAGE') {
                         app.getController('COSummary').Start();
                         return;
                     }

diff --git a/cartridges/app_komoju_controllers/cartridge/controllers/COSummary.js b/cartridges/app_komoju_controllers/cartridge/controllers/COSummary.js
@@ -109,8 +109,13 @@ function start(context) {
  * account creation.
  */
 function showConfirmation(order) {
-    var paymentMethod = order.paymentInstrument.custom.komojuPaymentMethodType;
-    var transactionStatus = order.paymentInstrument.custom.transactionStatus;
+    var currentKOMOJUPaymentInstrument = order.getPaymentInstruments('KOMOJU_HOSTED_PAGE');
+    var paymentMethod;
+    var transactionStatus;
+    if (currentKOMOJUPaymentInstrument.length > 0) {
+        paymentMethod = order.getPaymentInstruments('KOMOJU_HOSTED_PAGE')[0].custom.komojuPaymentMethodType;
+        transactionStatus = order.getPaymentInstruments('KOMOJU_HOSTED_PAGE')[0].custom.transactionStatus;
+    }
     if (!customer.authenticated) {
         // Initializes the account creation form for guest checkouts by populating the first and last name with the
         // used billing address.

diff --git a/cartridges/app_komoju_core/cartridge/templates/default/checkout/summary/summary.isml b/cartridges/app_komoju_core/cartridge/templates/default/checkout/summary/summary.isml
@@ -262,7 +262,7 @@
 
 			<input type="hidden" class="urlkomojugeturl" data-url="${URLUtils.url('KomojuController-geturl')}"
 				value="" />
-			<input type="hidden" class="selectedPaymentKomojuGeturl" data-selectedmethod="${pdict.Basket.paymentInstrument.paymentMethod}"
+			<input type="hidden" class="selectedPaymentKomojuGeturl" data-selectedmethod="${pdict.Basket.getPaymentInstruments()[0].paymentMethod}"
 				value="" />
 			<input type="hidden" name="${dw.web.CSRFProtection.getTokenName()}"
 				value="${dw.web.CSRFProtection.generateToken()}" />