Changeset 2926676
- Timestamp:
- 06/15/2023 04:23:55 PM (3 years ago)
- Location:
- easify-server-woocommerce/trunk
- Files:
-
- 4 edited
-
easify.php (modified) (3 diffs)
-
includes/class-easify-generic-easify-server.php (modified) (3 diffs)
-
includes/class-easify-wc-plugin-settings-page.php (modified) (10 diffs)
-
readme.txt (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
easify-server-woocommerce/trunk/easify.php
r2653157 r2926676 5 5 * Plugin URI: http://www.easify.co.uk/wordpress/ 6 6 * Description: Connects Easify Business Management, EPOS (Electronic Point of Sale) and invoicing software to your WooCommerce enabled WordPress website. Allowing you to keep your online and offline shop's orders and stock control synchronised. 7 * Version: 4.3 47 * Version: 4.35 8 8 * License: GPL2 9 9 * License URI: https://www.gnu.org/licenses/gpl-2.0.html … … 11 11 * Author URI: https://www.easify.co.uk/ 12 12 * Requires at least: 5.0 13 * Tested up to: 5.814 * WC tested up to: 5.913 * Tested up to: 6.2.2 14 * WC tested up to: 7.8 15 15 * 16 16 * @package easify-woocommerce-connector … … 19 19 20 20 /** 21 * Copyright (C) 202 2Easify Ltd (email:support@easify.co.uk)21 * Copyright (C) 2023 Easify Ltd (email:support@easify.co.uk) 22 22 * This program is free software; you can redistribute it and/or 23 23 * modify it under the terms of the GNU General Public License -
easify-server-woocommerce/trunk/includes/class-easify-generic-easify-server.php
r1893080 r2926676 2 2 3 3 /** 4 * Copyright (C) 20 17Easify Ltd (email:support@easify.co.uk)4 * Copyright (C) 2023 Easify Ltd (email:support@easify.co.uk) 5 5 * This program is free software; you can redistribute it and/or 6 6 * modify it under the terms of the GNU General Public License … … 28 28 * 29 29 * @class Easify_Generic_Easify_Server 30 * @version 4. 1030 * @version 4.35 31 31 * @package easify-woocommerce-connector 32 32 * @author Easify … … 200 200 201 201 if ($info['http_code'] != '200') { 202 if (curl_error($ch)) { 203 $result = 'curl_error:' . curl_error($ch); 204 Easify_Logging::Log($result); 205 } 206 202 207 Easify_Logging::Log('Could not communicate with Easify Server - http response code: ' . $info['http_code']); 203 208 throw new Exception('Could not communicate with Easify Server - http response code: ' . $info['http_code']); -
easify-server-woocommerce/trunk/includes/class-easify-wc-plugin-settings-page.php
r2653157 r2926676 1 1 <?php 2 2 /** 3 * Copyright (C) 20 19Easify Ltd (email:support@easify.co.uk)3 * Copyright (C) 2023 Easify Ltd (email:support@easify.co.uk) 4 4 * This program is free software; you can redistribute it and/or 5 5 * modify it under the terms of the GNU General Public License … … 30 30 * 31 31 * @class Easify_WC__Plugin_Settings_Page 32 * @version 4.3 432 * @version 4.35 33 33 * @package easify-woocommerce-connector 34 34 * @author Easify … … 232 232 } 233 233 } 234 235 // close wrapper236 echo '</h2></div>'; 234 ?> 235 </h2> 236 <?php 237 237 } 238 238 … … 317 317 // If WooCommerce not active then warn user... 318 318 ?> 319 <h3 class="nav-tab-wrapper easify-warning">WooCommerce Plugin is not installed, or has not been activated.</h 2>319 <h3 class="nav-tab-wrapper easify-warning">WooCommerce Plugin is not installed, or has not been activated.</h3> 320 320 <div> 321 321 <p>You will need to make sure the WooCommerce plugin has been installed … … 331 331 // Permalinks not enabled... 332 332 ?> 333 <h3 class="nav-tab-wrapper easify-warning">Permalinks NOT enabled...</h 2>333 <h3 class="nav-tab-wrapper easify-warning">Permalinks NOT enabled...</h3> 334 334 <div> 335 335 <p>The Easify WooCommerce plugin requires that Permalinks be enabled in WordPress settings.</p> … … 1147 1147 // Easify SKU must be a number, if not a number warn user and don't save value in database 1148 1148 $type = 'error'; 1149 $message = __( $mapping_name .' Easify SKU ' . $value . ' is not a valid number.', 'require-featured-image');1149 $message = __(' Easify SKU ' . $value . ' is not a valid number.', 'require-featured-image'); 1150 1150 add_settings_error( 1151 1151 'easify_discount_sku', esc_attr('settings_updated'), $message, $type … … 1176 1176 // Warn user... 1177 1177 $type = 'error'; 1178 $message = __( $mapping_name .' Easify SKU ' . $value . ' was not found in Easify Server. Make sure a product with this SKU exists in Easify.', 'require-featured-image');1178 $message = __(' Easify SKU ' . $value . ' was not found in Easify Server. Make sure a product with this SKU exists in Easify.', 'require-featured-image'); 1179 1179 add_settings_error( 1180 1180 'easify_discount_sku', esc_attr('settings_updated'), $message, $type 1181 1181 ); 1182 1182 1183 $input['easify_discount_sku'][$mapping_name] = ''; 1183 $input['easify_discount_sku'] = ''; 1184 1184 1185 1185 return $input; … … 1195 1195 if (empty($product->SKU)) { 1196 1196 $type = 'error'; 1197 $message = __( $mapping_name .' Easify SKU ' . $value . ' was not found in Easify Server. Make sure a product with this SKU exists in Easify.', 'require-featured-image');1197 $message = __(' Easify SKU ' . $value . ' was not found in Easify Server. Make sure a product with this SKU exists in Easify.', 'require-featured-image'); 1198 1198 add_settings_error( 1199 1199 'easify_discount_sku', esc_attr('settings_updated'), $message, $type 1200 1200 ); 1201 1201 1202 $input['easify_discount_sku'][$mapping_name] = '';1202 $input['easify_discount_sku'] = ''; 1203 1203 } 1204 1204 } … … 1274 1274 $this->tool_tip('shipping-local-delivery-tip'); 1275 1275 ?> 1276 </td> 1277 </tr> 1278 <tr> 1279 <td> 1280 Local Pickup 1281 </td> 1282 <td> 1283 <?php 1284 $this->setting_html_easify_shipping_sku('local_pickup'); 1285 $this->tool_tip('shipping-local-pickup-tip'); 1286 ?> 1276 1287 </td> 1277 1288 </tr> … … 1984 1995 Easify SKU in each box here.</p> 1985 1996 <?= $this->tooltip_click_here_link('shipping-local') ?> 1986 </div> 1997 </div> 1998 1999 <div id="shipping-local-pickup-tip"> 2000 <h3>Local Pickup Mapping</h3> 2001 <p>When an order is placed via WooCommerce, it will be sent to your Easify Server and if the WooCommerce order 2002 has a shipping method of <b>Local Pickup</b>, the Easify SKU you specify here will be added to the order in Easify.</p> 2003 <p>If you want to support Local Pickup in Easify, create a new product in Easify named "Local Pickup" and 2004 enter the Easify SKU of that product here.</p> 2005 <p>When the <b>Local Pickup</b> Shipping item is added to the order in Easify, its value will be set to the shipping cost that 2006 was calculated by WooCommerce.</p> 2007 <p><b>Note: </b>You don't have to create a separate Easify Product for each shipping method. If you prefer 2008 you can create one product in Easify for all of your WooCommerce shipping methods and use the same 2009 Easify SKU in each box here.</p> 2010 <?= $this->tooltip_click_here_link('shipping-local-pickup') ?> 2011 </div> 1987 2012 1988 2013 <div id="shipping-default-tip"> -
easify-server-woocommerce/trunk/readme.txt
r2653157 r2926676 4 4 Tags: easify, epos, epos software, stock control software, accounting software, invoicing software, small business software, ecommerce, e-commerce, woothemes, wordpress ecommerce, woocommerce, shopping cart 5 5 Requires at least: 5.0 6 Tested up to: 5.87 Stable tag: 4.3 46 Tested up to: 6.2.2 7 Stable tag: 4.35 8 8 License: GPLv2 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.html 10 WC tested up to: 5.910 WC tested up to: 7.8 11 11 12 12 Connects Easify V4.x Small Business Software to your WooCommerce online shop, … … 101 101 102 102 == Changelog == 103 = 4.35 = 104 * Added support for WooCommerce Local Pickup delivery option. 105 * Improved logging to assist with troubleshooting Easify Server connection problems. 106 * Tested compatibility with PHP 8.x 103 107 = 4.34 = 104 108 * Resolved issue where disabling stock control for a product in Easify still caused stock levels to be uploaded to … … 209 213 210 214 == Upgrade Notice == 211 = 4.34 = 212 * Resolved issue where disabling stock control for a product in Easify still caused stock levels to be uploaded to 213 * website when product modified in Easify. 215 = 4.35 = 216 * Added support for WooCommerce Local Pickup delivery option. 217 * Improved logging to assist with troubleshooting Easify Server connection problems. 218 * Tested compatibility with PHP 8.x
Note: See TracChangeset
for help on using the changeset viewer.