Changeset 2521141
- Timestamp:
- 04/25/2021 06:23:17 PM (5 years ago)
- Location:
- merchi
- Files:
-
- 76 added
- 6 edited
-
tags/1.3.0 (added)
-
tags/1.3.0/MerchiPlugin (added)
-
tags/1.3.0/MerchiPlugin/Api (added)
-
tags/1.3.0/MerchiPlugin/Api/Callbacks (added)
-
tags/1.3.0/MerchiPlugin/Api/Callbacks/AdminCallbacks.php (added)
-
tags/1.3.0/MerchiPlugin/Api/CreateMerchiProducts.php (added)
-
tags/1.3.0/MerchiPlugin/Api/SettingsApi.php (added)
-
tags/1.3.0/MerchiPlugin/Base (added)
-
tags/1.3.0/MerchiPlugin/Base/BaseController.php (added)
-
tags/1.3.0/MerchiPlugin/Base/Enqueue.php (added)
-
tags/1.3.0/MerchiPlugin/Base/SettingsLinks.php (added)
-
tags/1.3.0/MerchiPlugin/Pages (added)
-
tags/1.3.0/MerchiPlugin/Pages/Admin.php (added)
-
tags/1.3.0/MerchiPlugin/PublicPages (added)
-
tags/1.3.0/MerchiPlugin/PublicPages/ProductPage.php (added)
-
tags/1.3.0/MerchiPlugin/ShoppingCart (added)
-
tags/1.3.0/MerchiPlugin/ShoppingCart/ShoppingCartInject.php (added)
-
tags/1.3.0/MerchiPlugin/init.php (added)
-
tags/1.3.0/README.md (added)
-
tags/1.3.0/assets (added)
-
tags/1.3.0/assets/banner-1544x500.png (added)
-
tags/1.3.0/assets/banner-772x250.png (added)
-
tags/1.3.0/assets/create_merchi_products.js (added)
-
tags/1.3.0/assets/merchi_cart.js (added)
-
tags/1.3.0/assets/merchi_sdk.js (added)
-
tags/1.3.0/assets/merchi_styles.css (added)
-
tags/1.3.0/assets/merchi_styles_admin.css (added)
-
tags/1.3.0/assets/scripts.js (added)
-
tags/1.3.0/assets/show_product.js (added)
-
tags/1.3.0/composer.json (added)
-
tags/1.3.0/composer.lock (added)
-
tags/1.3.0/images (added)
-
tags/1.3.0/images/merchi-black-logo.png (added)
-
tags/1.3.0/images/merchi-icon.svg (added)
-
tags/1.3.0/index.php (added)
-
tags/1.3.0/merchi-plugin.php (added)
-
tags/1.3.0/readme.txt (added)
-
tags/1.3.0/templates (added)
-
tags/1.3.0/templates/admin.php (added)
-
tags/1.3.0/templates/cpt.php (added)
-
tags/1.3.0/uninstall.php (added)
-
tags/1.3.0/vendor (added)
-
tags/1.3.0/vendor/autoload.php (added)
-
tags/1.3.0/vendor/automattic (added)
-
tags/1.3.0/vendor/automattic/woocommerce (added)
-
tags/1.3.0/vendor/automattic/woocommerce/.editorconfig (added)
-
tags/1.3.0/vendor/automattic/woocommerce/.scrutinizer.yml (added)
-
tags/1.3.0/vendor/automattic/woocommerce/.travis.yml (added)
-
tags/1.3.0/vendor/automattic/woocommerce/LICENSE (added)
-
tags/1.3.0/vendor/automattic/woocommerce/README.md (added)
-
tags/1.3.0/vendor/automattic/woocommerce/composer.json (added)
-
tags/1.3.0/vendor/automattic/woocommerce/phpcs.xml (added)
-
tags/1.3.0/vendor/automattic/woocommerce/phpunit.xml.dist (added)
-
tags/1.3.0/vendor/automattic/woocommerce/src (added)
-
tags/1.3.0/vendor/automattic/woocommerce/src/WooCommerce (added)
-
tags/1.3.0/vendor/automattic/woocommerce/src/WooCommerce/Client.php (added)
-
tags/1.3.0/vendor/automattic/woocommerce/src/WooCommerce/HttpClient (added)
-
tags/1.3.0/vendor/automattic/woocommerce/src/WooCommerce/HttpClient/BasicAuth.php (added)
-
tags/1.3.0/vendor/automattic/woocommerce/src/WooCommerce/HttpClient/HttpClient.php (added)
-
tags/1.3.0/vendor/automattic/woocommerce/src/WooCommerce/HttpClient/HttpClientException.php (added)
-
tags/1.3.0/vendor/automattic/woocommerce/src/WooCommerce/HttpClient/OAuth.php (added)
-
tags/1.3.0/vendor/automattic/woocommerce/src/WooCommerce/HttpClient/Options.php (added)
-
tags/1.3.0/vendor/automattic/woocommerce/src/WooCommerce/HttpClient/Request.php (added)
-
tags/1.3.0/vendor/automattic/woocommerce/src/WooCommerce/HttpClient/Response.php (added)
-
tags/1.3.0/vendor/composer (added)
-
tags/1.3.0/vendor/composer/ClassLoader.php (added)
-
tags/1.3.0/vendor/composer/InstalledVersions.php (added)
-
tags/1.3.0/vendor/composer/LICENSE (added)
-
tags/1.3.0/vendor/composer/autoload_classmap.php (added)
-
tags/1.3.0/vendor/composer/autoload_namespaces.php (added)
-
tags/1.3.0/vendor/composer/autoload_psr4.php (added)
-
tags/1.3.0/vendor/composer/autoload_real.php (added)
-
tags/1.3.0/vendor/composer/autoload_static.php (added)
-
tags/1.3.0/vendor/composer/installed.json (added)
-
tags/1.3.0/vendor/composer/installed.php (added)
-
tags/1.3.0/vendor/composer/platform_check.php (added)
-
trunk/MerchiPlugin/Api/Callbacks/AdminCallbacks.php (modified) (1 diff)
-
trunk/MerchiPlugin/Pages/Admin.php (modified) (2 diffs)
-
trunk/MerchiPlugin/PublicPages/ProductPage.php (modified) (1 diff)
-
trunk/assets/show_product.js (modified) (1 diff)
-
trunk/merchi-plugin.php (modified) (1 diff)
-
trunk/readme.txt (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
merchi/trunk/MerchiPlugin/Api/Callbacks/AdminCallbacks.php
r2454556 r2521141 55 55 } 56 56 57 public function merchiRedirectURL() { 58 $value = esc_attr( get_option( 'merchi_redirect_url' ) ); 59 echo '<input type="text" class="regular-text" name="merchi_redirect_url" value="' . $value . '" placeholder="https://example.com/success">'; 60 } 61 62 57 63 58 64 // phpcs:enable -
merchi/trunk/MerchiPlugin/Pages/Admin.php
r2454556 r2521141 92 92 ], 93 93 ], 94 [ 95 'option_group' => 'merchi_options_group', 96 'option_name' => 'merchi_redirect_url', 97 'callback' => [ 98 $this->callbacks, 99 'merchiOptionsGroup', 100 ], 101 ], 94 102 [ 95 103 'option_group' => 'merchi_options_group', … … 162 170 ], 163 171 [ 172 'id' => 'merchi_redirect_url', 173 'title' => 'Redirect After Success URL', 174 'callback' => [ 175 $this->callbacks, 176 'merchiRedirectURL' 177 ], 178 'page' => 'merchi_plugin', 179 'section' => 'merchi_admin_index', 180 'args' => [ 181 'label_for' => 'merchi_redirect_url', 182 'class' => 'example-class', 183 ], 184 ], 185 [ 164 186 'id' => 'woo_k_p', 165 187 'title' => 'Woocommerce Public Key', -
merchi/trunk/MerchiPlugin/PublicPages/ProductPage.php
r2454556 r2521141 25 25 $id = $product->get_sku(); 26 26 $container = 'product-' . strval( $product->get_id() ); 27 $redirectUrl = esc_attr( get_option( 'merchi_redirect_url' ) ); 27 28 wp_enqueue_script( 'show_merchi_product', $this->plugin_url . 'assets/show_product.js' ); 28 29 $script_data = [ 29 30 'mountPointId' => $container, 30 31 'productId' => $id, 32 'redirectAfterSuccessUrl' => $redirectUrl 31 33 ]; 32 34 wp_localize_script( 'show_merchi_product', 'merchiShowProductScriptOptions', $script_data ); -
merchi/trunk/assets/show_product.js
r2454556 r2521141 4 4 const mountpoint = document.getElementById(mountPointId); 5 5 const script = document.createElement('script'); 6 script.src = `https://merchi.co//static/product_embed/js/product.embed.js?product=${productId}&hidePreview=true&hideTitle=true&hideInfo=true&hidePrice=true&includeBootstrap=false&singleColumn=true¬IncludeDefaultCss=true "`;6 script.src = `https://merchi.co//static/product_embed/js/product.embed.js?product=${productId}&hidePreview=true&hideTitle=true&hideInfo=true&hidePrice=true&includeBootstrap=false&singleColumn=true¬IncludeDefaultCss=true&redirectAfterSuccessUrl=${redirectAfterSuccessUrl}"`; 7 7 script.dataset.name = "product-embed"; 8 8 mountpoint.appendChild(script); -
merchi/trunk/merchi-plugin.php
r2454556 r2521141 4 4 * Plugin URI: https://merchi.co 5 5 * Description: Fetch your products from Merchi. This plugin requires Woocommerce. 6 * Version: 1. 2.16 * Version: 1.3.0 7 7 * Author: Charlie Campton 8 8 * License: GPL v2 or later -
merchi/trunk/readme.txt
r2454556 r2521141 3 3 Tags: merchi, merchandise 4 4 Requires at least: 5.1 5 Tested up to: 5. 66 Stable tag: 1. 2.15 Tested up to: 5.7 6 Stable tag: 1.3.0 7 7 License: GPLv2 8 8 License URI: http://www.gnu.org/licenses/gpl-2.0.html
Note: See TracChangeset
for help on using the changeset viewer.