spree_multi_vendor 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c44adfbeea75e7b5d36a5282b3f73e82a50914e2afdcb3e5d5100f0f1fb7e2f
-  data.tar.gz: e0fc1a00cc1c075944a888257004841199da7a62f85065dc087b0546a9eadf16
+  metadata.gz: b4a9ea707b2e1f2dd0c5ac2b71c82c1334ca991cb0e80cd26f35cc6e95234d06
+  data.tar.gz: 777150a6db369707f55927a5e5066e93de22070b190539a07de79b616e028182
 SHA512:
-  metadata.gz: 6862e52f1a430fcbe23b6fef685c2c12d30245ce0199d993caae87c7a71dd9278ed73c29d611d325266c9dab107922a5921783f57bf8789c752f81b1f58c78e9
-  data.tar.gz: 310a440feb55b56bc73ec09656f6167a7cbdc2fce296e5793379611ebc066749dc7853721140dc0963498f6dc7eb3116e259f5ca64eeb4c33320158870f3cc02
+  metadata.gz: 7b084940266d45faf272d01d3ef2e4c638476b51d736f2232879427218d0c04345c1d0494f3c1eaabbd37c8e50c68712f1e87ee1fc837c12a318451f2554fc56
+  data.tar.gz: 3a52b9945c79a47af00d3e99965176cf89cce11adce7c5cd89573ec685b41cc0d08242d4f302d5c3f07ec1c4a50c7463e53cb9e3eb5a25eb7d62c8c36cb04af4

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

@@ -0,0 +1,17 @@
+module SpreeMultiVendor::Spree::Api::BaseControllerDecorator
+  Spree::Api::BaseController.include(Spree::Api::VendorHelper)
+
+  def self.prepended(base)
+    base.helper_method :current_spree_vendor
+  end
+
+  private
+
+  def set_vendor_id(resource_name)
+    return unless current_spree_vendor
+
+    params[resource_name][:vendor_id] = current_spree_vendor.id
+  end
+end
+
+::Spree::Api::BaseController.prepend SpreeMultiVendor::Spree::Api::BaseControllerDecorator

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

@@ -0,0 +1,9 @@
+module SpreeMultiVendor::Spree::Api::V1::ProductsControllerDecorator
+  def self.prepended(base)
+    base.before_action only: [:create, :update] do
+      set_vendor_id(:product)
+    end
+  end
+end
+
+Spree::Api::V1::ProductsController.prepend SpreeMultiVendor::Spree::Api::V1::ProductsControllerDecorator

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

@@ -0,0 +1,13 @@
+module SpreeMultiVendor::Spree::Api::V1::UsersControllerDecorator
+  private
+
+  def user_params
+    params.require(:user).permit(permitted_user_attributes |
+                                 [spree_role_ids: [],
+                                  vendor_ids: [],
+                                  ship_address_attributes: permitted_address_attributes,
+                                  bill_address_attributes: permitted_address_attributes])
+  end
+end
+
+Spree::Api::V1::UsersController.prepend SpreeMultiVendor::Spree::Api::V1::UsersControllerDecorator

data/app/helpers/spree/api/vendor_helper.rb

@@ -0,0 +1,11 @@
+module Spree
+  module Api
+    module VendorHelper
+      def current_spree_vendor
+        if current_api_user.vendors.any? && (!current_api_user.respond_to?(:has_spree_role?) || !current_api_user.has_spree_role?(:admin))
+          current_api_user.vendors.first
+        end
+      end
+    end
+  end
+end

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

@@ -6,6 +6,8 @@ module SpreeMultiVendor
           base::ATTRIBUTES.push(:vendor_attributes)
 
           base.mattr_reader *base::ATTRIBUTES
+
+          base.user_attributes << :vendor_ids
         end
 
         @@vendor_attributes = [:id, :name, :slug, :state, :about_us, :contact_us]

data/app/models/spree/vendor_user.rb

@@ -1,7 +1,7 @@
 module Spree
   class VendorUser < Spree::Base
     belongs_to :vendor, class_name: 'Spree::Vendor', required: Spree.version.to_f >= 3.5
-    belongs_to :user, class_name: Spree.user_class.name, required: Spree.version.to_f >= 3.5
+    belongs_to :user, class_name: Spree.user_class.name, required: Spree.version.to_f >= 3.5, touch: true
 
     validates :vendor_id, uniqueness: { scope: :user_id }
 

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

@@ -22,7 +22,9 @@ module SpreeMultiVendor::Spree::OrderDecorator
   end
 
   def vendor_subtotal(vendor)
-    vendor_line_items(vendor).sum(&:total)
+    vendor_pre_tax_item_amount(vendor) +
+      vendor_pre_tax_ship_amount(vendor) +
+      vendor_additional_tax_total(vendor)
   end
 
   def vendor_promo_total(vendor)
@@ -102,4 +104,4 @@ module SpreeMultiVendor::Spree::OrderDecorator
   end
 end
 
-Spree::Order.prepend SpreeMultiVendor::Spree::OrderDecorator
+Spree::Order.prepend SpreeMultiVendor::Spree::OrderDecorator unless Spree::Order.included_modules.include?(SpreeMultiVendor::Spree::OrderDecorator)

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

@@ -2,7 +2,7 @@ Deface::Override.new(
   virtual_path: 'spree/admin/shared/_main_menu',
   name: 'Display configuration tab for vendors',
   replace: 'erb[silent]:contains("current_store")',
-  text: '<% if can?(:admin, current_store) || current_spree_user.vendors.any? %>'
+  text: '<% if can?(:admin, current_store) || current_spree_user&.vendors&.any? %>'
 )
 Deface::Override.new(
   virtual_path:  'spree/admin/shared/_main_menu',

data/app/serializers/spree/v2/storefront/vendor_order_totals_serializer.rb

@@ -4,6 +4,8 @@ module Spree
       class VendorOrderTotalsSerializer < BaseSerializer
         set_type :vendor_totals
 
+        cache_options store: nil
+
         attributes :name, :subtotal, :ship_total, :total, :display_subtotal,
                    :display_ship_total, :display_total, :promo_total,
                    :display_promo_total, :included_tax_total,

data/config/initializers/spree_permitted_attributes.rb

@@ -6,5 +6,7 @@ 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/lib/spree_multi_vendor/version.rb

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

data/spec/models/spree/order_spec.rb

@@ -34,6 +34,20 @@ describe Spree::Order do
         expect(v.commissions.sum(:amount)).to eq(commission_ammount)
       end
     end
+
+    it 'sends mails only once per vendor' do
+      mail_double_1 = double(:mail_double_1)
+      mail_double_2 = double(:mail_double_1)
+
+      expect(Spree::VendorMailer).to receive(:vendor_notification_email)
+        .with(be_an(Integer), vendor.id) { mail_double_1 }
+      expect(mail_double_1).to receive(:deliver_later)
+      expect(Spree::VendorMailer).to receive(:vendor_notification_email)
+        .with(be_an(Integer), vendor_2.id) { mail_double_2 }
+      expect(mail_double_2).to receive(:deliver_later)
+
+      order.next!
+    end
   end
 
   context 'vendor methods' do
@@ -57,11 +71,11 @@ describe Spree::Order do
     end
 
     describe '#vendor_subtotal' do
-      it { expect(order.vendor_subtotal(vendor)).to eq(270) }
+      it { expect(order.vendor_subtotal(vendor)).to eq(320) }
     end
 
     describe '#display_subtotal' do
-      it { expect(order.display_vendor_subtotal(vendor).to_s).to eq('$270.00') }
+      it { expect(order.display_vendor_subtotal(vendor).to_s).to eq('$320.00') }
     end
 
     describe '#vendor_pre_tax_item_amount' do

data/spec/requests/spree/api/v1/products_spec.rb

@@ -0,0 +1,221 @@
+require 'spec_helper'
+
+module Spree
+  describe 'API V1 Products Spec', type: :request do
+    let(:vendor) { create(:vendor, state: :active) }
+    let(:other_vendor) { create(:vendor) }
+    let(:shipping_category) { create(:shipping_category) }
+    let(:selected_product) { product_without_vendor }
+    let(:params) { {} }
+
+    let!(:product_without_vendor) { create(:product) }
+    let!(:product_with_vendor_vendor) { create(:product, vendor: vendor) }
+    let!(:product_with_other_vendor) { create(:product, vendor: other_vendor) }
+
+    before { stub_authentication! }
+
+    describe 'products#index' do
+      before { get '/api/v1/products', params: params }
+
+      context 'as a regular user' do
+        it 'gets a list of all products' do
+          expect(response.status).to eq(200)
+          expect(json_response[:products].size).to eq(3)
+        end
+      end
+
+      context 'as an admin' do
+        sign_in_as_admin!
+
+        it 'gets a list of all products' do
+          expect(response.status).to eq(200)
+          expect(json_response[:products].size).to eq(3)
+        end
+      end
+
+      context 'as a vendor' do
+        let!(:current_api_user) do
+          user = create(:user, vendors: [vendor])
+          user
+        end
+
+        it 'gets a list of products assigned to that vendor' do
+          expect(response.status).to eq(200)
+          expect(json_response[:products].size).to eq(1)
+          expect(json_response[:products][0][:id]).to eq(vendor.products.first.id)
+        end
+      end
+    end
+
+    describe 'products#show' do
+      before { get "/api/v1/products/#{selected_product.id}" }
+
+      it 'gets a product' do
+        expect(response.status).to eq(200)
+      end
+
+      context 'as a vendor' do
+        let!(:current_api_user) do
+          user = create(:user, vendors: [vendor])
+          user
+        end
+
+        describe 'cannot view product of another vendor' do
+          let(:selected_product) { product_with_other_vendor }
+
+          it do
+            expect(response.status).to eq(404)
+          end
+        end
+
+        describe 'can view product assigned to that vendor' do
+          let(:selected_product) { product_with_vendor_vendor }
+
+          it do
+            expect(response.status).to eq(200)
+          end
+        end
+      end
+    end
+
+    describe 'products#create' do
+      let(:params) do
+        {
+          product: {
+            name: 'Product',
+            shipping_category_id: shipping_category.id,
+            price: 12.34
+          }
+        }
+      end
+
+      before { post '/api/v1/products', params: params }
+
+      context 'as regular user' do
+        it 'cannot create a new product' do
+          expect(response.status).to eq(401)
+        end
+      end
+
+      context 'as an admin' do
+        sign_in_as_admin!
+
+        it 'can create a new product' do
+          expect(response.status).to eq(201)
+          expect(json_response['name']).to eq(params[:product][:name])
+          expect(json_response['price']).to eq(params[:product][:price].to_s)
+          expect(json_response['shipping_category_id']).to eq(params[:product][:shipping_category_id])
+        end
+      end
+
+      context 'as a vendor' do
+        let!(:current_api_user) do
+          user = create(:user, vendors: [vendor])
+          user
+        end
+
+        it 'can create a new product assigned to vendor' do
+          expect(response.status).to eq(201)
+          product = Spree::Product.find(json_response[:id])
+          expect(product.vendor).to eq(vendor)
+        end
+      end
+    end
+
+    describe 'products#update' do
+      let(:params) do
+        {
+          product: {
+            name: 'Updated Prodouct',
+            shipping_category_id: shipping_category.id,
+            price: 12.34
+          }
+        }
+      end
+
+      before { put "/api/v1/products/#{selected_product.id}", params: params }
+
+      context 'as regular user' do
+        it 'cannot update product' do
+          expect(response.status).to eq(401)
+        end
+      end
+
+      context 'as an admin' do
+        sign_in_as_admin!
+
+        it 'can update product' do
+          expect(response.status).to eq(200)
+          expect(json_response['name']).to eq(params[:product][:name])
+          expect(json_response['price']).to eq(params[:product][:price].to_s)
+          expect(json_response['shipping_category_id']).to eq(params[:product][:shipping_category_id])
+        end
+      end
+
+      context 'as a vendor' do
+        let!(:current_api_user) do
+          user = create(:user, vendors: [vendor])
+          user
+        end
+
+        describe 'cannot update product of another vendor' do
+          let(:selected_product) { product_with_other_vendor }
+
+          it do
+            expect(response.status).to eq(404)
+          end
+        end
+
+        describe 'can update product assigned to that vendor' do
+          let(:selected_product) { product_with_vendor_vendor }
+
+          it do
+            expect(response.status).to eq(200)
+          end
+        end
+      end
+    end
+
+    describe 'products#destroy' do
+      before { delete "/api/v1/products/#{selected_product.id}" }
+
+      context 'as regular user' do
+        it 'cannot delete product' do
+          expect(response.status).to eq(401)
+        end
+      end
+
+      context 'as an admin' do
+        sign_in_as_admin!
+
+        it 'can delete product' do
+          expect(response.status).to eq(204)
+          expect(product_without_vendor.reload.deleted_at).to_not eq(nil)
+        end
+      end
+
+      context 'as a vendor' do
+        let!(:current_api_user) do
+          user = create(:user, vendors: [vendor])
+          user
+        end
+
+        describe 'cannot delete product of another vendor' do
+          let(:selected_product) { product_with_other_vendor }
+
+          it do
+            expect(response.status).to eq(404)
+          end
+        end
+
+        describe 'can delete product assigned to that vendor' do
+          let(:selected_product) { product_with_vendor_vendor }
+
+          it do
+            expect(response.status).to eq(204)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/requests/spree/api/v1/users_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+module Spree
+  describe 'API V1 Users Spec', type: :request do
+    let(:user) { create(:user) }
+    let(:vendor) { create(:vendor, state: :active) }
+
+    before { stub_authentication! }
+
+    describe 'users#update' do
+      let(:params) do
+        {
+          user: {
+            vendor_ids: [vendor.id]
+          }
+        }
+      end
+
+      before { put "/api/v1/users/#{user.id}", params: params }
+
+      context 'as an admin' do
+        sign_in_as_admin!
+
+        it 'can update user' do
+          expect(response.status).to eq(200)
+          expect(json_response['vendor_ids']).to eq([vendor.id])
+        end
+      end
+    end
+  end
+end

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

@@ -26,7 +26,7 @@ describe 'API V2 Storefront Cart Spec', type: :request do
       it_behaves_like 'returns valid cart JSON'
     end
 
-    context 'includes vendor and totals data' do
+    context 'with one vendor' do
       let(:params) { { include: 'vendors,vendor_totals' } }
 
       it_behaves_like 'showing the cart'
@@ -42,6 +42,24 @@ describe 'API V2 Storefront Cart Spec', type: :request do
       end
     end
 
+    context 'with many vendors' do
+      let!(:line_item_2) { create(:line_item, order: order, product: product_2, variant: product_2.default_variant) }
+      let(:params) { { include: 'vendors,vendor_totals' } }
+
+      it_behaves_like 'showing the cart'
+
+      it 'includes many vendors and vendor totals' do
+        get '/api/v2/storefront/cart', headers: headers_bearer, params: params
+
+        [vendor, vendor_2].each do |vendor|
+          expect(json_response['included']).to include(have_type('vendor').and have_id(vendor.id.to_s))
+          expect(json_response['included']).to include(have_type('vendor_totals').and have_id(vendor.id.to_s))
+          expect(json_response['included']).to include(have_type('vendor').and have_attribute(:name).with_value(vendor.name))
+          expect(json_response['included']).to include(have_type('vendor_totals').and have_attribute(:name).with_value(vendor.name))
+        end
+      end
+    end
+
     context 'includes line item vendor data' do
       it_behaves_like 'showing the cart'
 

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),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_multi_vendor
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Spark Solutions
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -151,8 +151,12 @@ files:
 - 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/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
@@ -245,6 +249,8 @@ 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
@@ -261,9 +267,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.1.0
+  changelog_uri: https://github.com/spree-contrib/spree_multi_vendor/releases/tag/v2.2.0
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree-contrib/spree_multi_vendor/tree/v2.1.0
+  source_code_uri: https://github.com/spree-contrib/spree_multi_vendor/tree/v2.2.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -280,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Spree Commerce multi vendor marketplace extension
@@ -304,6 +310,8 @@ 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