spree_multi_vendor 2.3.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc35d0a2ae81399b7daa7f806f69725d71bfb5f7ea5b54ff0680d4b95e93e9e9
-  data.tar.gz: a19370e4fc2ae70fd6749ae829560d250ebb579844132d8fa9766043c0374c72
+  metadata.gz: 956455a7ff13df68945b50b576880f345e2dbd4f5c4c32dc99420f0a1c5698e7
+  data.tar.gz: 8daf1f4488fad039a96e4c43a2211521d5b15297c5e628f018368d38fca70121
 SHA512:
-  metadata.gz: 6d55aa0438bf0ef0005320b21b90417370b388502b0b6a8957e5f291b988dd0b8b6c486e3d785360cb4c853b36ce978e5b972dee0a609eb5867435cc40aa532b
-  data.tar.gz: fbb4c2094e074e06edee73ea7338ddcac6d6d800ab1810d3134efdcd5283c0d3976161f7aa9b5803e79ad58e3cc68e71b690aa48e6a4397243c838db3b63f085
+  metadata.gz: 6b10eaa1316ee480d4b8b2e456e1648b3da2b01561effa253c65671de1963e3cb7369c1a061a4a298d443f5be4c018a7d9fff45d0a0514a2115f17f400f4fbf6
+  data.tar.gz: ad4aac2625a258d534c9fa553a8261907601443a53859ef55e4e76523c6868c59083dac7904026741dc040b3b80b1da42a6aca9e35060fe82f17579ad111f0af

data/README.md

@@ -1,30 +1,31 @@
 # Spree Multi Vendor
 
-[![Build Status](https://travis-ci.com/spree-contrib/spree_multi_vendor.svg?branch=master)](https://travis-ci.com/spree-contrib/spree_multi_vendor)
+This is a spree [multi vendor marketplace](https://getvendo.com) extension. It's a great starting point if you're building a marketplace on top of [Spree](https://spreecommerce.org). Our goal was flexibility to allow you to tweak it to your needs.
 
-This is a [spree multi vendor marketplace](https://spreecommerce.org/use-cases/multi-vendor-marketplace/) extension. It's a great starting point if you're building a marketplace on top of [Spree](https://spreecommerce.org). Our goal was flexibility to allow you to tweak it to your needs.
+## Developed by
 
-Check out this extension [multi vendor marketplace demo](https://spreecommerce.org/launch-a-multi-vendor-marketplace-within-a-few-weeks-with-spree-commerce/) and launch your marketplace within weeks, not months.
+[![Vendo](https://assets-global.website-files.com/6230c485f2c32ea1b0daa438/623372f40a8c54ca9aea34e8_vendo%202.svg)](https://getvendo.com?utm_source=spree_multi_vendor_github)
 
-Developed and maintained by:
+> All-in-one platform for all your multi-vendor Marketplace needs. [Get your free account](https://app.getvendo.com/users/new?utm_source=spree_multi_vendor_github)
 
-[![Spark Solutions](http://sparksolutions.co/wp-content/uploads/2015/01/logo-ss-tr-221x100.png)][spark]
+## Open source vs Vendo
 
-## Features
+If you need a product that has all of the features out of the box, such us supplier onboarding, Stripe connect payment splitting and payouts, and don't require any custom development - we recommend using [Vendo](https://app.getvendo.com/users/new?utm_source=spree_multi_vendor_github).
 
-By default you can create and manage Vendors who can manage on their own:
-
-- [X] Orders
-- [X] Products
-- [X] Stock Locations
-- [X] Shipping Methods
-- [X] Vendor profile
-
-Also:
-- [X] Super Admins can assign Users to Vendors
-- [X] You can modify which permissions and models/resources Vendors can manage quite easily
-
-Contributions welcome! :)
+| feature | open source | [vendo] |
+|---|---|---|
+| basic vendorization | ✔️ | ✔️ |
+| supplier onboarding | | ✔️ |
+| supplier dashboard | | ✔️ |
+| supplier management | | ✔️ |
+| supplier product curation | | ✔️ |
+| automatic payment splitting | | ✔️ |
+| automatic payouts | | ✔️ |
+| Afterpay / klarna / apple pay | | ✔️ |
+| shopify / bigcommerce / woocommerce integration | | ✔️ |
+| USPS, UPS, FedEx, DHL, and more | | ✔️ |
+| bulk upload / import of products from CSV and XSLX | | ✔️ |
+| bulk export of orders, shipments and more | | ✔️ |
 
 ## Installation
 
@@ -165,13 +166,12 @@ and may be redistributed under the terms specified in the
 
 [LICENSE]: https://github.com/spark-solutions/spree_braintree_vzero/blob/master/LICENSE
 
-## About Spark Solutions
+## About Vendo
 
-[![Spark Solutions](http://sparksolutions.co/wp-content/uploads/2015/01/logo-ss-tr-221x100.png)][spark]
+> [Vendo][vendo] is a great fit for marketplaces of all sizes - either with own fulfillment and multiple warehouses or in a dropshipping model. Vendo **automates everything** from **vendor onboarding**, accepting buyer **payments in over 135 currencies**, to supplier **payouts in 50 countries**. 
 
-Spree Vendors is maintained by [Spark Solutions Sp. z o.o.](http://sparksolutions.co?utm_source=github)
+> Vendo ensures excellent buyer experience with smooth product discovery and search, a multitude of payment methods and optimal shipping cost calculation. Vendo keeps suppliers happy with easy onboarding, automated products sync using their preferred method and easy payouts.
 
-We are passionate about open source software.
-We are [available for hire][spark].
+> [Get your free account](https://app.getvendo.com/users/new?utm_source=spree_multi_vendor_github)
 
-[spark]:http://sparksolutions.co?utm_source=github
+[vendo]:https://app.getvendo.com/users/new?utm_source=spree_multi_vendor_github

data/app/controllers/spree/api/v1/vendors_controller.rb

@@ -1,7 +1,7 @@
 module Spree
   module Api
     module V1
-      class VendorsController < Spree::Api::BaseController
+      class VendorsController < Spree::Api::V1::BaseController
         def index
           @vendors = if params[:ids].present?
                        scope.where(id: params[:ids].split(','))

data/app/controllers/spree_multi_vendor/spree/api/base_controller_decorator.rb

@@ -1,5 +1,5 @@
 module SpreeMultiVendor::Spree::Api::BaseControllerDecorator
-  Spree::Api::BaseController.include(Spree::Api::VendorHelper)
+  Spree::Api::V1::BaseController.include(Spree::Api::VendorHelper) if SpreeMultiVendor::Engine.api_v1_available?
 
   def self.prepended(base)
     base.helper_method :current_spree_vendor
@@ -14,4 +14,4 @@ module SpreeMultiVendor::Spree::Api::BaseControllerDecorator
   end
 end
 
-::Spree::Api::BaseController.prepend SpreeMultiVendor::Spree::Api::BaseControllerDecorator
+::Spree::Api::V1::BaseController.prepend SpreeMultiVendor::Spree::Api::BaseControllerDecorator if SpreeMultiVendor::Engine.api_v1_available?

data/app/controllers/spree_multi_vendor/spree/api/v1/products_controller_decorator.rb

@@ -6,4 +6,4 @@ module SpreeMultiVendor::Spree::Api::V1::ProductsControllerDecorator
   end
 end
 
-Spree::Api::V1::ProductsController.prepend SpreeMultiVendor::Spree::Api::V1::ProductsControllerDecorator
+Spree::Api::V1::ProductsController.prepend SpreeMultiVendor::Spree::Api::V1::ProductsControllerDecorator if SpreeMultiVendor::Engine.api_v1_available?

data/app/controllers/spree_multi_vendor/spree/api/v1/users_controller_decorator.rb

@@ -10,4 +10,4 @@ module SpreeMultiVendor::Spree::Api::V1::UsersControllerDecorator
   end
 end
 
-Spree::Api::V1::UsersController.prepend SpreeMultiVendor::Spree::Api::V1::UsersControllerDecorator
+Spree::Api::V1::UsersController.prepend SpreeMultiVendor::Spree::Api::V1::UsersControllerDecorator if SpreeMultiVendor::Engine.api_v1_available?

data/app/helpers/spree_multi_vendor/spree/api/api_helpers_decorator.rb

@@ -16,4 +16,4 @@ module SpreeMultiVendor
   end
 end
 
-::Spree::Api::ApiHelpers.prepend(SpreeMultiVendor::Spree::Api::ApiHelpersDecorator)
+::Spree::Api::ApiHelpers.prepend(SpreeMultiVendor::Spree::Api::ApiHelpersDecorator) if SpreeMultiVendor::Engine.api_v1_available?

data/app/models/spree/vendor.rb

@@ -61,7 +61,7 @@ module Spree
     private
 
     def create_stock_location
-      stock_locations.where(name: name, country: Spree::Country.default).first_or_create!
+      stock_locations.where(name: name, country: Spree::Store.default.default_country).first_or_create!
     end
 
     def should_generate_new_friendly_id?

data/app/models/spree_multi_vendor/spree/variant_decorator.rb

@@ -7,7 +7,6 @@ module SpreeMultiVendor::Spree::VariantDecorator
 
   def vendor
     @vendor ||= if self.class.reflect_on_association(:vendor) && self[:vendor_id].present?
-                  product.vendor
                   ::Spree::Vendor.unscoped.find(self[:vendor_id])
                 elsif Spree::Product.reflect_on_association(:vendor) && product.vendor_id.present?
                   product.vendor

data/app/overrides/spree/admin/shared/_main_menu.rb

@@ -3,21 +3,4 @@ Deface::Override.new(
   name: 'Display configuration tab for vendors',
   replace: 'erb[silent]:contains("current_store")',
   text: '<% if can?(:admin, current_store) || current_spree_user&.vendors&.any? %>'
-)
-Deface::Override.new(
-  virtual_path:  'spree/admin/shared/_main_menu',
-  name:          'vendors_main_menu_tabs',
-  insert_bottom: 'nav',
-  text:       <<-HTML
-                <% if current_spree_user.respond_to?(:has_spree_role?) && current_spree_user.has_spree_role?(:admin) %>
-                  <ul class="nav nav-sidebar border-bottom">
-                    <%= tab plural_resource_name(Spree::Vendor), url: admin_vendors_path, icon: 'money' %>
-                  </ul>
-                <% end %>
-                <% if defined?(current_spree_vendor) && current_spree_vendor %>
-                  <ul class="nav nav-sidebar border-bottom">
-                    <%= tab Spree::Vendor.model_name.human, url: admin_vendor_settings_path, icon: 'money' %>
-                  </ul>
-                <% end %>
-HTML
-)
+)

data/app/overrides/spree/admin/users/_form.rb

@@ -5,7 +5,7 @@ Deface::Override.new(
   text: <<-HTML
           <% if current_spree_user.respond_to?(:has_spree_role?) && current_spree_user.has_spree_role?(:admin) %>
             <%= f.field_container :vendor_ids, class: ['form-group'] do %>
-              <%= f.label :vendor_ids, Spree.t(plural_resource_name(Spree::Vendor)) %>
+              <%= f.label :vendor_ids, plural_resource_name(Spree::Vendor) %>
               <%= f.collection_select(:vendor_ids, Spree::Vendor.all, :id, :name, { }, { class: 'select2', multiple: true }) %>
             <% end %>
           <% end %>

data/app/views/spree/admin/vendors/index.html.erb

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= Spree.t(plural_resource_name(Spree::Vendor)) %>
+  <%= plural_resource_name(Spree::Vendor) %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -33,7 +33,7 @@
 <%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection } %>
 
 <% if @vendors.any? %>
-  <table class="table sortable" data-hook="vendors_table" data-sortable-link="<%= update_positions_admin_vendors_url %>">
+  <table class="table border rounded sortable" data-hook="vendors_table" data-sortable-link="<%= update_positions_admin_vendors_url %>">
     <thead>
       <tr data-hook="vendors_header">
         <th>

data/config/initializers/spree_permitted_attributes.rb

@@ -6,7 +6,5 @@ module Spree
 
     @@vendor_attributes = [:name, :about_us, :contact_us, :notification_email]
     @@vendor_attributes << :image if Spree.version.to_f >= 3.6
-
-    @@product_attributes << :vendor_id if SpreeMultiVendor::Config[:vendorized_models].include?('product')
   end
 end

data/config/locales/en.yml

@@ -32,3 +32,4 @@ en:
       pending: Pending
     admin:
       commission: Commission
+    vendors: Vendors

data/config/locales/es.yml

@@ -34,3 +34,4 @@ es:
       pending: Pendiente
     admin:
       commission: Comisión
+    vendors: Vendedores

data/config/locales/fr.yml

@@ -31,3 +31,4 @@ fr:
       pending: En attente
     admin:
       commission: Commission
+    vendors: Vendeurs

data/db/migrate/20210728120910_change_vendor_id_and_user_id_type_for_spree_vendor_users.rb

@@ -1,8 +1,14 @@
 class ChangeVendorIdAndUserIdTypeForSpreeVendorUsers < ActiveRecord::Migration[4.2]
-  def change
+  def up
     change_table(:spree_vendor_users) do |t|
       t.change :vendor_id, :bigint
       t.change :user_id, :bigint
     end
   end
+  def down
+    change_table(:spree_vendor_users) do |t|
+      t.change :vendor_id, :integer
+      t.change :user_id, :integer
+    end
+  end
 end

data/db/migrate/20210728121024_change_vendor_id_and_order_id_type_for_spree_order_commissions.rb

@@ -1,8 +1,14 @@
 class ChangeVendorIdAndOrderIdTypeForSpreeOrderCommissions < ActiveRecord::Migration[4.2]
-  def change
+  def up
     change_table(:spree_order_commissions) do |t|
       t.change :vendor_id, :bigint
       t.change :order_id, :bigint
     end
   end
+  def down
+    change_table(:spree_order_commissions) do |t|
+      t.change :vendor_id, :integer
+      t.change :order_id, :integer
+    end
+  end
 end

data/lib/spree_multi_vendor/configuration.rb

@@ -0,0 +1,27 @@
+module SpreeMultiVendor
+  class Configuration
+    DEFAULT_VENDORIZED_MODELS ||= %w[product variant stock_location shipping_method].freeze
+
+    attr_accessor :vendorized_models
+
+    def initialize
+      self.vendorized_models = DEFAULT_VENDORIZED_MODELS
+    end
+
+    def configure
+      yield(self) if block_given?
+    end
+
+    def get(preference)
+      send(preference)
+    end
+
+    alias [] get
+
+    def set(preference, value)
+      send("#{preference}=", value)
+    end
+
+    alias []= set
+  end
+end

data/lib/spree_multi_vendor/engine.rb

@@ -1,3 +1,5 @@
+require_relative 'configuration'
+
 module SpreeMultiVendor
   class Engine < Rails::Engine
     require 'spree/core'
@@ -13,12 +15,20 @@ module SpreeMultiVendor
       SpreeMultiVendor::Config = SpreeMultiVendor::Configuration.new
     end
 
+    config.after_initialize do
+      ::Spree::PermittedAttributes.product_attributes << :vendor_id if SpreeMultiVendor::Config[:vendorized_models].include?('product')
+    end
+
     def self.activate
       Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
     end
 
+    def self.api_v1_available?
+      @@api_v1_available ||= Gem::Specification.find_all_by_name('spree_api_v1').any?
+    end
+
     config.to_prepare &method(:activate).to_proc
   end
 end

data/lib/spree_multi_vendor/version.rb

@@ -1,5 +1,5 @@
 module SpreeMultiVendor
-  VERSION = '2.3.0'
+  VERSION = '2.4.1'
 
   module_function
 

data/lib/spree_multi_vendor.rb

@@ -1,5 +1,6 @@
 require 'spree_core'
 require 'spree_backend'
+require 'spree_emails'
 require 'spree_multi_vendor/engine'
 require 'spree_multi_vendor/version'
 require 'spree_extension'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_multi_vendor
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Spark Solutions
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2023-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -148,7 +148,6 @@ files:
 - app/models/spree/vendor_image.rb
 - app/models/spree/vendor_order_totals.rb
 - app/models/spree/vendor_user.rb
-- app/models/spree_multi_vendor/configuration.rb
 - app/models/spree_multi_vendor/spree/ability_decorator.rb
 - app/models/spree_multi_vendor/spree/base_decorator.rb
 - app/models/spree_multi_vendor/spree/line_item_decorator.rb
@@ -209,6 +208,7 @@ files:
 - lib/generators/spree_multi_vendor/mailers_preview/mailers_preview_generator.rb
 - lib/generators/spree_multi_vendor/mailers_preview/templates/mailers/previews/vendor_notification_preview.rb
 - lib/spree_multi_vendor.rb
+- lib/spree_multi_vendor/configuration.rb
 - lib/spree_multi_vendor/engine.rb
 - lib/spree_multi_vendor/factories.rb
 - lib/spree_multi_vendor/version.rb
@@ -250,9 +250,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree-contrib/spree_multi_vendor/issues
-  changelog_uri: https://github.com/spree-contrib/spree_multi_vendor/releases/tag/v2.3.0
+  changelog_uri: https://github.com/spree-contrib/spree_multi_vendor/releases/tag/v2.4.1
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree-contrib/spree_multi_vendor/tree/v2.3.0
+  source_code_uri: https://github.com/spree-contrib/spree_multi_vendor/tree/v2.4.1
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -269,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.2.3
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Spree Commerce multi vendor marketplace extension

data/app/models/spree_multi_vendor/configuration.rb

@@ -1,10 +0,0 @@
-module SpreeMultiVendor
-  class Configuration < ::Spree::Preferences::Configuration
-    DEFAULT_VENDORIZED_MODELS ||= %w[product variant stock_location shipping_method].freeze
-
-   # Some example preferences are shown below, for more information visit:
-   # https://guides.spreecommerce.org/developer/core/preferences.html
-
-   preference :vendorized_models, :array, default: DEFAULT_VENDORIZED_MODELS
-  end
-end