Changeset 3166651
- Timestamp:
- 10/10/2024 02:39:42 PM (18 months ago)
- Location:
- product-feeder
- Files:
-
- 11 added
- 3 edited
-
tags/2.6.2 (added)
-
tags/2.6.2/includes (added)
-
tags/2.6.2/includes/css (added)
-
tags/2.6.2/includes/css/product-feeder.css (added)
-
tags/2.6.2/includes/product-feeder.php (added)
-
tags/2.6.2/languages (added)
-
tags/2.6.2/languages/product-feeder-nl_NL.mo (added)
-
tags/2.6.2/languages/product-feeder-nl_NL.po (added)
-
tags/2.6.2/product-feeder.php (added)
-
tags/2.6.2/readme.txt (added)
-
tags/2.6.2/uninstall.php (added)
-
trunk/includes/product-feeder.php (modified) (2 diffs)
-
trunk/product-feeder.php (modified) (1 diff)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
product-feeder/trunk/includes/product-feeder.php
r3165759 r3166651 796 796 if (in_array($attr_name, $Options['Sizes'])) { 797 797 if (empty($VariationData['Size'])) $VariationData['Size'] = $this->ResolveAttributeValue($attr_value); 798 else $VariationData['Size'] .= " ".$this->ResolveAttributeValue($attr_value); 799 } 800 if (in_array($attr_name, $Options['Brand']) && empty($ProductData['Brand'])) $ProductData['Brand'] = $this->ResolveAttributeValue($attr_value);; 801 if (in_array($attr_name, $Options['EAN']) && empty($VariationData['EAN'])) $VariationData['EAN'] = $this->ResolveAttributeValue($attr_value);; 802 if (in_array($attr_name, $Options['Color']) && empty($VariationData['Color'])) $VariationData['Color'] = $this->ResolveAttributeValue($attr_value);; 803 if (in_array($attr_name, $Options['Season']) && empty($ProductData['Season'])) $ProductData['Season'] = $this->ResolveAttributeValue($attr_value);; 804 if (in_array($attr_name, $Options['Gender']) && empty($VariationData['Gender'])) $VariationData['Gender'] = $this->ResolveAttributeValue($attr_value);; 805 if (in_array($attr_name, $Options['Material']) && empty($VariationData['Material'])) $VariationData['Material'] = $this->ResolveAttributeValue($attr_value);; 806 if (in_array($attr_name, $Options['Condition']) && empty($VariationData['Condition'])) $VariationData['Condition'] = $this->ResolveAttributeValue($attr_value);; 807 if (in_array($attr_name, $Options['DeliveryTerms']) && empty($VariationData['DeliveryTerms'])) $VariationData['DeliveryTerms'] = $this->ResolveAttributeValue($attr_value);; 798 else { 799 $VariationData['Size'] .= " ".$this->ResolveAttributeValue($attr_value); 800 $VariationData['Size'] = trim($VariationData['Size'], " "); 801 } 802 } 803 if (in_array($attr_name, $Options['Brand']) && empty($ProductData['Brand'])) $ProductData['Brand'] = $this->ResolveAttributeValue($attr_value); 804 if (in_array($attr_name, $Options['EAN']) && empty($VariationData['EAN'])) $VariationData['EAN'] = $this->ResolveAttributeValue($attr_value); 805 if (in_array($attr_name, $Options['Color']) && empty($VariationData['Color'])) $VariationData['Color'] = $this->ResolveAttributeValue($attr_value); 806 if (in_array($attr_name, $Options['Season']) && empty($ProductData['Season'])) $ProductData['Season'] = $this->ResolveAttributeValue($attr_value); 807 if (in_array($attr_name, $Options['Gender']) && empty($VariationData['Gender'])) $VariationData['Gender'] = $this->ResolveAttributeValue($attr_value); 808 if (in_array($attr_name, $Options['Material']) && empty($VariationData['Material'])) $VariationData['Material'] = $this->ResolveAttributeValue($attr_value); 809 if (in_array($attr_name, $Options['Condition']) && empty($VariationData['Condition'])) $VariationData['Condition'] = $this->ResolveAttributeValue($attr_value); 810 if (in_array($attr_name, $Options['DeliveryTerms']) && empty($VariationData['DeliveryTerms'])) $VariationData['DeliveryTerms'] = $this->ResolveAttributeValue($attr_value); 808 811 } 809 812 } … … 847 850 848 851 private function ResolveAttributeValue($Value) { 849 if (is_object($Value)) $Value = $Value->get_name();852 if (is_object($Value)) return ''; 850 853 if (!isset($this->AttributeDisplayValues[$Value])) { 851 854 global $wpdb; -
product-feeder/trunk/product-feeder.php
r3165759 r3166651 5 5 * Plugin URI: https://product-feeder.com/nl/sources/wordpress-woocommerce 6 6 * Description: Connect with various marketplaces for automated synchronization of products, orders and returns! Try it now at https://product-feeder.com 7 * Version: 2.6. 17 * Version: 2.6.2 8 8 * Author: Product Feeder 9 9 * Author URI: https://product-feeder.com -
product-feeder/trunk/readme.txt
r3165759 r3166651 5 5 Requires at least: 6.0 6 6 Tested up to: 6.4 7 Stable tag: 2.6. 17 Stable tag: 2.6.2 8 8 Requires PHP: 7.4 9 9 License: GPLv2 or later … … 153 153 = 2.6.1 = 154 154 * Updated reference bug 155 156 = 2.6.2 = 157 * Updated attribute bug
Note: See TracChangeset
for help on using the changeset viewer.