spree_marketplace 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55a3f2de019a78f33daeee1a1b12972b687a69be
-  data.tar.gz: 8ace935b041cdaddbac915f24e1f735d2ef8e78c
+  metadata.gz: cf046fb139b2a599dab54c1650fb392e4691a24f
+  data.tar.gz: 25642a8389b0797353ee76a647f28e54e896255d
 SHA512:
-  metadata.gz: 506f87f91fda55fd15dd70693447400403ebdc4a6bded334a54fbb24470ef6a44a6475e1e41454fd624f7b00dec90f97c4c2f1e0d1210151a0bee5f4c38da82f
-  data.tar.gz: 8ebec64b83071775c28771b856da7860806f0ee828c43255215ba7f356c25e404e0af2588679e7dcc94d97c03d6e7f2553c020f870a8f918326eecac3a25f986
+  metadata.gz: 72a5f656116577d33657330ea322f74b1744f71a886901eacc38c72d41702b723a65a21ccc2a39909bcc72d46411c8792f923441ce7ec0bebcdbf6919a0bf1b1
+  data.tar.gz: 90cea58e2cb37d17bfcf1bce1117287aec4e34fc7ffd583f243a1622ddffa36091bc0d6ad8b0784667430bcc187bdc48919e624f94c26447f8bb501db5d66ca3

data/README.md

@@ -30,7 +30,7 @@ Installation
 Add spree_marketplace to your Gemfile:
 
 ```ruby
-gem 'spree_marketplace', github: 'jdutil/spree_marketplace'
+gem 'spree_marketplace', github: '0bserver07/spree_marketplace'
 ```
 
 Bundle your dependencies and run the installation generator:
@@ -84,4 +84,4 @@ TODO
 - Refactor to not rely on stripe & be interchangeable.
 - suppliers should be able to manage option types and values (unsure about whether to scope to supplier or not, but thats probably best solution for everyone)
 
-Copyright (c) 2013-2014+ [Jeff Dutil](https://github.com/jdutil), released under the New BSD License
+

data/app/controllers/spree/suppliers_controller.rb

@@ -39,7 +39,7 @@ class Spree::SuppliersController < Spree::StoreController
 
     if @supplier.save
       flash[:success] = Spree.t('supplier_registration.create.success')
-      redirect_to spree.admin_products_path
+      redirect_to '/'
     else
       render :new
     end
@@ -61,7 +61,11 @@ class Spree::SuppliersController < Spree::StoreController
   end
 
   def supplier_params
-    params.require(:supplier).permit(:first_name, :name, :last_name, :tax_id, :profile_picture)
+    params.require(:supplier).permit(:first_name, :name, :last_name, :tax_id, :profile_picture,:approved,:agree_tos,:agree_not_dropshiped,:agree_tos_violate)
   end
 
 end
+
+
+
+

data/app/models/spree/supplier_ability.rb

@@ -2,10 +2,77 @@ module Spree
   class SupplierAbility
     include CanCan::Ability
 
+    require "byebug"
     def initialize(user)
       user ||= Spree.user_class.new
 
-      if user.supplier
+      if user.supplier and user.supplier.approved == true
+
+       # conditions = {supplier_id: user.supplier_id}
+
+        # can :products, :review_admissions
+
+       # can :read, :all
+        # can [:admin, :manage,:index], Spree::Review do |product|
+        #   product.supplier_ids.include?(user.supplier_id)
+        # end
+
+        # can [:admin, :manage, :index], Spree::Review do |product|
+        #   product.supplier_ids.include?(user.supplier_id)
+        # end
+        # can [:admin,:manage], Spree::Review
+
+        can [:admin,:manage,:index], Spree::Supplier, id: user.supplier_id
+
+
+
+        # can [:create], Spree::AdmissionReview
+        # can [:admin, :manage], Spree::AdmissionReview, supplier: { supplier_id: user.supplier_id }
+
+
+
+
+        can [:admin, :manage, :stock,:admission], Spree::Product do |product|
+          product.supplier_ids.include?(user.supplier_id)
+        end
+        can [:admin, :create, :index,:admission], Spree::Product
+
+        can [:create], Spree::Prototype
+        can [:admin, :manage], Spree::Prototype, id: user.supplier.prototypes.pluck(:id)
+
+        # Action for listing?
+        can [:create], Spree::Property
+        can [:admin, :index], Spree::Property, id: user.supplier.properties.pluck(:id)
+
+        can [:create], Spree::OptionType
+        can [:admin, :manage], Spree::OptionType, id: user.supplier.option_types.pluck(:id)
+
+
+
+        can [:admin, :index, :read], Spree::ShippingCategory
+
+        can [:admin, :manage, :read, :ready, :ship], Spree::Shipment, order: { state: 'complete' }, stock_location: { supplier_id: user.supplier_id }
+
+
+        can [:admin, :create, :update], :stock_items
+        can [:admin, :manage], Spree::StockItem, stock_location_id: user.supplier.stock_locations.pluck(:id)
+        can [:admin, :manage], Spree::StockLocation, supplier_id: user.supplier_id
+        can :create, Spree::StockLocation
+        can [:admin, :manage], Spree::StockMovement, stock_item: { stock_location_id: user.supplier.stock_locations.pluck(:id) }
+        can :create, Spree::StockMovement
+
+
+        can [:admin, :update], Spree::Supplier, id: user.supplier_id
+
+        # TODO: Want this to be inline like:
+        # can [:admin, :manage], Spree::Variant, supplier_ids: user.supplier_id
+        can [:admin, :create, :index], Spree::Variant
+
+        can [:admin, :manage], Spree::Variant do |variant|
+          variant.supplier_ids.include?(user.supplier_id)
+        end
+
+
         if SpreeMarketplace::Engine.spree_digital_available?
           # can [:admin, :manage], Spree::Digital, variant: { supplier_ids: user.supplier_id }
           can [:admin, :manage], Spree::Digital do |digital|
@@ -29,32 +96,7 @@ module Spree
             relation.relatable.supplier_ids.include?(user.supplier_id)
           end
         end
-        # TODO: Want this to be inline like:
-        # can [:admin, :manage, :stock], Spree::Product, suppliers: { id: user.supplier_id }
-        can [:admin, :manage, :stock], Spree::Product do |product|
-          product.supplier_ids.include?(user.supplier_id)
-        end
-        can [:admin, :create, :index], Spree::Product
-        # can [:admin, :manage], Spree::ProductProperty, product: { supplier_ids: user.supplier_id }
-        can [:admin, :manage, :stock], Spree::ProductProperty do |property|
-          property.product.supplier_ids.include?(user.supplier_id)
-        end
-        can [:admin, :index, :read], Spree::Property
-        can [:admin, :read], Spree::Prototype
-        can [:admin, :manage, :read, :ready, :ship], Spree::Shipment, order: { state: 'complete' }, stock_location: { supplier_id: user.supplier_id }
-        can [:admin, :create, :update], :stock_items
-        can [:admin, :manage], Spree::StockItem, stock_location_id: user.supplier.stock_locations.pluck(:id)
-        can [:admin, :manage], Spree::StockLocation, supplier_id: user.supplier_id
-        can :create, Spree::StockLocation
-        can [:admin, :manage], Spree::StockMovement, stock_item: { stock_location_id: user.supplier.stock_locations.pluck(:id) }
-        can :create, Spree::StockMovement
-        can [:admin, :update], Spree::Supplier, id: user.supplier_id
-        # TODO: Want this to be inline like:
-        # can [:admin, :manage], Spree::Variant, supplier_ids: user.supplier_id
-        can [:admin, :create, :index], Spree::Variant
-				can [:admin, :manage], Spree::Variant do |variant|
-          variant.supplier_ids.include?(user.supplier_id)
-        end
+
       end
 
       if SpreeMarketplace::Config[:allow_signup]
@@ -70,7 +112,9 @@ module Spree
         can :create, Ckeditor::Picture
         can [:read, :index, :destroy], Ckeditor::Picture, supplier_id: user.supplier_id
       end
-    end
 
+
+
+    end
   end
 end

data/app/models/spree/supplier_decorator.rb

@@ -1,10 +1,33 @@
 Spree::Supplier.class_eval do
 
 	attr_accessor :first_name, :last_name, :merchant_type
-  
+
+  #==========================================
+  # Associations
+
 	has_many :bank_accounts, class_name: 'Spree::SupplierBankAccount'
 	has_attached_file :profile_picture, dependent: :destroy, :styles => {:medium => "300x300>", :thumb => "100x100>"}, :path => ":rails_root/public/assets/profile_pictures/:style/:filename", :url => "/assets/profile_pictures/:style/:filename"
- validates_attachment :profile_picture, :content_type => { :content_type => /\Aimage\/.*\Z/ }, :size => { :in => 0..500.kilobytes }
+
+  has_many   :supplier_prototypes
+  has_many   :prototypes, through: :supplier_prototypes
+
+  has_many   :supplier_properties
+  has_many   :properties, through: :supplier_properties
+
+
+  has_many   :supplier_option_types
+  has_many   :option_types, through: :supplier_option_types
+
+
+  # has_many   :spree_supplier_prod_opt_types
+  # has_many   :prototypes, through: :spree_supplier_prod_opt_types
+
+
+
+
+  #==========================================
+
+  validates_attachment :profile_picture, :content_type => { :content_type => /\Aimage\/.*\Z/ }, :size => { :in => 0..500.kilobytes }
 
   validates :tax_id, length: { is: 9, allow_blank: true }
 

data/app/views/spree/suppliers/new.html.erb

@@ -16,7 +16,7 @@
 				<div data-hook="signup_inside_form">
 				<%= render :partial => 'spree/shared/supplier_form', :locals => { :form => form } %>
 				<p>
-				<%= form.submit Spree.t(:signup), :class => 'btn btn-lg btn-success btn-block' %> 
+				<%= form.submit Spree.t(:signup), :class => 'btn btn-lg btn-success btn-block' %>
 				</p>
 			</div>
 		<% end %>

data/spree_marketplace.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name = "spree_marketplace"
-  s.version = "3.1.0"
+  s.version = "3.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_marketplace
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Y F
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stripe