spree_multi_vendor 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4a9ea707b2e1f2dd0c5ac2b71c82c1334ca991cb0e80cd26f35cc6e95234d06
-  data.tar.gz: 777150a6db369707f55927a5e5066e93de22070b190539a07de79b616e028182
+  metadata.gz: fc35d0a2ae81399b7daa7f806f69725d71bfb5f7ea5b54ff0680d4b95e93e9e9
+  data.tar.gz: a19370e4fc2ae70fd6749ae829560d250ebb579844132d8fa9766043c0374c72
 SHA512:
-  metadata.gz: 7b084940266d45faf272d01d3ef2e4c638476b51d736f2232879427218d0c04345c1d0494f3c1eaabbd37c8e50c68712f1e87ee1fc837c12a318451f2554fc56
-  data.tar.gz: 3a52b9945c79a47af00d3e99965176cf89cce11adce7c5cd89573ec685b41cc0d08242d4f302d5c3f07ec1c4a50c7463e53cb9e3eb5a25eb7d62c8c36cb04af4
+  metadata.gz: 6d55aa0438bf0ef0005320b21b90417370b388502b0b6a8957e5f291b988dd0b8b6c486e3d785360cb4c853b36ce978e5b972dee0a609eb5867435cc40aa532b
+  data.tar.gz: fbb4c2094e074e06edee73ea7338ddcac6d6d800ab1810d3134efdcd5283c0d3976161f7aa9b5803e79ad58e3cc68e71b690aa48e6a4397243c838db3b63f085

data/.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10

data/.travis.yml

@@ -11,6 +11,7 @@ addons:
 services:
   - mysql
   - postgresql
+  - redis-server
 
 language: ruby
 
@@ -22,14 +23,6 @@ env:
   - DB=mysql
   - DB=postgres
 
-gemfile:
-  - gemfiles/spree_4_2.gemfile
-  - gemfiles/spree_master.gemfile
-
-jobs:
-  allow_failures:
-    - gemfile: gemfiles/spree_master.gemfile
-
 before_install:
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
 

data/Gemfile

@@ -1,7 +1,10 @@
 source 'https://rubygems.org'
 
-gem 'spree', github: 'spree/spree', branch: 'master'
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: 'master'
+gem 'spree', github: 'spree/spree', branch: 'main'
+gem 'spree_backend', github: 'spree/spree_backend', branch: 'main'
+gem 'spree_frontend', github: 'spree/spree_legacy_frontend', branch: 'main'
+gem 'spree_emails', github: 'spree/spree', branch: 'main'
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: 'main'
 gem 'rails-controller-testing'
 
 gemspec

data/README.md

@@ -1,6 +1,6 @@
 # Spree Multi Vendor
 
-[![Build Status](https://travis-ci.org/spree-contrib/spree_multi_vendor.svg?branch=master)](https://travis-ci.org/spree-contrib/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://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.
 
@@ -97,6 +97,17 @@ Spree Multi Vendor adds new [API v2](https://api.spreecommerce.org/docs/api-v2/a
 
      `/api/v2/storefront/vendors/test-vendor?include=image,products`
 
+2. `GET` Returns a list of Vendors
+    
+     ```
+     /api/v2/storefront/vendors
+     ```    
+
+     you can also include Vendor image and/or Products in that call:
+
+     `/api/v2/storefront/vendors?include=image,products`
+
+
 And modfies existing:
 
 1. `GET` Filtering Products by Vendor ID(s):

data/app/controllers/spree/admin/vendor_settings_controller.rb

@@ -5,7 +5,7 @@ module Spree
       before_action :load_vendor
 
       def update
-        if vendor_params[:image] && Spree.version.to_f >= 3.6
+        if vendor_params[:image]
           @vendor.create_image(attachment: vendor_params[:image])
         end
         if @vendor.update(vendor_params.except(:image))

data/app/controllers/spree/admin/vendors_controller.rb

@@ -3,14 +3,14 @@ module Spree
     class VendorsController < ResourceController
 
       def create
-        if permitted_resource_params[:image] && Spree.version.to_f >= 3.6
+        if permitted_resource_params[:image]
           @vendor.build_image(attachment: permitted_resource_params.delete(:image))
         end
         super
       end
 
       def update
-        if permitted_resource_params[:image] && Spree.version.to_f >= 3.6
+        if permitted_resource_params[:image]
           @vendor.create_image(attachment: permitted_resource_params.delete(:image))
         end
         format_translations if defined? SpreeGlobalize
@@ -40,10 +40,18 @@ module Spree
         @search = vendors.ransack(params[:q])
 
         @collection = @search.result.
+            includes(vendor_includes).
             page(params[:page]).
             per(params[:per_page])
       end
 
+      def vendor_includes
+        {
+          image: [],
+          products: []
+        }
+      end
+
       def format_translations
         return if params[:vendor][:translations_attributes].blank?
         params[:vendor][:translations_attributes].each do |_, data|

data/app/controllers/spree/api/v2/storefront/vendors_controller.rb

@@ -3,7 +3,7 @@ module Spree
     module V2
       module Storefront
         class VendorsController < ::Spree::Api::V2::ResourceController
-
+          
           private
 
           def model_class
@@ -21,6 +21,11 @@ module Spree
           def resource_serializer
             Spree::V2::Storefront::VendorSerializer
           end
+
+          def collection_serializer
+            Spree::V2::Storefront::VendorSerializer
+          end
+
         end
       end
     end

data/app/finders/spree_multi_vendor/products_finder_decorator.rb

@@ -1,6 +1,6 @@
 module SpreeMultiVendor
   module ProductsFinderDecorator
-    def initialize(scope:, params:, current_currency:)
+    def initialize(scope:, params:, current_currency: nil)
       super
 
       @vendors = params.dig(:filter, :vendor_ids)&.split(',')

data/app/models/spree/vendor_ability.rb

@@ -48,7 +48,7 @@ class Spree::VendorAbility
                   end
 
     if order_scope.present?
-      can %i[admin index edit update cart], Spree::Order, order_scope.merge(state: 'complete')
+      can %i[admin show index edit update cart], Spree::Order, order_scope.merge(state: 'complete')
     else
       cannot_display_model(Spree::Order)
     end

data/app/views/spree/admin/vendor_settings/edit.html.erb

@@ -4,7 +4,7 @@
 
 <%= form_for [:admin, @vendor], url: admin_vendor_settings_url do |f| %>
   <fieldset>
-    <%= render partial: 'spree/shared/error_messages', locals: { target: @vendor } %>
+    <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @vendor } %>
     <div class="form-group">
       <%= f.field_container :name do %>
         <%= f.label :name %>

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

@@ -1,4 +1,4 @@
-<%= render partial: 'spree/shared/error_messages', locals: { target: @vendor } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @vendor } %>
 <div class="form-group">
   <%= f.field_container :name do %>
     <%= f.label :name %>

data/config/locales/es.yml

@@ -7,9 +7,11 @@ es:
     attributes:
       spree/vendor:
         about_us: Acerca de
+        commission_rate: Porcentaje Comisión
         contact_us: Contáctanos
         image: Imagen
         name: Nombre
+        notification_email: Email notificación pedido
         state: estado
         created_at: creado en
         priority: prioridad
@@ -21,6 +23,7 @@ es:
     order_mailer:
       vendor_notification_email:
         dear_vendor: Estimado vendedor,
+        order_summary: Resumen del pedido
         subject: Notificación de vendedor
         thanks: Gracias
     vendor: Vendedor

data/config/routes.rb

@@ -12,7 +12,7 @@ Spree::Core::Engine.routes.draw do
   namespace :api, defaults: { format: 'json' } do
     namespace :v2 do
       namespace :storefront do
-        resources :vendors, only: [:show]
+        resources :vendors, only: [:show,:index]
       end
     end
     namespace :v1 do

data/db/migrate/20210728120649_change_vendorized_models_vendor_id_type.rb

@@ -0,0 +1,10 @@
+class ChangeVendorizedModelsVendorIdType < ActiveRecord::Migration[4.2]
+  def change
+    SpreeMultiVendor.vendorized_models.each do |klass|
+      change_column klass.table_name, :vendor_id, :bigint
+    rescue
+      message = "Could not change vendor_id column for spree_#{klass}"
+      Rails.logger.error message
+    end
+  end
+end

data/db/migrate/20210728120910_change_vendor_id_and_user_id_type_for_spree_vendor_users.rb

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

data/db/migrate/20210728121024_change_vendor_id_and_order_id_type_for_spree_order_commissions.rb

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

data/lib/spree_multi_vendor/version.rb

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

data/lib/spree_multi_vendor.rb

@@ -1,4 +1,5 @@
 require 'spree_core'
+require 'spree_backend'
 require 'spree_multi_vendor/engine'
 require 'spree_multi_vendor/version'
 require 'spree_extension'
@@ -8,7 +9,7 @@ module SpreeMultiVendor
   # TODO: this should be moved into preferences
   def self.vendorized_models
     SpreeMultiVendor::Config[:vendorized_models].map(&:classify).map do |class_name|
-      "Spree::#{class_name}".safe_constantize
+      "::Spree::#{class_name}".safe_constantize
     end.compact.uniq
   end
 end

data/spec/factories/spree/vendor_factory.rb

@@ -9,6 +9,12 @@ FactoryBot.define do
       state { :active }
     end
 
+    factory :active_vendor_list do
+      name { "#{FFaker::Company.name} #{FFaker::Company.suffix }" }
+      state { :active }
+    end
+
+
     factory :pending_vendor do
       name { 'Pending vendor' }
       state { :pending }

data/spec/features/spree/admin/orders_spec.rb

@@ -1,13 +1,14 @@
 require 'spec_helper'
 
 RSpec.feature 'Admin Orders', :js do
+  let(:store) { Spree::Store.default }
   let(:vendor) { create(:active_vendor, name: 'Vendor') }
   let(:vendor_2) { create(:active_vendor, name: 'Other vendor') }
-  let(:order) { create(:order, ship_address: create(:address), bill_address: create(:address)) }
-  let(:order_2) { create(:order) }
+  let(:order) { create(:order, ship_address: create(:address), bill_address: create(:address), store: store) }
+  let(:order_2) { create(:order, store: store) }
   let!(:user) { create(:user, vendors: [vendor]) }
-  let(:product) { create(:product_in_stock, vendor: vendor) }
-  let(:product_2) { create(:product_in_stock, vendor: vendor_2) }
+  let(:product) { create(:product_in_stock, vendor: vendor, stores:[store]) }
+  let(:product_2) { create(:product_in_stock, vendor: vendor_2,stores:[store]) }
 
   before do
     create(:line_item, order: order, product: product)

data/spec/features/spree/admin/vendor_settings_spec.rb

@@ -42,13 +42,11 @@ RSpec.feature 'Admin Vendor Settings', :js do
       expect(page).not_to have_text 'contact_us can\'t be blank'
     end
 
-    if Spree.version.to_f >= 3.6
-      scenario 'can update an existing vendor image' do
-        create(:vendor, name: 'New vendor')
-        page.attach_file("vendor_image", Spree::Core::Engine.root + 'spec/fixtures' + 'thinking-cat.jpg')
-        click_button 'Update'
-        expect(page).to have_css("img[src*='thinking-cat.jpg']")
-      end
+    scenario 'can update an existing vendor image' do
+      create(:vendor, name: 'New vendor')
+      page.attach_file("vendor_image", Spree::Core::Engine.root + 'spec/fixtures' + 'thinking-cat.jpg')
+      click_button 'Update'
+      expect(page).to have_css("img[src*='thinking-cat.jpg']")
     end
   end
 
@@ -70,7 +68,7 @@ RSpec.feature 'Admin Vendor Settings', :js do
 
     it 'renders forbidden page' do
       visit spree.admin_vendor_settings_path
-      expect(current_path).to eq spree.forbidden_path
+      expect(current_path).to eq spree.admin_forbidden_path
     end
   end
 end

data/spec/requests/spree/api/v2/storefront/products_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 
 describe 'API V2 Storefront Products Spec', type: :request do
-  let!(:products)              { create_list(:product, 5) }
+  let(:store)                  { Spree::Store.default }
+  let!(:products)              { create_list(:product, 5, stores: [store]) }
   let!(:vendor)                { create(:vendor) }
   let!(:vendor_2)              { create(:vendor) }
 

data/spec/requests/spree/api/v2/storefront/vendors_spec.rb

@@ -5,6 +5,8 @@ describe 'API V2 Storefront Vendor Spec', type: :request do
   let!(:vendor_image) { create(:vendor_image) }
   let!(:vendor) { create(:active_vendor, name: 'vendor', image: vendor_image) }
   let!(:product) { create(:product, vendor: vendor) }
+  let!(:vendors) { 
+    create_list(:active_vendor_list, 30)}
 
   describe 'vendors#show' do
     context 'with invalid slug param' do
@@ -49,4 +51,68 @@ describe 'API V2 Storefront Vendor Spec', type: :request do
       end
     end
   end
+
+
+  describe 'vendors#index' do
+    context 'returns vendors list' do
+
+      it 'must return a list of vendor paged' do
+        get "/api/v2/storefront/vendors"
+        expect(response).to have_http_status(:ok)
+        json_response = JSON.parse(response.body)
+        expect(json_response)
+        expect(json_response['data'].count).to eq (25)
+      end
+
+      it 'can request different pages' do
+        get "/api/v2/storefront/vendors?page=2"
+        expect(response).to have_http_status(:ok)
+        json_response = JSON.parse(response.body)
+        expect(json_response)
+        expect(json_response['data'].count).to eq (6)
+        
+      end
+
+      it 'can control paging size' do
+        get "/api/v2/storefront/vendors?page=2&per_page=10"
+        expect(response).to have_http_status(:ok)
+        json_response = JSON.parse(response.body)
+        expect(json_response)
+        expect(json_response['data'].count).to eq (10)
+      end
+
+
+      it 'returns data type vendor' do
+        get "/api/v2/storefront/vendors"
+        json_response = JSON.parse(response.body)
+        expect(json_response)
+        expect(json_response['data'][0]['type']).to eq('vendor')
+      end
+
+      it 'does not return included' do
+        get "/api/v2/storefront/vendors"
+        json_response = JSON.parse(response.body)
+        expect(json_response.keys).to contain_exactly('data', "links", "meta")
+      end
+    end
+
+    context 'with products and images included' do
+      before { get "/api/v2/storefront/vendors?include=products,image" }
+
+      it_behaves_like 'returns 200 HTTP status'
+
+      it 'returns product information' do
+        json_response = JSON.parse(response.body)
+        expect(json_response.keys).to contain_exactly('data', 'included', "links", "meta")
+        expect(json_response['included'].first['id']).to eq(product.id.to_s)
+      end
+
+      it 'returns image information' do
+        json_response = JSON.parse(response.body)
+        expect(json_response.keys).to contain_exactly('data', 'included',"links", "meta")
+
+        expect(json_response['included'].second['id']).to eq(vendor_image.id.to_s)
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -8,4 +8,6 @@ require 'spree_dev_tools/rspec/spec_helper'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].sort.each { |f| require f }
+Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].sort.each { |f| require f }
+
+ActiveJob::Base.queue_adapter = :inline

data/spree_multi_vendor.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.author    = 'Spark Solutions'
   s.email     = 'we@sparksolutions.co'
-  s.homepage  = 'https://sparksolutions.co'
+  s.homepage  = 'https://spreecommerce.org/use-cases/multi-vendor-marketplace-demo/'
   s.license = 'BSD-3-Clause'
 
   s.metadata = {
@@ -29,11 +29,12 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  spree_version = '>= 4.2.0.rc5', '< 5.0'
-  s.add_dependency 'spree_core', spree_version
-  s.add_dependency 'spree_api', spree_version
+  spree_version = '>= 4.3.0.rc1'
+  s.add_dependency 'spree', spree_version
   s.add_dependency 'spree_backend', spree_version
+  s.add_dependency 'spree_emails', spree_version
   s.add_dependency 'spree_extension'
+
   s.add_dependency 'deface', '~> 1.0'
 
   s.add_development_dependency 'shoulda-matchers'

metadata

@@ -1,75 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: spree_multi_vendor
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Spark Solutions
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: spree_core
+  name: spree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 4.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 4.3.0.rc1
 - !ruby/object:Gem::Dependency
-  name: spree_api
+  name: spree_backend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 4.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 4.3.0.rc1
 - !ruby/object:Gem::Dependency
-  name: spree_backend
+  name: spree_emails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 4.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 4.3.0.rc1
 - !ruby/object:Gem::Dependency
   name: spree_extension
   requirement: !ruby/object:Gem::Requirement
@@ -132,10 +114,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- Appraisals
 - Gemfile
 - LICENSE
 - README.md
@@ -220,8 +202,9 @@ files:
 - db/migrate/20190312130754_create_spree_order_commissions.rb
 - db/migrate/20190322133128_add_notification_email_to_vendors.rb
 - db/migrate/20200416030721_add_translations_to_vendor.rb
-- gemfiles/spree_4_2.gemfile
-- gemfiles/spree_master.gemfile
+- db/migrate/20210728120649_change_vendorized_models_vendor_id_type.rb
+- db/migrate/20210728120910_change_vendor_id_and_user_id_type_for_spree_vendor_users.rb
+- db/migrate/20210728121024_change_vendor_id_and_order_id_type_for_spree_order_commissions.rb
 - lib/generators/spree_multi_vendor/install/install_generator.rb
 - 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
@@ -262,14 +245,14 @@ files:
 - spec/spec_helper.rb
 - spec/support/shoulda_matchers.rb
 - spree_multi_vendor.gemspec
-homepage: https://sparksolutions.co
+homepage: https://spreecommerce.org/use-cases/multi-vendor-marketplace-demo/
 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.2.0
+  changelog_uri: https://github.com/spree-contrib/spree_multi_vendor/releases/tag/v2.3.0
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree-contrib/spree_multi_vendor/tree/v2.2.0
+  source_code_uri: https://github.com/spree-contrib/spree_multi_vendor/tree/v2.3.0
 post_install_message:
 rdoc_options: []
 require_paths:

data/Appraisals

@@ -1,11 +0,0 @@
-appraise 'spree-4-2' do
-  gem 'spree', '~> 4.2.0.rc4'
-  gem 'spree_auth_devise', '~> 4.3'
-  gem 'rails-controller-testing'
-end
-
-appraise 'spree-master' do
-  gem 'spree', github: 'spree/spree', branch: 'master'
-  gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: 'master'
-  gem 'rails-controller-testing'
-end

data/gemfiles/spree_4_2.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "spree", "~> 4.2.0.rc4"
-gem "spree_auth_devise", "~> 4.3"
-gem "rails-controller-testing"
-
-gemspec path: "../"

data/gemfiles/spree_master.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "spree", github: "spree/spree", branch: "master"
-gem "spree_auth_devise", github: "spree/spree_auth_devise", branch: "master"
-gem "rails-controller-testing"
-
-gemspec path: "../"