Changeset 3145178
- Timestamp:
- 09/02/2024 08:53:02 AM (18 months ago)
- Location:
- woo-rabo-omnikassa
- Files:
-
- 50 added
- 3 edited
-
tags/2.2.9.8 (added)
-
tags/2.2.9.8/assets (added)
-
tags/2.2.9.8/assets/images (added)
-
tags/2.2.9.8/assets/images/icwoorok2_bancontact.png (added)
-
tags/2.2.9.8/assets/images/icwoorok2_bancontact.svg (added)
-
tags/2.2.9.8/assets/images/icwoorok2_icwoorok2_afterpay.png (added)
-
tags/2.2.9.8/assets/images/icwoorok2_ideal.png (added)
-
tags/2.2.9.8/assets/images/icwoorok2_ideal.svg (added)
-
tags/2.2.9.8/assets/images/icwoorok2_maestro.png (added)
-
tags/2.2.9.8/assets/images/icwoorok2_mastercard.png (added)
-
tags/2.2.9.8/assets/images/icwoorok2_paypal.svg (added)
-
tags/2.2.9.8/assets/images/icwoorok2_sofort.png (added)
-
tags/2.2.9.8/assets/images/icwoorok2_visa.png (added)
-
tags/2.2.9.8/assets/images/icwoorok2_vpay.png (added)
-
tags/2.2.9.8/assets/js (added)
-
tags/2.2.9.8/assets/js/bancontact.js (added)
-
tags/2.2.9.8/assets/js/cards.js (added)
-
tags/2.2.9.8/assets/js/ideal.js (added)
-
tags/2.2.9.8/assets/js/paypal.js (added)
-
tags/2.2.9.8/assets/js/sofort.js (added)
-
tags/2.2.9.8/blocks (added)
-
tags/2.2.9.8/blocks/bancontact.php (added)
-
tags/2.2.9.8/blocks/cards.php (added)
-
tags/2.2.9.8/blocks/ideal.php (added)
-
tags/2.2.9.8/blocks/paypal.php (added)
-
tags/2.2.9.8/blocks/sofort.php (added)
-
tags/2.2.9.8/controllers (added)
-
tags/2.2.9.8/controllers/icwoorok2-controller.php (added)
-
tags/2.2.9.8/gateways (added)
-
tags/2.2.9.8/gateways/abstract.php (added)
-
tags/2.2.9.8/gateways/bancontact.php (added)
-
tags/2.2.9.8/gateways/cards.php (added)
-
tags/2.2.9.8/gateways/ideal.php (added)
-
tags/2.2.9.8/gateways/paypal.php (added)
-
tags/2.2.9.8/gateways/sofort.php (added)
-
tags/2.2.9.8/ic-woo-omnikassa-2.php (added)
-
tags/2.2.9.8/includes (added)
-
tags/2.2.9.8/includes/functions.php (added)
-
tags/2.2.9.8/index.php (added)
-
tags/2.2.9.8/languages (added)
-
tags/2.2.9.8/languages/ic-woo-rabo-omnikassa-2-en_US.mo (added)
-
tags/2.2.9.8/languages/ic-woo-rabo-omnikassa-2-en_US.po (added)
-
tags/2.2.9.8/languages/ic-woo-rabo-omnikassa-2-nl_NL.mo (added)
-
tags/2.2.9.8/languages/ic-woo-rabo-omnikassa-2-nl_NL.po (added)
-
tags/2.2.9.8/readme.txt (added)
-
tags/2.2.9.8/temp (added)
-
tags/2.2.9.8/temp/cache (added)
-
tags/2.2.9.8/temp/cache/index.php (added)
-
tags/2.2.9.8/temp/logs (added)
-
tags/2.2.9.8/temp/logs/index.php (added)
-
trunk/controllers/icwoorok2-controller.php (modified) (4 diffs)
-
trunk/ic-woo-omnikassa-2.php (modified) (1 diff)
-
trunk/readme.txt (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
woo-rabo-omnikassa/trunk/controllers/icwoorok2-controller.php
r3114275 r3145178 241 241 $sMerchantOrderId = $aRokResult['merchantOrderId']; 242 242 $sOmniKassaStatus = $aRokResult['orderStatus']; 243 $aTransactionData = icwoorok2_getTransaction($aRokResult['transactions']);244 245 $sTransactionId = $aTransactionData['id'];246 $sTransactionMethod = $aTransactionData['paymentBrand'];247 243 248 244 // Get order by Merchant Order ID … … 250 246 $sOrderStatus = $oOrder->get_status(); 251 247 252 $sMessage = __('Status received from Rabo Smart Pay Webhook: ', 'ic-woo-rabo-omnikassa-2').$sOmniKassaStatus. __(' for transaction ID:', 'ic-woo-rabo-omnikassa-2', 'ic-woo-rabo-omnikassa-2').'<br>'.$sTransactionId;248 $sMessage = __('Status received from Rabo Smart Pay Webhook: ', 'ic-woo-rabo-omnikassa-2').$sOmniKassaStatus.'. '; 253 249 254 250 if (in_array($sOrderStatus, ['pending', 'failed', 'cancelled'])) { … … 260 256 $sMessage .= '<br>'.__('Update order status: Payment Completed', 'ic-woo-rabo-omnikassa-2'); 261 257 $oOrder->add_order_note($sMessage); 262 $oOrder->set_payment_method($sTransactionMethod); 258 259 $aTransactionData = icwoorok2_getTransaction($aRokResult['transactions']); 260 261 $sTransactionId = $aTransactionData['id']; 262 $sTransactionMethod = $aTransactionData['paymentBrand'] ?? ''; 263 264 if(!empty($sTransactionMethod)) { 265 $oOrder->set_payment_method($sTransactionMethod); 266 } 267 263 268 $oOrder->payment_complete($sTransactionId); 264 269 } else { … … 296 301 } 297 302 } else { // pending 298 if ( $sTransactionId && (strcmp($sOmniKassaStatus, 'COMPLETED') === 0)) {303 if (strcmp($sOmniKassaStatus, 'COMPLETED') === 0) { 299 304 $sMessage .= __('<br>Transaction ID updated.', 'ic-woo-rabo-omnikassa-2'); 305 306 $aTransactionData = icwoorok2_getTransaction($aRokResult['transactions']); 307 308 $sTransactionId = $aTransactionData['id']; 309 $sTransactionMethod = $aTransactionData['paymentBrand'] ?? ''; 310 300 311 $oOrder->set_transaction_id($sTransactionId); 301 312 $oOrder->save(); -
woo-rabo-omnikassa/trunk/ic-woo-omnikassa-2.php
r3137426 r3145178 9 9 Text Domain: ic-woo-omnikassa-2 10 10 Domain Path: /languages 11 Version: 2.2.9. 811 Version: 2.2.9.9 12 12 WC tested up to: 9.1.4 13 13 */ -
woo-rabo-omnikassa/trunk/readme.txt
r3137426 r3145178 113 113 == Changelog == 114 114 115 = 2.2.9.9 = 116 * Fixed a warning where the Payment Brand is empty in the webhook call. 117 * Checked compatibility with Woocommerce 9.2.3 118 119 115 120 = 2.2.9.8 = 116 121 * Added required customer data to be send to Rabo Smart Pay.
Note: See TracChangeset
for help on using the changeset viewer.