spree_multi_vendor 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2249038a9dae7dde5d3c7b0eb3833921f4bdd0144ab76fa5c7277e53ee4aadce
-  data.tar.gz: 555815de55c3298001c60c753b69974e1d524db73257a130a661279b4ec3e594
+  metadata.gz: f74e64bbf275693c1232604c1e33a99fd6d0ea32ee1ef5ce1f13d6cf9e3e3b47
+  data.tar.gz: 99b385ac825a76281dd754d0b5b0911805614c18a6189713c47373a2d0b9acdd
 SHA512:
-  metadata.gz: 6db7385cd15712b90faf63172eb6f2a05bebd0941f12ddd0faa55c53ce44ddca10c1527fb46ecbcd1524d9662e44359bdafb8eb26044012445d9b157552090ba
-  data.tar.gz: 48a0f9438bf8f7df0fc303760be106f23632b40e903f9cea0afc786ab523c181f52677817b0c633b800457a409569a331b9fc8aebfc997f71e53a955d990ff15
+  metadata.gz: 228371ed8973f3012e6160d7d580f17311c18c9062b82e2c090b6392a608091a5dd5217d48cfb310c2201d8bc2130a5d0c60b11f114b2238da3f8af55390910d
+  data.tar.gz: 0c6dde13714bab1a18c0ad130ed5b5c42ae773c9b53f8a9d3b1058df74b2682e0ccd552df9d3caf0d8eff9307c2d1e0e83055bf190e93a1de23db75c609f0546

data/app/models/spree/vendor_ability.rb

@@ -36,8 +36,21 @@ class Spree::VendorAbility
 
   def apply_order_permissions
     cannot :create, Spree::Order
-    can [:admin, :index, :edit, :update, :cart], Spree::Order do |order|
-      (order.vendor_ids & @vendor_ids).any?
+
+    order_scope = if ::Spree::Order.reflect_on_association(:vendor)
+                    { vendor_id: @vendor_ids }
+                  elsif ::Spree::LineItem.reflect_on_association(:vendor)
+                    { line_items: { vendor_id: @vendor_ids } }
+                  elsif ::Spree::Product.reflect_on_association(:vendor)
+                    { line_items: { product: { vendor_id: @vendor_ids } } }
+                  elsif ::Spree::Variant.reflect_on_association(:vendor)
+                    { line_items: { variant: { vendor_id: @vendor_ids } } }
+                  end
+
+    if order_scope.present?
+      can %i[admin index edit update cart], Spree::Order, order_scope.merge(state: 'complete')
+    else
+      cannot_display_model(Spree::Order)
     end
   end
 
@@ -51,9 +64,8 @@ class Spree::VendorAbility
   end
 
   def apply_option_type_permissions
-    cannot_display_model(Spree::OptionType)
-    can :manage, Spree::OptionType, vendor_id: @vendor_ids
-    can :create, Spree::OptionType
+    can :display, Spree::OptionType
+    can :display, Spree::OptionValue
   end
 
   def apply_price_permissions
@@ -61,8 +73,6 @@ class Spree::VendorAbility
   end
 
   def apply_product_option_type_permissions
-    can :display, Spree::OptionType
-    can :display, Spree::OptionValue
     can :manage,  Spree::ProductOptionType, product: { vendor_id: @vendor_ids }
     can :create,  Spree::ProductOptionType
     can :manage,  Spree::OptionValueVariant, variant: { vendor_id: @vendor_ids }
@@ -71,6 +81,9 @@ class Spree::VendorAbility
 
   def apply_product_permissions
     cannot_display_model(Spree::Product)
+
+    return unless Spree::Product.reflect_on_association(:vendor)
+
     can :manage, Spree::Product, vendor_id: @vendor_ids
     can :create, Spree::Product
   end
@@ -78,7 +91,7 @@ class Spree::VendorAbility
   def apply_properties_permissions
     can :display, Spree::Property
   end
-  
+
   def apply_product_properties_permissions
     can :manage,  Spree::ProductProperty, product: { vendor_id: @vendor_ids }
     can :create,  Spree::ProductProperty
@@ -116,6 +129,7 @@ class Spree::VendorAbility
   end
 
   def apply_variant_permissions
+    cannot_display_model(Spree::Variant)
     can :manage, Spree::Variant, vendor_id: @vendor_ids
     can :create, Spree::Variant
   end

data/lib/spree_multi_vendor/version.rb

@@ -1,5 +1,5 @@
 module SpreeMultiVendor
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 
   module_function
 

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

@@ -3,23 +3,72 @@ require 'spec_helper'
 RSpec.feature 'Admin Orders', :js do
   let(:vendor) { create(:active_vendor, name: 'Vendor') }
   let(:vendor_2) { create(:active_vendor, name: 'Other vendor') }
-  let(:order) do
-    create(:order,
-           line_items: [
-             create(:line_item, product: product),
-             create(:line_item, product: product_2)
-           ])
-  end
+  let(:order) { create(:order, ship_address: create(:address), bill_address: create(:address)) }
+  let(:order_2) { create(:order) }
   let!(:user) { create(:user, vendors: [vendor]) }
   let(:product) { create(:product_in_stock, vendor: vendor) }
   let(:product_2) { create(:product_in_stock, vendor: vendor_2) }
 
+  before do
+    create(:line_item, order: order, product: product)
+    create(:line_item, order: order, product: product_2)
+    order.create_proposed_shipments
+    order.update(state: :complete, completed_at: Time.current)
+    login_as(user, scope: :spree_user)
+  end
+
+  shared_examples 'shows order data' do
+    it { expect(page).to have_text(order.number) }
+    it { expect(page).to have_content(order.display_vendor_total(vendor).to_html) }
+  end
+
+  context 'index' do
+    background do
+      visit spree.admin_orders_path
+    end
+
+    it_behaves_like 'shows order data'
+
+    it 'does not show non-vendor orders' do
+      expect(page).not_to have_text(order_2.number)
+    end
+  end
+
+  context 'cart' do
+    background do
+      visit spree.cart_admin_order_path(id: order.number)
+    end
+
+    it_behaves_like 'shows order data'
+  end
+
+  context 'customer info' do
+    background do
+      visit spree.admin_order_customer_path(order_id: order.number)
+    end
+
+    it_behaves_like 'shows order data'
+
+    it 'shows customer information' do
+      expect(page).to have_text(order.ship_address.full_name)
+      expect(page).to have_text(order.ship_address.address1)
+      expect(page).to have_text(order.ship_address.city)
+
+      expect(page).to have_text(order.bill_address.full_name)
+      expect(page).to have_text(order.bill_address.address1)
+      expect(page).to have_text(order.bill_address.city)
+
+      expect(page).not_to have_selector('input[type=text]')
+    end
+  end
+
   context 'edit' do
     background do
-      login_as(user, scope: :spree_user)
       visit spree.edit_admin_order_path(id: order.number)
     end
 
+    it_behaves_like 'shows order data'
+
     scenario 'vendor can add his product' do
       select2_open label: 'Name or SKU'
       select2_search product.name, from: 'Name or SKU'
@@ -29,8 +78,8 @@ RSpec.feature 'Admin Orders', :js do
 
     scenario 'vendor cannot add other vendors product' do
       select2_open label: 'Name or SKU'
-      select2_search product.name, from: 'Name or SKU'
-      expect(page).not_to have_text(product.name)
+      select2_search product_2.name, from: 'Name or SKU'
+      expect(page).not_to have_text(product_2.name)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_multi_vendor
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Spark Solutions
@@ -144,15 +144,12 @@ files:
 - app/controllers/spree/admin/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/finders/spree_multi_vendor/products_finder_decorator.rb
 - app/helpers/spree/admin/vendor_helper.rb
 - app/mailers/spree/vendor_mailer.rb
@@ -259,9 +256,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.0.1
+  changelog_uri: https://github.com/spree-contrib/spree_multi_vendor/releases/tag/v2.0.2
   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.0.2
 post_install_message:
 rdoc_options: []
 require_paths:

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