Changeset 3030774
- Timestamp:
- 02/02/2024 10:24:49 PM (2 years ago)
- Location:
- moneroo
- Files:
-
- 10 edited
- 1 copied
-
tags/v1.1 (copied) (copied from moneroo/trunk)
-
tags/v1.1/moneroo-for-woocommerce.php (modified) (1 diff)
-
tags/v1.1/readme.txt (modified) (1 diff)
-
tags/v1.1/src/Handlers/Moneroo_WC_Payment_Handler.php (modified) (4 diffs)
-
tags/v1.1/src/Moneroo_WC_Gateway.php (modified) (4 diffs)
-
tags/v1.1/vendor/composer/installed.php (modified) (2 diffs)
-
trunk/moneroo-for-woocommerce.php (modified) (1 diff)
-
trunk/readme.txt (modified) (1 diff)
-
trunk/src/Handlers/Moneroo_WC_Payment_Handler.php (modified) (4 diffs)
-
trunk/src/Moneroo_WC_Gateway.php (modified) (4 diffs)
-
trunk/vendor/composer/installed.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
moneroo/tags/v1.1/moneroo-for-woocommerce.php
r3015859 r3030774 11 11 * License: GPLv2 12 12 * License URI: https://www.gnu.org/licenses/gpl-2.0.html 13 * Version: 1.013 * Version: v1.1 14 14 * Requires at least: 4.9 15 15 * Tested up to: 6.4 -
moneroo/tags/v1.1/readme.txt
r3015859 r3030774 5 5 Requires at least: 4.9 6 6 Tested up to: 6.4 7 Stable tag: 1.07 Stable tag: v1.1 8 8 Requires PHP: 7.4 9 9 License: GPLv3 -
moneroo/tags/v1.1/src/Handlers/Moneroo_WC_Payment_Handler.php
r3015851 r3030774 41 41 try { 42 42 $response = $this->moneroo->get($this->transactionId); 43 43 44 $payment_order_id = isset($response->metadata->order_id) ? (int) $response->metadata->order_id : null; 44 45 … … 55 56 $this->process_payment_response($response, $order); 56 57 } catch (Exception $e) { 57 wc_get_logger()->error('M PG Moneroo Payment Exception: ' . wp_kses($e->getMessage()), ['source' => 'moneroo-woocommerce']);58 wc_get_logger()->error('Moneroo Payment Exception: ' . wp_kses($e->getMessage(), false), ['source' => 'moneroo-woocommerce-plugin']); 58 59 $this->redirect_to_checkout_url(); 59 60 } … … 67 68 $response = $this->moneroo->get($this->transactionId); 68 69 $payment_order_id = isset($response->metadata->order_id) ? (int) $response->metadata->order_id : null; 69 70 if (! $payment_order_id) {71 return;72 }73 70 74 71 $order = wc_get_order($payment_order_id); … … 78 75 $this->process_payment_response($response, $order); 79 76 } catch (Exception $e) { 80 wc_get_logger()->error('MPG Moneroo Webhook Exception: ' . wp_kses($e->getMessage() ), ['source' => 'moneroo-woocommerce']);77 wc_get_logger()->error('MPG Moneroo Webhook Exception: ' . wp_kses($e->getMessage(), false), ['source' => 'moneroo-woocommerce']); 81 78 return; 82 79 } -
moneroo/tags/v1.1/src/Moneroo_WC_Gateway.php
r3015869 r3030774 103 103 add_action('admin_notices', [$this, 'moneroo_wc_do_ssl_check']); 104 104 add_action('admin_notices', [$this, 'moneroo_wc_require_keys']); 105 add_action('woocommerce_api_' . strtolower(get_class($this)), [$this, 'moneroo_wc_handle_moneroo_wc_return']); 106 add_action('woocommerce_api_moneroo_wc_webhook', [$this, 'moneroo_wc_handle_moneroo_wc_webhook']); 105 106 //Moneroo Return Handler 107 add_action('woocommerce_api_moneroo_wc_payment_return', [$this, 'moneroo_wc_handle_return']); 108 109 //Moneroo Webhook Handler 110 add_action('woocommerce_api_moneroo_wc_webhook', [$this, 'moneroo_wc_handle_webhook']); 111 107 112 if (is_admin()) { 108 113 add_action('woocommerce_update_options_payment_gateways_' . $this->id, [$this, 'process_admin_options']); … … 185 190 ); 186 191 192 $order->update_meta_data('_moneroo_payment_id', $payment->id); 193 187 194 return [ 188 195 'result' => 'success', … … 196 203 public function get_payment_return_url(string $order_id): string 197 204 { 198 return home_url('/') . '?wc-api=' . get_class($this) . '&order_id=' . $order_id; 205 $baseURL = esc_url(add_query_arg('wc-api', 'moneroo_wc_payment_return', home_url('/'))); 206 $baseURL = add_query_arg('order_id', $order_id, $baseURL); 207 208 return str_replace('http:', 'https:', $baseURL); 199 209 } 200 210 … … 357 367 public static function moneroo_wc_get_webhook_url(): string 358 368 { 359 return esc_url(add_query_arg('wc-api', 'moneroo_wc_ get_webhook_url', home_url('/')));369 return esc_url(add_query_arg('wc-api', 'moneroo_wc_webhook', home_url('/'))); 360 370 } 361 371 } -
moneroo/tags/v1.1/vendor/composer/installed.php
r3015869 r3030774 2 2 'root' => array( 3 3 'name' => 'moneroo/moneroo-woocommerce', 4 'pretty_version' => ' 1.0',5 'version' => '1. 0.0.0',6 'reference' => ' f686ebf81ee15e9b90b3d900238b615bd5f87007',4 'pretty_version' => 'v1.1', 5 'version' => '1.1.0.0', 6 'reference' => 'e622c5a7574b20a8a3c537cc58db27a0956ea72b', 7 7 'type' => 'library', 8 8 'install_path' => __DIR__ . '/../../', … … 50 50 ), 51 51 'moneroo/moneroo-woocommerce' => array( 52 'pretty_version' => ' 1.0',53 'version' => '1. 0.0.0',54 'reference' => ' f686ebf81ee15e9b90b3d900238b615bd5f87007',52 'pretty_version' => 'v1.1', 53 'version' => '1.1.0.0', 54 'reference' => 'e622c5a7574b20a8a3c537cc58db27a0956ea72b', 55 55 'type' => 'library', 56 56 'install_path' => __DIR__ . '/../../', -
moneroo/trunk/moneroo-for-woocommerce.php
r3015859 r3030774 11 11 * License: GPLv2 12 12 * License URI: https://www.gnu.org/licenses/gpl-2.0.html 13 * Version: 1.013 * Version: v1.1 14 14 * Requires at least: 4.9 15 15 * Tested up to: 6.4 -
moneroo/trunk/readme.txt
r3015859 r3030774 5 5 Requires at least: 4.9 6 6 Tested up to: 6.4 7 Stable tag: 1.07 Stable tag: v1.1 8 8 Requires PHP: 7.4 9 9 License: GPLv3 -
moneroo/trunk/src/Handlers/Moneroo_WC_Payment_Handler.php
r3015851 r3030774 41 41 try { 42 42 $response = $this->moneroo->get($this->transactionId); 43 43 44 $payment_order_id = isset($response->metadata->order_id) ? (int) $response->metadata->order_id : null; 44 45 … … 55 56 $this->process_payment_response($response, $order); 56 57 } catch (Exception $e) { 57 wc_get_logger()->error('M PG Moneroo Payment Exception: ' . wp_kses($e->getMessage()), ['source' => 'moneroo-woocommerce']);58 wc_get_logger()->error('Moneroo Payment Exception: ' . wp_kses($e->getMessage(), false), ['source' => 'moneroo-woocommerce-plugin']); 58 59 $this->redirect_to_checkout_url(); 59 60 } … … 67 68 $response = $this->moneroo->get($this->transactionId); 68 69 $payment_order_id = isset($response->metadata->order_id) ? (int) $response->metadata->order_id : null; 69 70 if (! $payment_order_id) {71 return;72 }73 70 74 71 $order = wc_get_order($payment_order_id); … … 78 75 $this->process_payment_response($response, $order); 79 76 } catch (Exception $e) { 80 wc_get_logger()->error('MPG Moneroo Webhook Exception: ' . wp_kses($e->getMessage() ), ['source' => 'moneroo-woocommerce']);77 wc_get_logger()->error('MPG Moneroo Webhook Exception: ' . wp_kses($e->getMessage(), false), ['source' => 'moneroo-woocommerce']); 81 78 return; 82 79 } -
moneroo/trunk/src/Moneroo_WC_Gateway.php
r3015869 r3030774 103 103 add_action('admin_notices', [$this, 'moneroo_wc_do_ssl_check']); 104 104 add_action('admin_notices', [$this, 'moneroo_wc_require_keys']); 105 add_action('woocommerce_api_' . strtolower(get_class($this)), [$this, 'moneroo_wc_handle_moneroo_wc_return']); 106 add_action('woocommerce_api_moneroo_wc_webhook', [$this, 'moneroo_wc_handle_moneroo_wc_webhook']); 105 106 //Moneroo Return Handler 107 add_action('woocommerce_api_moneroo_wc_payment_return', [$this, 'moneroo_wc_handle_return']); 108 109 //Moneroo Webhook Handler 110 add_action('woocommerce_api_moneroo_wc_webhook', [$this, 'moneroo_wc_handle_webhook']); 111 107 112 if (is_admin()) { 108 113 add_action('woocommerce_update_options_payment_gateways_' . $this->id, [$this, 'process_admin_options']); … … 185 190 ); 186 191 192 $order->update_meta_data('_moneroo_payment_id', $payment->id); 193 187 194 return [ 188 195 'result' => 'success', … … 196 203 public function get_payment_return_url(string $order_id): string 197 204 { 198 return home_url('/') . '?wc-api=' . get_class($this) . '&order_id=' . $order_id; 205 $baseURL = esc_url(add_query_arg('wc-api', 'moneroo_wc_payment_return', home_url('/'))); 206 $baseURL = add_query_arg('order_id', $order_id, $baseURL); 207 208 return str_replace('http:', 'https:', $baseURL); 199 209 } 200 210 … … 357 367 public static function moneroo_wc_get_webhook_url(): string 358 368 { 359 return esc_url(add_query_arg('wc-api', 'moneroo_wc_ get_webhook_url', home_url('/')));369 return esc_url(add_query_arg('wc-api', 'moneroo_wc_webhook', home_url('/'))); 360 370 } 361 371 } -
moneroo/trunk/vendor/composer/installed.php
r3015869 r3030774 2 2 'root' => array( 3 3 'name' => 'moneroo/moneroo-woocommerce', 4 'pretty_version' => ' 1.0',5 'version' => '1. 0.0.0',6 'reference' => ' f686ebf81ee15e9b90b3d900238b615bd5f87007',4 'pretty_version' => 'v1.1', 5 'version' => '1.1.0.0', 6 'reference' => 'e622c5a7574b20a8a3c537cc58db27a0956ea72b', 7 7 'type' => 'library', 8 8 'install_path' => __DIR__ . '/../../', … … 50 50 ), 51 51 'moneroo/moneroo-woocommerce' => array( 52 'pretty_version' => ' 1.0',53 'version' => '1. 0.0.0',54 'reference' => ' f686ebf81ee15e9b90b3d900238b615bd5f87007',52 'pretty_version' => 'v1.1', 53 'version' => '1.1.0.0', 54 'reference' => 'e622c5a7574b20a8a3c537cc58db27a0956ea72b', 55 55 'type' => 'library', 56 56 'install_path' => __DIR__ . '/../../',
Note: See TracChangeset
for help on using the changeset viewer.