Changeset 1449881
- Timestamp:
- 07/06/2016 10:47:54 AM (10 years ago)
- Location:
- woocommerce-e-conomic-integration
- Files:
-
- 50 added
- 3 edited
-
tags/1.9.17 (added)
-
tags/1.9.17/EconomicWebservice.asmx.xml (added)
-
tags/1.9.17/assets (added)
-
tags/1.9.17/assets/ajax-loader.gif (added)
-
tags/1.9.17/assets/awp_faq.png (added)
-
tags/1.9.17/assets/awp_support.png (added)
-
tags/1.9.17/assets/banner-772x250.png (added)
-
tags/1.9.17/assets/icon-128x128.png (added)
-
tags/1.9.17/assets/icon-256x256.png (added)
-
tags/1.9.17/assets/icon-256x256.svg (added)
-
tags/1.9.17/assets/logo_landscape.png (added)
-
tags/1.9.17/assets/screenshot-1.jpg (added)
-
tags/1.9.17/assets/screenshot-2.jpg (added)
-
tags/1.9.17/assets/screenshot-3.jpg (added)
-
tags/1.9.17/assets/screenshot-4.jpg (added)
-
tags/1.9.17/class-economic-api.php (added)
-
tags/1.9.17/economic-payment.php (added)
-
tags/1.9.17/img (added)
-
tags/1.9.17/img/ajax-loader.gif (added)
-
tags/1.9.17/img/awp_faq.png (added)
-
tags/1.9.17/img/awp_support.png (added)
-
tags/1.9.17/img/banner-772x250.png (added)
-
tags/1.9.17/img/logo_landscape.png (added)
-
tags/1.9.17/invoices (added)
-
tags/1.9.17/js (added)
-
tags/1.9.17/js/economic.js (added)
-
tags/1.9.17/languages (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration-da_DK.mo (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration-da_DK.po (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration-de_DE.mo (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration-de_DE.po (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration-en_GB.mo (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration-en_GB.po (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration-es_ES.mo (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration-es_ES.po (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration-fi.mo (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration-fi.po (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration-fr_FR.mo (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration-fr_FR.po (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration-nb_NO.mo (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration-nb_NO.po (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration-pl_PL.mo (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration-pl_PL.po (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration-sv_SE.mo (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration-sv_SE.po (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration.mo (added)
-
tags/1.9.17/languages/woocommerce-e-conomic-integration.pot (added)
-
tags/1.9.17/readme.txt (added)
-
tags/1.9.17/restclient.php (added)
-
tags/1.9.17/woocommerce-economic.php (added)
-
trunk/class-economic-api.php (modified) (5 diffs)
-
trunk/readme.txt (modified) (3 diffs)
-
trunk/woocommerce-economic.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
woocommerce-e-conomic-integration/trunk/class-economic-api.php
r1438633 r1449881 439 439 $opts = array( 440 440 'http' => array( 441 'header' => "X-EconomicAppIdentifier: WooCommerce e-conomic Integration/1.9.1 6(http://wooconomics.com/; [email protected]) PHP-SOAP/1.0\r\n"441 'header' => "X-EconomicAppIdentifier: WooCommerce e-conomic Integration/1.9.17 (http://wooconomics.com/; [email protected]) PHP-SOAP/1.0\r\n" 442 442 ) 443 443 ); … … 1642 1642 1643 1643 $shippingItem = reset($order->get_items('shipping')); 1644 //logthis('shippingItem:');1645 //logthis($shippingItem);1644 logthis('shippingItem:'); 1645 logthis($shippingItem); 1646 1646 if(isset($shippingItem['method_id'])){ 1647 1647 logthis("woo_handle_order_lines_to_economic adding Shipping line"); … … 3059 3059 3060 3060 if(isset($shippingMethodObject->settings['additional_costs']) && $shippingMethodObject->settings['additional_costs'] > 0){ 3061 $shippingCost = $shippingMethodObject-> settings['cost_per_order'] + $shippingMethodObject->settings['cost']+ $shippingMethodObject->settings['additional_costs'];3061 $shippingCost = $shippingMethodObject->cost + $shippingMethodObject->cost + $shippingMethodObject->settings['additional_costs']; 3062 3062 if($shippingMethodObject->fee >= $shippingMethodObject->minimum_fee){ 3063 3063 $shippingCost = $shippingCost + $shippingMethodObject->fee; … … 3066 3066 } 3067 3067 }else{ 3068 $shippingCost = $shippingMethodObject-> settings['cost_per_order'] + $shippingMethodObject->settings['cost'];3068 $shippingCost = $shippingMethodObject->cost; 3069 3069 if($shippingMethodObject->fee >= $shippingMethodObject->minimum_fee){ 3070 3070 $shippingCost = $shippingCost + $shippingMethodObject->fee; … … 3171 3171 $shippingMethods['table_rate'] = $WC_Shipping_Table_Rate;*/ 3172 3172 //Added for WC_Shipping_Table_Rate support 1.9.9.3 3173 3174 /*Added for WooConomics 1.9.17*/ 3175 if (class_exists('WC_Shipping_Zones')) { 3176 $shippingZones = new WC_Shipping_Zones(); 3177 foreach ($shippingZones->get_zones() as $shippingZone){ 3178 $zone = $shippingZone['zone_name']; 3179 foreach($shippingZone['shipping_methods'] as $zoneShippingMethods){ 3180 $zoneShippingMethods->id = $zoneShippingMethods->id.':'.$zoneShippingMethods->instance_id; 3181 $zoneShippingMethods->title = $zone.' '.$zoneShippingMethods->title; 3182 $shippingMethods[$zoneShippingMethods->id] = $zoneShippingMethods; 3183 } 3184 } 3185 } 3186 /*Added for WooConomics 1.9.17*/ 3173 3187 3174 3188 logthis("sync_shippings starting..."); -
woocommerce-e-conomic-integration/trunk/readme.txt
r1438633 r1449881 7 7 Author: wooconomics 8 8 Requires at least: 3.8 9 Tested up to: 4.5. 210 Stable tag: 1.9.1 611 Version: 1.9.1 69 Tested up to: 4.5.3 10 Stable tag: 1.9.17 11 Version: 1.9.17 12 12 13 13 WooCommerce e-conomic integration synchronizes your WooCommerce Orders, Customers and Products to your e-conomic account. … … 82 82 3. WooCommerce Sequential Order Numbers. 83 83 84 = Compatiblity: = 85 86 * Compatible up to: WooCommerce 2.6.2 87 84 88 == Plugin Requirement == 85 89 … … 115 119 == Changelog == 116 120 121 = 1.9.17 = 122 * Added compatiblity for WooCommerce 2.6.2 123 117 124 = 1.9.16 = 118 125 * Bug fixes and Improvements. -
woocommerce-e-conomic-integration/trunk/woocommerce-economic.php
r1438633 r1449881 5 5 * Description: An e-conomic API Interface. Synchronizes products, orders, Customers and more to e-conomic. 6 6 * Also fetches inventory from e-conomic and updates WooCommerce 7 * Version: 1.9.1 67 * Version: 1.9.17 8 8 * Author: wooconomics 9 9 * Text Domain: woocommerce-e-conomic-integration … … 1339 1339 //1.9.9.16 new feature 1340 1340 1341 update_option('economic_version', 19.1 6);1341 update_option('economic_version', 19.17); 1342 1342 update_option('woo_save_object_to_economic', true); 1343 1343 } … … 1438 1438 } 1439 1439 1440 update_option('economic_version', 19.1 6);1440 update_option('economic_version', 19.17); 1441 1441 update_option('woo_save_object_to_economic', true); 1442 1442 }
Note: See TracChangeset
for help on using the changeset viewer.