diff --git a/plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb b/plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb
index 245db4a..c7d23c8 100644
--- a/plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb
+++ b/plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb
@@ -1,13 +1,19 @@
-
- <%= _('Shopping checkout') %>
- <%= button :back, _("haven't finished yet: back to shopping"), 'javascript:history.back()', class: 'cart-go-back' %>
-
+
<%= _('Shopping checkout') %>
+ <%= button :back, _("haven't finished yet: back to shopping"), 'javascript:history.back()', class: 'cart-go-back' %>
<%= form_for :order, url: {action: :send_request},
html: {onsubmit: "return Cart.send_request(this)", id: 'cart-request-form'} do |f| %>
-
+
+
+
+
+
-
-
-
-
- <%= submit_button(:send, _('Send buy request')) %>
+ <%= button :back, _("haven't finished yet: back to shopping"), 'javascript:history.back()' %>
+ <%= submit_button(:send, _('Send buy request'), option:"success") %>
<% end %>
diff --git a/plugins/suppliers/controllers/myprofile/suppliers_plugin/basket_controller.rb b/plugins/suppliers/controllers/myprofile/suppliers_plugin/basket_controller.rb
index d403709..27434f9 100644
--- a/plugins/suppliers/controllers/myprofile/suppliers_plugin/basket_controller.rb
+++ b/plugins/suppliers/controllers/myprofile/suppliers_plugin/basket_controller.rb
@@ -52,10 +52,12 @@ class SuppliersPlugin::BasketController < MyProfileController
extend HMVC::ClassMethods
hmvc SuppliersPlugin
- def default_url_options
- # avoid rails' use_relative_controller!
- {use_route: '/'}
+ # inherit routes from core skipping use_relative_controller!
+ def url_for options
+ options[:controller] = "/#{options[:controller]}" if options.is_a? Hash and options[:controller] and not options[:controller].to_s.starts_with? '/'
+ super options
end
+ helper_method :url_for
def set_allowed_user
@allowed_user = true
diff --git a/plugins/suppliers/controllers/myprofile/suppliers_plugin/product_controller.rb b/plugins/suppliers/controllers/myprofile/suppliers_plugin/product_controller.rb
index 3fef0de..76b03a9 100644
--- a/plugins/suppliers/controllers/myprofile/suppliers_plugin/product_controller.rb
+++ b/plugins/suppliers/controllers/myprofile/suppliers_plugin/product_controller.rb
@@ -32,7 +32,7 @@ class SuppliersPlugin::ProductController < MyProfileController
def edit
@product = profile.products.supplied.find params[:id]
- @product.update_attributes params["product_#{@product.id}"]
+ @product.update params["product_#{@product.id}"]
end
def import
@@ -79,6 +79,7 @@ class SuppliersPlugin::ProductController < MyProfileController
@supplier = SuppliersPlugin::Supplier.where(id: params[:supplier_id]).first if params[:supplier_id].present?
+ # FIXME: joins(:from_products) is hiding own products (except baskets)
@scope = profile.products.unarchived.joins :from_products, :suppliers
@scope = SuppliersPlugin::BaseProduct.search_scope @scope, params
@products_count = @scope.supplied_for_count.count
@@ -95,9 +96,11 @@ class SuppliersPlugin::ProductController < MyProfileController
extend HMVC::ClassMethods
hmvc SuppliersPlugin
- def default_url_options
- # avoid rails' use_relative_controller!
- {use_route: '/'}
+ # inherit routes from core skipping use_relative_controller!
+ def url_for options
+ options[:controller] = "/#{options[:controller]}" if options.is_a? Hash and options[:controller] and not options[:controller].to_s.starts_with? '/'
+ super options
end
+ helper_method :url_for
end
diff --git a/plugins/suppliers/controllers/myprofile/suppliers_plugin_myprofile_controller.rb b/plugins/suppliers/controllers/myprofile/suppliers_plugin_myprofile_controller.rb
index 3266894..9ebb945 100644
--- a/plugins/suppliers/controllers/myprofile/suppliers_plugin_myprofile_controller.rb
+++ b/plugins/suppliers/controllers/myprofile/suppliers_plugin_myprofile_controller.rb
@@ -21,7 +21,7 @@ class SuppliersPluginMyprofileController < MyProfileController
end
def new
- @new_supplier.update_attributes! params[:supplier]
+ @new_supplier.update! params[:supplier]
@supplier = @new_supplier
session[:notice] = t('controllers.myprofile.supplier_created')
end
@@ -33,7 +33,7 @@ class SuppliersPluginMyprofileController < MyProfileController
def edit
@supplier = profile.suppliers.find params[:id]
- @supplier.update_attributes params[:supplier]
+ @supplier.update params[:supplier]
end
def margin_change
@@ -58,8 +58,8 @@ class SuppliersPluginMyprofileController < MyProfileController
def search
@query = params[:query].downcase
- @enterprises = environment.enterprises.enabled.public.all limit: 12, order: 'name ASC',
- conditions: ['LOWER(name) LIKE ? OR LOWER(name) LIKE ? OR identifier LIKE ?', "#{@query}%", "% #{@query}%", "#{@query}%"]
+ @enterprises = environment.enterprises.enabled.is_public.limit(12).order('name ASC').
+ where('name ILIKE ? OR name ILIKE ? OR identifier LIKE ?', "#{@query}%", "% #{@query}%", "#{@query}%")
@enterprises -= profile.suppliers.collect(&:profile)
end
diff --git a/plugins/suppliers/lib/default_delegate.rb b/plugins/suppliers/lib/default_delegate.rb
index 02bdfbe..ce7b8b1 100644
--- a/plugins/suppliers/lib/default_delegate.rb
+++ b/plugins/suppliers/lib/default_delegate.rb
@@ -15,6 +15,9 @@ module DefaultDelegate
# TODO: add some documentation about the methods being added
def default_delegate field, options = {}
+ class_attribute :default_delegate_enable unless respond_to? :default_delegate_enable
+ self.default_delegate_enable = true if self.default_delegate_enable.nil?
+
# rake db:migrate run?
return unless self.table_exists?
@@ -91,6 +94,8 @@ module DefaultDelegate
end
define_method "#{field}_with_default" do
+ return self.send own_field unless self.default_delegate_enable
+
if self.send default_setting
# delegated_field may return nil, so use own instead
# this is the case with some associations (e.g. Product#product_qualifiers)
@@ -101,6 +106,8 @@ module DefaultDelegate
end
end
define_method "#{field}_with_default=" do |*args|
+ return self.send "#{own_field}=", *args unless self.default_delegate_enable
+
own = self.send "#{own_field}=", *args
# break/set the default setting automatically, used for interfaces
# that don't have the default setting (e.g. manage_products)
diff --git a/plugins/suppliers/lib/ext/product.rb b/plugins/suppliers/lib/ext/product.rb
index 4207159..75ad780 100644
--- a/plugins/suppliers/lib/ext/product.rb
+++ b/plugins/suppliers/lib/ext/product.rb
@@ -7,20 +7,22 @@ class Product
has_currency :price
has_currency :discount
- scope :available, conditions: {available: true}
- scope :unavailable, conditions: ['products.available <> true']
- scope :archived, conditions: {archived: true}
- scope :unarchived, conditions: ['products.archived <> true']
+ scope :alphabetically, -> { order 'products.name ASC' }
- scope :with_available, lambda { |available| where available: available }
- scope :with_price, conditions: 'products.price > 0'
- scope :with_product_category_id, lambda { |id| { conditions: {product_category_id: id} } }
+ scope :available, -> { where available: true }
+ scope :unavailable, -> { where 'products.available <> true' }
+ scope :archived, -> { where archived: true }
+ scope :unarchived, -> { where 'products.archived <> true' }
+
+ scope :with_available, -> (available) { where available: available }
+ scope :with_price, -> { where 'products.price > 0' }
# FIXME: transliterate input and name column
- scope :name_like, lambda { |name| { conditions: ["LOWER(products.name) LIKE ?", "%#{name}%"] } }
+ scope :name_like, -> (name) { where "name ILIKE ?", "%#{name}%" }
+ scope :with_product_category_id, -> (id) { where product_category_id: id }
- scope :by_profile, lambda { |profile| { conditions: {profile_id: profile.id} } }
- scope :by_profile_id, lambda { |profile_id| { conditions: {profile_id: profile_id} } }
+ scope :by_profile, -> (profile) { where profile_id: profile.id }
+ scope :by_profile_id, -> (profile_id) { where profile_id: profile_id }
def self.product_categories_of products
ProductCategory.find products.collect(&:product_category_id).compact.select{ |id| not id.zero? }
@@ -36,16 +38,16 @@ end
class Product
- attr_accessible :from_products, :supplier_id, :supplier
+ attr_accessible :from_products, :from_product, :supplier_id, :supplier
has_many :sources_from_products, foreign_key: :to_product_id, class_name: 'SuppliersPlugin::SourceProduct', dependent: :destroy
has_one :sources_from_product, foreign_key: :to_product_id, class_name: 'SuppliersPlugin::SourceProduct'
has_many :sources_to_products, foreign_key: :from_product_id, class_name: 'SuppliersPlugin::SourceProduct', dependent: :destroy
has_one :sources_to_product, foreign_key: :from_product_id, class_name: 'SuppliersPlugin::SourceProduct'
- has_many :to_products, through: :sources_to_products, order: 'id ASC'
- has_one :to_product, through: :sources_to_product, order: 'id ASC', autosave: true
- has_many :from_products, through: :sources_from_products, order: 'id ASC'
- has_one :from_product, through: :sources_from_product, order: 'id ASC', autosave: true
+ has_many :to_products, -> { order 'id ASC' }, through: :sources_to_products
+ has_one :to_product, -> { order 'id ASC' }, through: :sources_to_product, autosave: true
+ has_many :from_products, -> { order 'id ASC' }, through: :sources_from_products
+ has_one :from_product, -> { order 'id ASC' }, through: :sources_from_product, autosave: true
has_many :sources_from_2x_products, through: :from_products, source: :sources_from_products
has_one :sources_from_2x_product, through: :from_product, source: :sources_from_product
@@ -59,15 +61,15 @@ class Product
# semantic alias for supplier_from_product(s)
has_many :sources_supplier_products, foreign_key: :to_product_id, class_name: 'SuppliersPlugin::SourceProduct'
has_one :sources_supplier_product, foreign_key: :to_product_id, class_name: 'SuppliersPlugin::SourceProduct'
- has_many :supplier_products, through: :sources_supplier_products, source: :from_product, order: 'id ASC'
- has_one :supplier_product, through: :sources_supplier_product, source: :from_product, order: 'id ASC', autosave: true
- has_many :suppliers, through: :sources_supplier_products, uniq: true, order: 'id ASC'
- has_one :supplier, through: :sources_supplier_product, order: 'id ASC'
+ has_many :supplier_products, -> { order 'id ASC' }, through: :sources_supplier_products, source: :from_product
+ has_one :supplier_product, -> { order 'id ASC' }, through: :sources_supplier_product, source: :from_product, autosave: true
+ has_many :suppliers, -> { distinct.order 'id ASC' }, through: :sources_supplier_products
+ has_one :supplier, -> { order 'id ASC' }, through: :sources_supplier_product
- has_many :consumers, through: :to_products, source: :profile, uniq: true, order: 'id ASC'
- has_one :consumer, through: :to_product, source: :profile, order: 'id ASC'
+ has_many :consumers, -> { distinct.order 'id ASC' }, through: :to_products, source: :profile
+ has_one :consumer, -> { order 'id ASC' }, through: :to_product, source: :profile
- # overhide original
+ # overhide original, FIXME: rename to available_and_supplier_active
scope :available, -> {
joins(:suppliers).
where 'products.available = ? AND suppliers_plugin_suppliers.active = ?', true, true
@@ -81,23 +83,24 @@ class Product
where "products.available #{op} ? #{cond} suppliers_plugin_suppliers.active #{op} ?", true, true
}
- scope :name_like, lambda { |name| where "from_products_products.name ILIKE ?", "%#{name}%" }
- scope :with_product_category_id, lambda { |id| where 'from_products_products.product_category_id = ?', id }
+ scope :fp_name_like, -> (name) { where "from_products_products.name ILIKE ?", "%#{name}%" }
+ scope :fp_with_product_category_id, -> (id) { where 'from_products_products.product_category_id = ?', id }
# prefer distributed_products has_many to use DistributedProduct scopes and eager loading
scope :distributed, -> { where type: 'SuppliersPlugin::DistributedProduct'}
scope :own, -> { where type: nil }
scope :supplied, -> {
- where(type: [nil, 'SuppliersPlugin::DistributedProduct']).
- # this allow duplicates and sorting on the fields
- group('products.id')
+ # this remove duplicates and allow sorting on the fields, unlike distinct
+ group('products.id').
+ where type: [nil, 'SuppliersPlugin::DistributedProduct']
}
scope :supplied_for_count, -> {
- where(type: [nil, 'SuppliersPlugin::DistributedProduct']).uniq
+ distinct.
+ where type: [nil, 'SuppliersPlugin::DistributedProduct']
}
- scope :from_supplier, lambda { |supplier| { conditions: ['suppliers_plugin_suppliers.id = ?', supplier.id] } }
- scope :from_supplier_id, lambda { |supplier_id| { conditions: ['suppliers_plugin_suppliers.id = ?', supplier_id] } }
+ scope :from_supplier, -> (supplier) { joins(:suppliers).where 'suppliers_plugin_suppliers.id = ?', supplier.id }
+ scope :from_supplier_id, -> (supplier_id) { joins(:suppliers).where 'suppliers_plugin_suppliers.id = ?', supplier_id }
after_create :distribute_to_consumers
@@ -132,8 +135,8 @@ class Product
def distribute_to_consumer consumer, attrs = {}
distributed_product = consumer.distributed_products.where(profile_id: consumer.id, from_products_products: {id: self.id}).first
- distributed_product ||= SuppliersPlugin::DistributedProduct.create! profile: consumer, from_products: [self]
- distributed_product.update_attributes! attrs if attrs.present?
+ distributed_product ||= SuppliersPlugin::DistributedProduct.create! profile: consumer, from_product: self
+ distributed_product.update! attrs if attrs.present?
distributed_product
end
diff --git a/plugins/suppliers/lib/ext/profile.rb b/plugins/suppliers/lib/ext/profile.rb
index be25627..5092560 100644
--- a/plugins/suppliers/lib/ext/profile.rb
+++ b/plugins/suppliers/lib/ext/profile.rb
@@ -1,20 +1,25 @@
require_dependency 'profile'
+require_dependency 'community'
-# FIXME: The lines bellow should be on the core
-class Profile
+# FIXME: should be on the core
+([Profile] + Profile.descendants).each do |subclass|
+subclass.class_eval do
- has_many :products
+ has_many :products, foreign_key: :profile_id
+end
+end
+class Profile
def create_product?
true
end
-
end
-class Profile
+([Profile] + Profile.descendants).each do |subclass|
+subclass.class_eval do
# use profile.products.supplied to include own products
- has_many :distributed_products, class_name: 'SuppliersPlugin::DistributedProduct'
+ has_many :distributed_products, class_name: 'SuppliersPlugin::DistributedProduct', foreign_key: :profile_id
has_many :from_products, through: :products
has_many :to_products, through: :products
@@ -24,6 +29,11 @@ class Profile
has_many :consumers, class_name: 'SuppliersPlugin::Consumer', foreign_key: :profile_id, dependent: :destroy,
include: [{profile: [:domains], consumer: [:domains]}], order: 'name ASC'
+end
+end
+
+class Profile
+
def supplier_settings
@supplier_settings ||= Noosfero::Plugin::Settings.new self, SuppliersPlugin
end
diff --git a/plugins/suppliers/lib/suppliers_plugin/import.rb b/plugins/suppliers/lib/suppliers_plugin/import.rb
index 0b57ee8..590593b 100644
--- a/plugins/suppliers/lib/suppliers_plugin/import.rb
+++ b/plugins/suppliers/lib/suppliers_plugin/import.rb
@@ -123,11 +123,11 @@ class SuppliersPlugin::Import
product ||= supplier.profile.products.build attrs
# let update happen only on dummy suppliers
if product.persisted? and supplier.dummy?
- product.update_attributes! attrs
+ product.update! attrs
elsif product.new_record?
# create products as not available
attrs[:available] = false if not supplier.dummy?
- product.update_attributes! attrs
+ product.update! attrs
end
distributed_product = product.distribute_to_consumer consumer, distributed_attrs
diff --git a/plugins/suppliers/models/suppliers_plugin/base_product.rb b/plugins/suppliers/models/suppliers_plugin/base_product.rb
index 842b76d..4d76305 100644
--- a/plugins/suppliers/models/suppliers_plugin/base_product.rb
+++ b/plugins/suppliers/models/suppliers_plugin/base_product.rb
@@ -19,7 +19,8 @@ class SuppliersPlugin::BaseProduct < Product
}
]
- self.abstract_class = true
+ # if abstract_class is true then it will trigger https://github.com/rails/rails/issues/20871
+ #self.abstract_class = true
settings_items :minimum_selleable, type: Float, default: nil
settings_items :margin_percentage, type: Float, default: nil
@@ -75,11 +76,12 @@ class SuppliersPlugin::BaseProduct < Product
Unit.new(singular: I18n.t('suppliers_plugin.models.product.unit'), plural: I18n.t('suppliers_plugin.models.product.units'))
end
+ # override SuppliersPlugin::BaseProduct
def self.search_scope scope, params
scope = scope.from_supplier_id params[:supplier_id] if params[:supplier_id].present?
scope = scope.with_available(if params[:available] == 'true' then true else false end) if params[:available].present?
- scope = scope.name_like params[:name] if params[:name].present?
- scope = scope.with_product_category_id params[:category_id] if params[:category_id].present?
+ scope = scope.fp_name_like params[:name] if params[:name].present?
+ scope = scope.fp_with_product_category_id params[:category_id] if params[:category_id].present?
scope
end
@@ -98,7 +100,7 @@ SQL
def self.archive_orphans
self.where(id: self.orphans_ids).find_each batch_size: 50 do |product|
# need full save to trigger search index
- product.update_attributes archived: true
+ product.update archived: true
end
end
@@ -173,10 +175,10 @@ SQL
# FIXME: move to core
def archive
- self.update_attributes! archived: true
+ self.update! archived: true
end
def unarchive
- self.update_attributes! archived: false
+ self.update! archived: false
end
protected
diff --git a/plugins/suppliers/models/suppliers_plugin/supplier.rb b/plugins/suppliers/models/suppliers_plugin/supplier.rb
index a601012..e3ac8cd 100644
--- a/plugins/suppliers/models/suppliers_plugin/supplier.rb
+++ b/plugins/suppliers/models/suppliers_plugin/supplier.rb
@@ -16,21 +16,21 @@ class SuppliersPlugin::Supplier < ActiveRecord::Base
scope :alphabetical, -> { order 'name ASC' }
- scope :active, conditions: {active: true}
+ scope :active, -> { where active: true }
scope :dummy, -> { joins(:profile).where profiles: {visible: false} }
- scope :of_profile, lambda { |p| { conditions: {profile_id: p.id} } }
- scope :of_profile_id, lambda { |id| { conditions: {profile_id: id} } }
- scope :of_consumer, lambda { |c| { conditions: {consumer_id: c.id} } }
- scope :of_consumer_id, lambda { |id| { conditions: {consumer_id: id} } }
+ scope :of_profile, -> (p) { where profile_id: p.id }
+ scope :of_profile_id, -> (id) { where profile_id: id }
+ scope :of_consumer, -> (c) { where consumer_id: c.id }
+ scope :of_consumer_id, -> (id) { where consumer_id: id }
- scope :from_supplier_id, lambda { |supplier_id| { conditions: ['suppliers_plugin_suppliers.id = ?', supplier_id] } }
+ scope :from_supplier_id, -> (supplier_id) { where 'suppliers_plugin_suppliers.id = ?', supplier_id }
- scope :with_name, lambda { |name| if name then {conditions: ["LOWER(suppliers_plugin_suppliers.name) LIKE ?","%#{name.downcase}%"]} else {} end }
- scope :by_active, lambda { |active| if active then {conditions: {active: active}} else {} end }
+ scope :with_name, -> (name) { where "suppliers_plugin_suppliers.name ILIKE ?", "%#{name.downcase}%" if name }
+ scope :by_active, -> (active) { where active: active if active }
- scope :except_people, { conditions: ['profiles.type <> ?', Person.name], joins: [:consumer] }
- scope :except_self, { conditions: 'profile_id <> consumer_id' }
+ scope :except_people, -> { joins(:consumer).where 'profiles.type <> ?', Person.name }
+ scope :except_self, -> { where 'profile_id <> consumer_id' }
after_create :add_admins, if: :dummy?
after_create :save_profile, if: :dummy?
diff --git a/plugins/suppliers/test/test_helper.rb b/plugins/suppliers/test/test_helper.rb
new file mode 100644
index 0000000..cca1fd3
--- /dev/null
+++ b/plugins/suppliers/test/test_helper.rb
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
diff --git a/plugins/suppliers/test/unit/code_numbering_test.rb b/plugins/suppliers/test/unit/code_numbering_test.rb
new file mode 100644
index 0000000..0fcb79a
--- /dev/null
+++ b/plugins/suppliers/test/unit/code_numbering_test.rb
@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+
+class CodeNumberingTest < ActiveSupport::TestCase
+
+
+end
+
diff --git a/plugins/suppliers/test/unit/default_delegate_test.rb b/plugins/suppliers/test/unit/default_delegate_test.rb
new file mode 100644
index 0000000..525796d
--- /dev/null
+++ b/plugins/suppliers/test/unit/default_delegate_test.rb
@@ -0,0 +1,6 @@
+require 'test_helper'
+
+class DefaultDelegateTest < ActiveSupport::TestCase
+
+
+end
diff --git a/plugins/suppliers/test/unit/suppliers_plugin/distributed_product_test.rb b/plugins/suppliers/test/unit/suppliers_plugin/distributed_product_test.rb
new file mode 100644
index 0000000..ddcd396
--- /dev/null
+++ b/plugins/suppliers/test/unit/suppliers_plugin/distributed_product_test.rb
@@ -0,0 +1,108 @@
+require "#{File.dirname(__FILE__)}/../../test_helper"
+
+class SuppliersPlugin::DistributedProductTest < ActiveSupport::TestCase
+
+ def setup
+ @product_category = create(ProductCategory, :name => 'parent')
+ @profile = build(Enterprise)
+ @invisible_profile = build(Enterprise, :visible => false)
+ @other_profile = build(Enterprise)
+ @self_supplier = build(SuppliersPlugin::Supplier, :consumer => @profile, :profile => @profile)
+ @dummy_supplier = build(SuppliersPlugin::Supplier, :consumer => @profile, :profile => @dummy_profile)
+ @other_supplier = build(SuppliersPlugin::Supplier, :consumer => @profile, :profile => @other_profile)
+ end
+
+ attr_accessor :product_category,
+ :profile, :invisible_profile, :other_profile,
+ :profile, :dummy_profile, :other_profile, :self_supplier, :dummy_supplier, :other_supplier
+
+ should 'return default settings considering dummy supplier' do
+ product = build(SuppliersPlugin::DistributedProduct, :profile => @profile, :supplier => @dummy_supplier)
+ assert_equal nil, product.default_name
+ assert_equal nil, product.default_description
+ product = build(SuppliersPlugin::DistributedProduct, :profile => @profile, :supplier => @other_supplier)
+ assert_equal true, product.default_name
+ assert_equal true, product.default_description
+ end
+
+ should 'return price without margins if it is own product' do
+ product = build(SuppliersPlugin::DistributedProduct, :price => 10, :margin_percentage => 10, :profile => @profile, :supplier => @self_supplier)
+ assert_equal 10.0, product.price.to_f
+ end
+
+ should 'return price without margins if supplier product has no price' do
+ supplier_product = build(SuppliersPlugin::DistributedProduct, :profile => @other_profile, :supplier => @other_profile.self_supplier)
+ product = build(SuppliersPlugin::DistributedProduct, :price => 10, :margin_percentage => 10, :profile => @profile, :supplier => @other_supplier)
+ assert_equal 10.0, product.price.to_f
+ end
+
+ should 'return price with margins' do
+ supplier_product = build(SuppliersPlugin::DistributedProduct, :price => 10, :margin_percentage => 10, :profile => @other_profile, :supplier => @other_profile.self_supplier)
+ product = build(SuppliersPlugin::DistributedProduct, :price => 10, :margin_percentage => 10, :supplier_product => supplier_product, :profile => @profile, :supplier => @other_supplier)
+
+ product.default_margin_percentage = false
+ assert_equal 11.0, product.price.to_f
+ profile.margin_percentage = 20
+ product.default_margin_percentage = true
+ assert_equal 12.0, product.price.to_f
+ end
+
+ should 'allow set of supplier product' do
+ product = build(SuppliersPlugin::DistributedProduct, :price => 10, :margin_percentage => 10, :profile => @profile, :supplier => @self_supplier)
+
+ product.from_product = build(SuppliersPlugin::DistributedProduct, :profile => @profile, :supplier => @self_supplier)
+ assert_nothing_raised do
+ product.supplier_product = {:price => 10, :margin_percentage => 10}
+ product.supplier_product = SuppliersPlugin::DistributedProduct.new :price => 5
+ end
+ end
+
+ should 'create a supplier product for a dummy supplier' do
+ product = build(SuppliersPlugin::DistributedProduct, :profile => @profile, :supplier => @dummy_supplier)
+ assert product.supplier_product
+ # negative assertion
+ product = build(SuppliersPlugin::DistributedProduct, :profile => @profile, :supplier => @other_supplier)
+ assert !product.supplier_product
+ end
+
+ should 'respond to supplier_product_id setter and getter' do
+ product = create(SuppliersPlugin::DistributedProduct, :profile => @profile, :supplier => @dummy_supplier)
+ assert_equal product.supplier_product.id, product.supplier_product_id
+ product.expects(:distribute_from)
+ product.supplier_product_id = 1
+ end
+
+ should 'respond to distribute_from' do
+ product = create(SuppliersPlugin::DistributedProduct, :profile => @profile, :supplier => @profile.self_supplier)
+
+ assert_raise RuntimeError do
+ supplier_product = build(SuppliersPlugin::DistributedProduct, :profile => @other_profile)
+ product.distribute_from(supplier_product)
+ end
+
+ supplier_product = create(SuppliersPlugin::DistributedProduct, :profile => @other_profile)
+ product.profile.add_supplier @other_profile
+ product.distribute_from supplier_product
+ assert_equal product.supplier.profile, supplier_product.profile
+ assert_equal product.supplier.profile, supplier_product.profile
+ end
+
+ should 'return json for category hierarchy' do
+ grandparent = create(ProductCategory, :name => 'grand parent')
+ parent = create(ProductCategory, :name => 'parent')
+ child = product_category
+
+ product = SuppliersPlugin::DistributedProduct.new :category => parent
+ hash = {:own_name => "parent", :id => "2", :subcats => [], :name => "parent",
+ :hierarchy => [{:own_name => "parent", :subcats => [], :name => "parent", :id => "2"}]}
+ assert_equal hash, product.json_for_category
+ end
+
+ should 'block own product distribution' do
+ product = Product.create :enterprise => @profile, :product_category => product_category
+ distributed = SuppliersPlugin::DistributedProduct.new :enterprise => @profile, :from_products => [product]
+
+ assert distributed.invalid?
+ end
+
+end
diff --git a/plugins/suppliers/test/unit/suppliers_plugin/product_test.rb b/plugins/suppliers/test/unit/suppliers_plugin/product_test.rb
new file mode 100644
index 0000000..947ba74
--- /dev/null
+++ b/plugins/suppliers/test/unit/suppliers_plugin/product_test.rb
@@ -0,0 +1,49 @@
+require "test_helper"
+
+class SuppliersPlugin::ProductTest < ActiveSupport::TestCase
+
+ def setup
+ @product = build(SuppliersPlugin::BaseProduct)
+ end
+
+ should 'return first from product as supplier product' do
+ fp = build(SuppliersPlugin::BaseProduct, :profile => @product.profile)
+ @product.from_products = [fp]
+ assert_equal fp, @product.from_product
+ assert_equal fp, @product.supplier_product
+ end
+
+ should 'respond to dummy and own' do
+ assert !@product.dummy?
+ assert @product.own?
+ end
+
+ should 'return price with margins' do
+ supplier_product = build(SuppliersPlugin::DistributedProduct, :price => 10, :margin_percentage => 10, :profile => @product.profile, :supplier => @product.profile.self_supplier)
+ product = build(SuppliersPlugin::DistributedProduct, :price => 10, :margin_percentage => 10, :supplier_product => supplier_product, :profile => @product.profile, :supplier => @product.profile.self_supplier)
+
+ product.default_margin_percentage = false
+ assert_equal 11.0, product.price_with_margins
+ @product.profile.margin_percentage = 20
+ product.default_margin_percentage = true
+ assert_equal 12.0, product.price_with_margins
+ end
+
+ should 'build default unit if none exists' do
+ assert_equal 0, Unit.count
+ assert 'unit', @product.unit.singular
+ end
+
+ should 'avoid destroy by raising an exception' do
+ assert_raise RuntimeError do
+ @product.destroy
+ end
+ end
+
+ should 'accept price in different formats' do
+ @product.price = '2,45'
+ assert_equal 2.45, @product.price
+ end
+
+
+end
diff --git a/plugins/suppliers/test/unit/suppliers_plugin/source_product_test.rb b/plugins/suppliers/test/unit/suppliers_plugin/source_product_test.rb
new file mode 100644
index 0000000..a043536
--- /dev/null
+++ b/plugins/suppliers/test/unit/suppliers_plugin/source_product_test.rb
@@ -0,0 +1,8 @@
+require "#{File.dirname(__FILE__)}/../../test_helper"
+
+class SuppliersPlugin::SourceProductTest < ActiveSupport::TestCase
+
+ def setup
+ end
+
+end
diff --git a/plugins/suppliers/test/unit/suppliers_plugin/supplier_test.rb b/plugins/suppliers/test/unit/suppliers_plugin/supplier_test.rb
new file mode 100644
index 0000000..f3d53c9
--- /dev/null
+++ b/plugins/suppliers/test/unit/suppliers_plugin/supplier_test.rb
@@ -0,0 +1,8 @@
+require "#{File.dirname(__FILE__)}/../../test_helper"
+
+class SuppliersPlugin::SupplierTest < ActiveSupport::TestCase
+
+ def setup
+ end
+
+end
diff --git a/plugins/suppliers/views/suppliers_plugin_myprofile/margin_change.html.slim b/plugins/suppliers/views/suppliers_plugin_myprofile/margin_change.html.slim
new file mode 100644
index 0000000..ad19eac
--- /dev/null
+++ b/plugins/suppliers/views/suppliers_plugin_myprofile/margin_change.html.slim
@@ -0,0 +1,17 @@
+#suppliers-plugin-margin-change.popin
+ h1= t'views.myprofile.margin_change.change_default_margin'
+
+ = form_for @profile, as: :profile_data, remote: true, url: {controller: :suppliers_plugin_myprofile, action: :margin_change} do |f|
+ div= t'views.myprofile.margin_change.notice'
+
+ = labelled_field f, :margin_percentage, t('views.myprofile.margin_change.new_margin'),
+ input_group_addon(t'views.myprofile.margin_change.%'){ f.number_field :margin_percentage, step: 'any' }
+
+ .checkbox
+ label name='apply_to_all'
+ = check_box_tag :apply_to_all, 1, false
+ = t'views.myprofile.margin_change.apply_to_all'
+ .clean
+
+ = submit_button :save, t('views.myprofile.margin_change.confirm')
+ = modal_close_link t('views.myprofile.margin_change.cancel')
--
libgit2 0.21.2