prestashop-automation 0.6.2 → 0.7.5

data/lib/actions/products.rb

@@ -18,6 +18,10 @@ module PrestaShopAutomation
 				select_by_value '#id_tax_rules_group', options[:tax_group_id]
 			end
 
+			if options[:ecotax]
+				fill_in 'ecotax', :with => options[:ecotax]
+			end
+
 			if sp = options[:specific_price]
 				save_product
 

data/lib/actions/settings.rb

@@ -15,6 +15,29 @@ module PrestaShopAutomation
 			end
 		end
 
+		def set_rounding_method option
+			mapping = {
+				up: 0,
+				down: 1,
+				half_up: 2,
+				half_down: 3,
+				half_even: 4,
+				half_odd: 5
+			}
+
+			goto_admin_tab 'AdminTaxes'
+			value = mapping[option.to_sym]
+
+			if value
+				goto_admin_tab 'AdminPreferences'
+				select_by_value '#PS_PRICE_ROUND_MODE', value
+				click_button_named 'submitOptionsconfiguration', :first => true
+				standard_success_check
+			else
+				throw "Unsupported option: #{option}"
+			end
+		end
+
 		def set_friendly_urls on
 			goto_admin_tab 'AdminMeta'
 			if on
@@ -47,5 +70,19 @@ module PrestaShopAutomation
 			standard_success_check
 		end
 
+		def set_ecotax_option on, tax_group_id=nil
+			goto_admin_tab 'AdminTaxes'
+			click_label_for "PS_USE_ECOTAX_#{onoff on}"
+			click_button_named 'submitOptionstax', :first => true
+			standard_success_check
+
+			if on and tax_group_id
+				sleep 1
+				select_by_value '#PS_ECOTAX_TAX_RULES_GROUP_ID', tax_group_id
+				click_button_named 'submitOptionstax', :first => true
+				standard_success_check
+			end
+		end
+
 	end
 end

data/lib/actions/taxes.rb

@@ -32,10 +32,15 @@ module PrestaShopAutomation
 			return current_url[/\bid_tax_rules_group=(\d+)/, 1].to_i
 		end
 
-		def create_tax_group_from_rate rate, taxes_pool={}
+		def create_tax_group_from_rate rate, taxes_pool={}, groups_pool={}
+
+			if groups_pool[rate]
+				return groups_pool[rate]
+			end
+
 			if /^(?:\d+(?:.\d+)?)$/ =~ rate.to_s
-				tax_id = create_tax :name => "#{rate}% Tax (Rate)", :rate => rate
-				taxes_pool[rate] ||= create_tax_group :name => "#{rate}% Tax (Group)", :taxes => [{:tax_id => tax_id}]
+				tax_id = taxes_pool[rate] ||= (create_tax :name => "#{rate}% Tax (Rate)", :rate => rate)
+				groups_pool[rate] = create_tax_group :name => "#{rate}% Tax (Group)", :taxes => [{:tax_id => tax_id}]
 			elsif /(?:\d+(?:.\d+)?)(?:\s*(?:\+|\*)\s*(?:\d+(?:.\d+)?))+/ =~ rate
 				taxes = []
 				combine = {'+' => :sum, '*' => :multiply}[rate[/(\+|\*)/, 1]] || :no
@@ -52,7 +57,7 @@ module PrestaShopAutomation
 						}
 					end
 				end
-				create_tax_group :name => "Composite #{rate} Tax (Group)", :taxes => taxes
+				groups_pool[rate] = create_tax_group :name => "Composite #{rate} Tax (Group)", :taxes => taxes
 			else
 				throw "Invalid tax rate format: #{rate}"
 			end

data/lib/helpers/general.rb

@@ -56,7 +56,7 @@ module PrestaShopAutomation
 			url = if rest == nil
 				base
 			else
-				base.sub(/\/\s*/, '') + rest.sub(/^\s*\//, '')
+				base.sub(/\/\s*$/, '') + '/' + rest.sub(/^\s*\//, '')
 			end
 
 			super url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prestashop-automation
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -84,16 +84,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/actions/carriers.rb
-- lib/actions/cart_rules.rb
-- lib/actions/general.rb
+- lib/prestashop-automation.rb
+- lib/helpers/general.rb
+- lib/actions/products.rb
 - lib/actions/installer.rb
+- lib/actions/cart_rules.rb
+- lib/actions/carriers.rb
 - lib/actions/orders.rb
-- lib/actions/products.rb
 - lib/actions/settings.rb
+- lib/actions/general.rb
 - lib/actions/taxes.rb
-- lib/helpers/general.rb
-- lib/prestashop-automation.rb
 homepage: https://github.com/djfm/prestashop-automation
 licenses:
 - OSL