Changeset 2290248
- Timestamp:
- 04/23/2020 04:01:16 PM (6 years ago)
- Location:
- ghostmonitor
- Files:
-
- 165 added
- 4 edited
-
tags/1.13.0 (added)
-
tags/1.13.0/assets (added)
-
tags/1.13.0/assets/js (added)
-
tags/1.13.0/assets/js/ghostmonitor_messenger_widget.js (added)
-
tags/1.13.0/assets/js/ghostmonitor_push.js (added)
-
tags/1.13.0/config.json (added)
-
tags/1.13.0/includes (added)
-
tags/1.13.0/includes/class-wc-ghostmonitor-api.php (added)
-
tags/1.13.0/includes/class-wc-ghostmonitor.php (added)
-
tags/1.13.0/includes/class-wc-helper.php (added)
-
tags/1.13.0/includes/class-wc-logger.php (added)
-
tags/1.13.0/readme.txt (added)
-
tags/1.13.0/vendor (added)
-
tags/1.13.0/vendor/autoload.php (added)
-
tags/1.13.0/vendor/beberlei (added)
-
tags/1.13.0/vendor/beberlei/assert (added)
-
tags/1.13.0/vendor/beberlei/assert/.editorconfig (added)
-
tags/1.13.0/vendor/beberlei/assert/.gitattributes (added)
-
tags/1.13.0/vendor/beberlei/assert/.gitignore (added)
-
tags/1.13.0/vendor/beberlei/assert/.php_cs (added)
-
tags/1.13.0/vendor/beberlei/assert/.scrutinizer.yml (added)
-
tags/1.13.0/vendor/beberlei/assert/.travis (added)
-
tags/1.13.0/vendor/beberlei/assert/.travis.yml (added)
-
tags/1.13.0/vendor/beberlei/assert/.travis/xdebug.sh (added)
-
tags/1.13.0/vendor/beberlei/assert/CHANGELOG.md (added)
-
tags/1.13.0/vendor/beberlei/assert/CONTRIBUTING.md (added)
-
tags/1.13.0/vendor/beberlei/assert/LICENSE (added)
-
tags/1.13.0/vendor/beberlei/assert/README.md (added)
-
tags/1.13.0/vendor/beberlei/assert/TODO.md (added)
-
tags/1.13.0/vendor/beberlei/assert/bin (added)
-
tags/1.13.0/vendor/beberlei/assert/bin/MethodDocGenerator.php (added)
-
tags/1.13.0/vendor/beberlei/assert/bin/generate_method_docs.php (added)
-
tags/1.13.0/vendor/beberlei/assert/bin/travis (added)
-
tags/1.13.0/vendor/beberlei/assert/bin/travis/lint-docs (added)
-
tags/1.13.0/vendor/beberlei/assert/composer.json (added)
-
tags/1.13.0/vendor/beberlei/assert/lib (added)
-
tags/1.13.0/vendor/beberlei/assert/lib/Assert (added)
-
tags/1.13.0/vendor/beberlei/assert/lib/Assert/Assert.php (added)
-
tags/1.13.0/vendor/beberlei/assert/lib/Assert/Assertion.php (added)
-
tags/1.13.0/vendor/beberlei/assert/lib/Assert/AssertionChain.php (added)
-
tags/1.13.0/vendor/beberlei/assert/lib/Assert/AssertionFailedException.php (added)
-
tags/1.13.0/vendor/beberlei/assert/lib/Assert/InvalidArgumentException.php (added)
-
tags/1.13.0/vendor/beberlei/assert/lib/Assert/LazyAssertion.php (added)
-
tags/1.13.0/vendor/beberlei/assert/lib/Assert/LazyAssertionException.php (added)
-
tags/1.13.0/vendor/beberlei/assert/lib/Assert/functions.php (added)
-
tags/1.13.0/vendor/beberlei/assert/phpstan-code.neon (added)
-
tags/1.13.0/vendor/beberlei/assert/phpstan-tests.neon (added)
-
tags/1.13.0/vendor/beberlei/assert/phpunit.xml.dist (added)
-
tags/1.13.0/vendor/beberlei/assert/tests (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/AssertTest.php (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/AssertionChainFunctionsTest.php (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/AssertionChainTest.php (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/AssertionCodesUniqueTest.php (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/AssertionExceptionCallbackTest.php (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/AssertionFailedExceptionTest.php (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/CustomAssertionClassTest.php (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/Fixtures (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/Fixtures/ChildStdClass.php (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/Fixtures/CustomAssert.php (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/Fixtures/CustomAssertion.php (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/Fixtures/CustomException.php (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/Fixtures/CustomLazyAssertionException.php (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/Fixtures/OneCountable.php (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/Fixtures/PR142_OverrideStringify.php (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/Fixtures/functions.php (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/LazyArrayTest.php (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/LazyAssertionTest.php (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/LazyFunctionAssertionTest.php (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/PR142_AllowOverridingStringifyTest.php (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/_files (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/_files/ResourceBundle (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/_files/ResourceBundle/es.res (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/_files/ResourceBundle/res_index.res (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/Assert/Tests/_files/ResourceBundle/root.res (added)
-
tags/1.13.0/vendor/beberlei/assert/tests/bootstrap.php (added)
-
tags/1.13.0/vendor/composer (added)
-
tags/1.13.0/vendor/composer/ClassLoader.php (added)
-
tags/1.13.0/vendor/composer/LICENSE (added)
-
tags/1.13.0/vendor/composer/autoload_classmap.php (added)
-
tags/1.13.0/vendor/composer/autoload_files.php (added)
-
tags/1.13.0/vendor/composer/autoload_namespaces.php (added)
-
tags/1.13.0/vendor/composer/autoload_psr4.php (added)
-
tags/1.13.0/vendor/composer/autoload_real.php (added)
-
tags/1.13.0/vendor/composer/autoload_static.php (added)
-
tags/1.13.0/vendor/composer/installed.json (added)
-
tags/1.13.0/woocommerce-ghostmonitor.php (added)
-
trunk/config.json (modified) (1 diff)
-
trunk/includes/class-wc-ghostmonitor.php (modified) (8 diffs)
-
trunk/includes/class-wc-helper.php (added)
-
trunk/includes/class-wc-logger.php (added)
-
trunk/readme.txt (modified) (1 diff)
-
trunk/vendor (added)
-
trunk/vendor/autoload.php (added)
-
trunk/vendor/beberlei (added)
-
trunk/vendor/beberlei/assert (added)
-
trunk/vendor/beberlei/assert/.editorconfig (added)
-
trunk/vendor/beberlei/assert/.gitattributes (added)
-
trunk/vendor/beberlei/assert/.gitignore (added)
-
trunk/vendor/beberlei/assert/.php_cs (added)
-
trunk/vendor/beberlei/assert/.scrutinizer.yml (added)
-
trunk/vendor/beberlei/assert/.travis (added)
-
trunk/vendor/beberlei/assert/.travis.yml (added)
-
trunk/vendor/beberlei/assert/.travis/xdebug.sh (added)
-
trunk/vendor/beberlei/assert/CHANGELOG.md (added)
-
trunk/vendor/beberlei/assert/CONTRIBUTING.md (added)
-
trunk/vendor/beberlei/assert/LICENSE (added)
-
trunk/vendor/beberlei/assert/README.md (added)
-
trunk/vendor/beberlei/assert/TODO.md (added)
-
trunk/vendor/beberlei/assert/bin (added)
-
trunk/vendor/beberlei/assert/bin/MethodDocGenerator.php (added)
-
trunk/vendor/beberlei/assert/bin/generate_method_docs.php (added)
-
trunk/vendor/beberlei/assert/bin/travis (added)
-
trunk/vendor/beberlei/assert/bin/travis/lint-docs (added)
-
trunk/vendor/beberlei/assert/composer.json (added)
-
trunk/vendor/beberlei/assert/lib (added)
-
trunk/vendor/beberlei/assert/lib/Assert (added)
-
trunk/vendor/beberlei/assert/lib/Assert/Assert.php (added)
-
trunk/vendor/beberlei/assert/lib/Assert/Assertion.php (added)
-
trunk/vendor/beberlei/assert/lib/Assert/AssertionChain.php (added)
-
trunk/vendor/beberlei/assert/lib/Assert/AssertionFailedException.php (added)
-
trunk/vendor/beberlei/assert/lib/Assert/InvalidArgumentException.php (added)
-
trunk/vendor/beberlei/assert/lib/Assert/LazyAssertion.php (added)
-
trunk/vendor/beberlei/assert/lib/Assert/LazyAssertionException.php (added)
-
trunk/vendor/beberlei/assert/lib/Assert/functions.php (added)
-
trunk/vendor/beberlei/assert/phpstan-code.neon (added)
-
trunk/vendor/beberlei/assert/phpstan-tests.neon (added)
-
trunk/vendor/beberlei/assert/phpunit.xml.dist (added)
-
trunk/vendor/beberlei/assert/tests (added)
-
trunk/vendor/beberlei/assert/tests/Assert (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/AssertTest.php (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/AssertionChainFunctionsTest.php (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/AssertionChainTest.php (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/AssertionCodesUniqueTest.php (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/AssertionExceptionCallbackTest.php (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/AssertionFailedExceptionTest.php (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/CustomAssertionClassTest.php (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/Fixtures (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/Fixtures/ChildStdClass.php (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/Fixtures/CustomAssert.php (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/Fixtures/CustomAssertion.php (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/Fixtures/CustomException.php (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/Fixtures/CustomLazyAssertionException.php (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/Fixtures/OneCountable.php (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/Fixtures/PR142_OverrideStringify.php (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/Fixtures/functions.php (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/LazyArrayTest.php (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/LazyAssertionTest.php (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/LazyFunctionAssertionTest.php (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/PR142_AllowOverridingStringifyTest.php (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/_files (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/_files/ResourceBundle (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/_files/ResourceBundle/es.res (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/_files/ResourceBundle/res_index.res (added)
-
trunk/vendor/beberlei/assert/tests/Assert/Tests/_files/ResourceBundle/root.res (added)
-
trunk/vendor/beberlei/assert/tests/bootstrap.php (added)
-
trunk/vendor/composer (added)
-
trunk/vendor/composer/ClassLoader.php (added)
-
trunk/vendor/composer/LICENSE (added)
-
trunk/vendor/composer/autoload_classmap.php (added)
-
trunk/vendor/composer/autoload_files.php (added)
-
trunk/vendor/composer/autoload_namespaces.php (added)
-
trunk/vendor/composer/autoload_psr4.php (added)
-
trunk/vendor/composer/autoload_real.php (added)
-
trunk/vendor/composer/autoload_static.php (added)
-
trunk/vendor/composer/installed.json (added)
-
trunk/woocommerce-ghostmonitor.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
ghostmonitor/trunk/config.json
r2216995 r2290248 1 1 { 2 2 "sitesUrl": "https://sites.ghostmonitor.com/", 3 "trackingUrl": "https://tracking.ghostmonitor.com", 4 "settingsUrl": "https://api.recart.com/tracking/v2/settings/", 3 "trackingUrl": "https://tracking.ghostmonitor.com", 4 "settingsUrl": "https://api.recart.com/tracking/v2/settings/", 5 "webhookUrl": "https://api.recart.com/store/webhooks/", 5 6 "cdnUrl": "https://cdn.ghostmonitor.com", 6 "version": "v1.12.14", 7 "logentriesToken": "d3695c56-67af-4c86-8c7d-26c6c252987b", 7 "version": "v1.13.0", 8 8 "env": "production" 9 9 } -
ghostmonitor/trunk/includes/class-wc-ghostmonitor.php
r2147618 r2290248 49 49 ); 50 50 $this->gm_helper->setLogPath(GHOSTMONITOR_PLUGIN_PATH . 'log.txt'); 51 $this->gm_helper->setLogentriesToken((string)$this->get_gm_config_value('logentriesToken'));52 51 53 52 $this->gm_helper->logDebug(array('PLUGIN_CONFIG' => $this->plugin_config)); … … 685 684 public function handle_url_discount_code() { 686 685 preg_match("/\/discount\/(\w+)/", $_SERVER['REQUEST_URI'], $url_subitems); 687 686 688 687 // Only proceed if url matched /discount/somediscountcode 689 688 if (count($url_subitems) < 1) return; 690 689 if (!isset($url_subitems[1])) return; 691 690 692 691 $discount_code = $url_subitems[1]; 693 692 694 693 if (WC()->cart && !WC()->cart->is_empty() && !WC()->cart->has_discount($discount_code)) { 695 694 WC()->cart->add_discount($discount_code); … … 697 696 setcookie("recart_saved_discount_code", $discount_code, time() + (86400 * 7), "/"); 698 697 } 699 698 700 699 $this->handle_redirect_parameter(); 701 700 } 702 701 703 702 private function handle_redirect_parameter() { 704 703 $requested_url = urldecode($_SERVER['REQUEST_URI']); … … 724 723 $redirect_url = '/'; 725 724 } 726 725 727 726 $is_https = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on'; 728 727 $full_url = ($is_https ? "https" : "http") . "://" . $_SERVER['HTTP_HOST'] . $redirect_url; … … 742 741 "\n" 743 742 ]; 744 743 745 744 foreach($EZSQL_ERROR AS $error) { 746 745 $log[] = str_repeat('-', 50) . "\n" . implode("\n", $error) . "\n" . str_repeat('-', 50) . "\n"; … … 749 748 $this->gm_helper->logError(implode($log)); 750 749 } 751 } catch(Exception $e) { 750 } catch(Exception $e) { 752 751 $this->gm_helper->logError($e->__toString()); 753 752 } … … 755 754 return; 756 755 } 757 756 758 757 function attempt_apply_saved_discount_code() { 759 758 // Can apply discount code only if cart exists & not empty … … 770 769 } 771 770 } 772 771 773 772 function redirect_client_to_url($redirect_url) { 774 773 echo '<script type="text/javascript">' . -
ghostmonitor/trunk/readme.txt
r2216995 r2290248 4 4 Requires at least: 3.9 5 5 Tested up to: 5.3.2 6 Stable tag: 1.1 2.146 Stable tag: 1.13.0 7 7 License: GPLv2 or later 8 8 License URI: http://www.gnu.org/licenses/gpl-2.0.html -
ghostmonitor/trunk/woocommerce-ghostmonitor.php
r2216995 r2290248 6 6 * Author: Ghostmonitor INC 7 7 * Author URI: http://www.recart.com 8 * Version: v1.1 2.148 * Version: v1.13.0 9 9 */ 10 10 11 11 defined('ABSPATH') or die(); 12 12 13 require_once 'includes/ghostmonitor_helper/vendor/autoload.php'; 13 require_once 'includes/class-wc-helper.php'; 14 require_once 'includes/class-wc-logger.php'; 14 15 15 16 class Woocommerce_Ghostmonitor { … … 32 33 update_option('ghostmonitor_http_status', $http_status, true); 33 34 34 $this->send_shop_info(); 35 $this->create_recart_webhooks(); 36 $this->send_shop_info("activated"); 35 37 } 36 38 37 39 public function deactivate_plugin() { 38 $this->send_shop_info(); 40 $this->delete_recart_webhooks(); 41 $this->send_shop_info("deactivated"); 39 42 } 40 43 41 public function send_shop_info( ) {44 public function send_shop_info($event) { 42 45 global $woocommerce; 43 46 global $wpdb; 44 47 global $wp_version; 45 48 46 $version = 'v1.1 2.14';49 $version = 'v1.13.0'; 47 50 48 51 $discount_enabled = get_option('woocommerce_enable_coupons') === 'yes' ? 'true' : 'false'; … … 50 53 $gm_helper = $this->get_gm_helper(); 51 54 $shop_data = array( 55 'event' => $event, 52 56 'plugin_type' => 'woocommerce', 53 57 'plugin_version' => $this->config ? $this->config->version : $version, … … 103 107 ); 104 108 } 109 110 private function create_recart_webhooks() { 111 $webhookURL = $this->config && property_exists($this->config, 'webhookUrl') ? $this->config->webhookUrl : null; 112 113 if ($webhookURL === null || get_option("recart_webhooks_enabled")) { 114 return; 115 } 116 117 $secret = wp_generate_password(50, true, true); 118 $topics = ["order.created", "order.updated", "order.deleted", "order.restored"]; 119 120 foreach ($topics as $topic) { 121 $webhook = new WC_Webhook(); 122 $webhook->set_name("Recart"); 123 if (!$webhook->get_user_id()) { 124 $webhook->set_user_id(get_current_user_id()); 125 } 126 $webhook->set_delivery_url($webhookURL); 127 $webhook->set_secret($secret); 128 $webhook->set_api_version("wp_api_v3"); 129 $webhook->set_status("active"); 130 $webhook->set_topic($topic); 131 $webhook->save(); 132 } 133 134 update_option("recart_webhooks_enabled", true); 135 } 136 137 private function delete_recart_webhooks() { 138 $data_store = WC_Data_Store::load('webhook'); 139 $args = array( 140 'limit' => -1, 141 'offset' => 0, 142 'order' => 'DESC', 143 'orderby' => 'id', 144 'paginate' => false, 145 's' => 'Recart', 146 ); 147 $webhooks = $data_store->search_webhooks($args); 148 foreach ($webhooks as $webhookID) { 149 $webhook = new WC_Webhook($webhookID); 150 if (preg_match("/recart.com/", $webhook->get_delivery_url())) { 151 $webhook->delete(); 152 } 153 } 154 155 update_option("recart_webhooks_enabled", false); 156 } 105 157 } 106 158
Note: See TracChangeset
for help on using the changeset viewer.