[ENGA3-517]: Fixed the undefined index: payment_type issue with COD p…

…ayment. (#390)
omise · Oct 21, 2022 · bae9b21 · bae9b21
1 parent 246d37b
commit bae9b21
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 12 deletions.
diff --git a/Block/Checkout/Onepage/Success/ConveniencestoreAdditionalInformation.php b/Block/Checkout/Onepage/Success/ConveniencestoreAdditionalInformation.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Omise\Payment\Block\Checkout\Onepage\Success;
 
 class ConveniencestoreAdditionalInformation extends \Magento\Framework\View\Element\Template
@@ -29,17 +30,24 @@ public function __construct(
  */
  protected function _toHtml()
  {
- $paymentData = $this->_checkoutSession->getLastRealOrder()->getPayment()->getData();
- $paymentType = $paymentData['additional_information']['payment_type'];
+ $order = $this->_checkoutSession->getLastRealOrder();
+ $paymentData = $order->getPayment()->getData();
+ $paymentAdditionalInfo = $paymentData['additional_information'];
+
+ if (!array_key_exists('payment_type', $paymentAdditionalInfo)) {
+ return;
+ }
+
+ $paymentType = $paymentAdditionalInfo['payment_type'];
 
  if (!isset($paymentType) || $paymentType !== 'econtext') {
  return;
  }
 
- $orderCurrency = $this->_checkoutSession->getLastRealOrder()->getOrderCurrency()->getCurrencyCode();
+ $orderCurrency = $order->getOrderCurrency()->getCurrencyCode();
 
  $this->addData([
- 'link' => $paymentData['additional_information']['charge_authorize_uri'],
+ 'link' => $paymentAdditionalInfo['charge_authorize_uri'],
  'order_amount' => number_format($paymentData['amount_ordered'], 2) .' '.$orderCurrency
  ]);
 

diff --git a/view/frontend/layout/checkout_onepage_success.xml b/view/frontend/layout/checkout_onepage_success.xml
@@ -5,14 +5,26 @@
  </head>
  <body>
  <referenceContainer name="order.success.additional.info">
- <block class="Omise\Payment\Block\Checkout\Onepage\Success\TescoAdditionalInformation" name="onepage.success.tesco"
- template="Omise_Payment::checkout/onepage/success/tesco_additional_info.phtml"/>
- <block class="Omise\Payment\Block\Checkout\Onepage\Success\PaynowAdditionalInformation" name="onepage.success.paynow"
- template="Omise_Payment::checkout/onepage/success/paynow_additional_info.phtml"/>
- <block class="Omise\Payment\Block\Checkout\Onepage\Success\PromptpayAdditionalInformation" name="onepage.success.promptpay"
- template="Omise_Payment::checkout/onepage/success/promptpay_additional_info.phtml"/>
- <block class="Omise\Payment\Block\Checkout\Onepage\Success\ConveniencestoreAdditionalInformation" name="onepage.success.conv_store"
- template="Omise_Payment::checkout/onepage/success/conv_store_additional_info.phtml"/>
+ <block
+ class="Omise\Payment\Block\Checkout\Onepage\Success\TescoAdditionalInformation"
+ name="onepage.success.tesco"
+ template="Omise_Payment::checkout/onepage/success/tesco_additional_info.phtml"
+ />
+ <block
+ class="Omise\Payment\Block\Checkout\Onepage\Success\PaynowAdditionalInformation"
+ name="onepage.success.paynow"
+ template="Omise_Payment::checkout/onepage/success/paynow_additional_info.phtml"
+ />
+ <block
+ class="Omise\Payment\Block\Checkout\Onepage\Success\PromptpayAdditionalInformation"
+ name="onepage.success.promptpay"
+ template="Omise_Payment::checkout/onepage/success/promptpay_additional_info.phtml"
+ />
+ <block
+ class="Omise\Payment\Block\Checkout\Onepage\Success\ConveniencestoreAdditionalInformation"
+ name="onepage.success.conv_store"
+ template="Omise_Payment::checkout/onepage/success/conv_store_additional_info.phtml"
+ />
  </referenceContainer>
  </body>
 </page>