spree_multi_vendor 2.0.1 → 2.3.0

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/serializers/spree/v2/storefront/vendor_order_totals_serializer_spec.rb

@@ -31,8 +31,8 @@ describe Spree::V2::Storefront::VendorOrderTotalsSerializer do
           display_included_tax_total: Spree::Money.new(30),
           ship_total: BigDecimal(25),
           display_ship_total: Spree::Money.new(25),
-          subtotal: BigDecimal(600),
-          display_subtotal: Spree::Money.new(600),
+          subtotal: BigDecimal(680),
+          display_subtotal: Spree::Money.new(680),
           promo_total: BigDecimal(60),
           display_promo_total: Spree::Money.new(60),
           total: BigDecimal(625),

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.0.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Spark Solutions
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-10 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,29 +114,32 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- Appraisals
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - app/controllers/spree/admin/vendor_settings_controller.rb
 - app/controllers/spree/admin/vendors_controller.rb
+- app/controllers/spree/api/v1/vendors_controller.rb
 - app/controllers/spree/api/v2/storefront/vendors_controller.rb
 - app/controllers/spree_multi_vendor/spree/admin/base_controller_decorator.rb
-- app/controllers/spree_multi_vendor/spree/admin/option_types_controller_decorator.rb
 - app/controllers/spree_multi_vendor/spree/admin/products_controller_decorator.rb
-- app/controllers/spree_multi_vendor/spree/admin/properties_controller_decorator.rb
 - app/controllers/spree_multi_vendor/spree/admin/resource_controller_decorator.rb
 - app/controllers/spree_multi_vendor/spree/admin/shipping_methods_controller_decorator.rb
 - app/controllers/spree_multi_vendor/spree/admin/stock_locations_controller_decorator.rb
 - app/controllers/spree_multi_vendor/spree/admin/users_controller_decorator.rb
 - app/controllers/spree_multi_vendor/spree/admin/variants_controller_decorator.rb
-- app/controllers/spree_multi_vendor/spree/api/v1/variants_controller_decorator.rb
+- app/controllers/spree_multi_vendor/spree/api/base_controller_decorator.rb
+- app/controllers/spree_multi_vendor/spree/api/v1/products_controller_decorator.rb
+- app/controllers/spree_multi_vendor/spree/api/v1/users_controller_decorator.rb
 - app/finders/spree_multi_vendor/products_finder_decorator.rb
 - app/helpers/spree/admin/vendor_helper.rb
+- app/helpers/spree/api/vendor_helper.rb
+- app/helpers/spree_multi_vendor/spree/api/api_helpers_decorator.rb
 - app/mailers/spree/vendor_mailer.rb
 - app/models/concerns/spree/vendor_concern.rb
 - app/models/spree/order_commission.rb
@@ -193,6 +178,8 @@ files:
 - app/views/spree/admin/vendors/edit.html.erb
 - app/views/spree/admin/vendors/index.html.erb
 - app/views/spree/admin/vendors/new.html.erb
+- app/views/spree/api/v1/vendors/index.rabl
+- app/views/spree/api/v1/vendors/show.rabl
 - app/views/spree/vendor_mailer/vendor_notification_email.html.erb
 - app/views/spree/vendor_mailer/vendor_notification_email.text.erb
 - bin/rails
@@ -215,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
@@ -244,6 +232,9 @@ files:
 - spec/models/spree/vendor_order_totals_spec.rb
 - spec/models/spree/vendor_spec.rb
 - spec/models/spree/vendor_user_spec.rb
+- spec/requests/spree/api/v1/products_spec.rb
+- spec/requests/spree/api/v1/users_spec.rb
+- spec/requests/spree/api/v1/vendors_spec.rb
 - spec/requests/spree/api/v2/storefront/cart_spec.rb
 - spec/requests/spree/api/v2/storefront/products_spec.rb
 - spec/requests/spree/api/v2/storefront/vendors_spec.rb
@@ -254,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.0.1
+  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.0.1
+  source_code_uri: https://github.com/spree-contrib/spree_multi_vendor/tree/v2.3.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -302,6 +293,9 @@ test_files:
 - spec/models/spree/vendor_order_totals_spec.rb
 - spec/models/spree/vendor_spec.rb
 - spec/models/spree/vendor_user_spec.rb
+- spec/requests/spree/api/v1/products_spec.rb
+- spec/requests/spree/api/v1/users_spec.rb
+- spec/requests/spree/api/v1/vendors_spec.rb
 - spec/requests/spree/api/v2/storefront/cart_spec.rb
 - spec/requests/spree/api/v2/storefront/products_spec.rb
 - spec/requests/spree/api/v2/storefront/vendors_spec.rb

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/app/controllers/spree_multi_vendor/spree/admin/option_types_controller_decorator.rb

@@ -1,7 +0,0 @@
-module SpreeMultiVendor::Spree::Admin::OptionTypesControllerDecorator
-  def self.prepended(base)
-    base.before_action :set_vendor_id, only: [:create, :update]
-  end
-end
-
-Spree::Admin::OptionTypesController.prepend SpreeMultiVendor::Spree::Admin::OptionTypesControllerDecorator

data/app/controllers/spree_multi_vendor/spree/admin/properties_controller_decorator.rb

@@ -1,7 +0,0 @@
-module SpreeMultiVendor::Spree::Admin::PropertiesControllerDecorator
-  def self.prepended(base)
-    base.before_action :set_vendor_id, only: [:create, :update]
-  end
-end
-
-Spree::Admin::PropertiesController.prepend SpreeMultiVendor::Spree::Admin::PropertiesControllerDecorator

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

@@ -1,22 +0,0 @@
-module SpreeMultiVendor::Spree::Api::V1::VariantsControllerDecorator
-  private
-
-  def scope
-    variants = if @product
-                  @product.variants_including_master
-                else
-                  Spree::Variant
-                end
-
-    if current_ability.can?(:manage, Spree::Variant) && params[:show_deleted]
-      variants = variants.with_deleted
-    end
-
-    variants = variants.for_vendor_user(current_spree_user) unless @current_user_roles.include?('admin')
-    variants = variants.eligible if Spree.version.to_f >= 3.7
-
-    variants.accessible_by(current_ability, :read)
-  end
-end
-
-Spree::Api::V1::VariantsController.prepend SpreeMultiVendor::Spree::Api::V1::VariantsControllerDecorator

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: "../"