spree_marketplace 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d8ead89bba07fde4c531631451c271d771cd7d0
-  data.tar.gz: 576eee5d003cb211f30d8fca8d422d700442db21
+  metadata.gz: 2085b92572e8bc26a1a466e5d38e5b9113531f7c
+  data.tar.gz: d4f98c65e0aaf62e4acb368783abb475f7ed382a
 SHA512:
-  metadata.gz: e99528a466658855b13b051cb074c5c7d141090f9d7dc4952666d6963ce199e7d20bb83f8ed11800bce1b4e7f0a0d7fb6d0af14f783508f21448a6e2e5672e62
-  data.tar.gz: 35a651079d1e95714cdb7042fa533dd23b87378ee84afac142daed1cb914c9271f733271aac78bc8aa24a84d2e49dc6f367aaa0a8c9b8171088f5670a4d5ae05
+  metadata.gz: 9152e6d83269bf05c75a698605fa9929aab39216174321b3061762ebe0d6c5ca304e1de7e11a901810162348acff5ae8d6905a46538f036582cb25f2f7e44f19
+  data.tar.gz: 50d6ac5ecc08943be3bf7949ecee071cffc5ae2116497e683f2540eba8ce6a2a91006b0cb4a0458d853640704c12606a42a083cf56de032480ab00218c1bc372

data/app/controllers/spree/suppliers_controller.rb

@@ -48,7 +48,7 @@ class Spree::SuppliersController < Spree::StoreController
   def new
     authorize! :create, Spree::Supplier
     @supplier = Spree::Supplier.new
-    @supplier.address = Spree::Address.default
+    @supplier.address = Spree::Address.default unless @supplier.address.present?
   end
 
   private

data/app/models/spree/supplier_ability.rb

@@ -8,15 +8,17 @@ module Spree
       if user.supplier and user.supplier.approved == true
 
 
-        can [:admin,:manage,:index], Spree::Supplier, id: user.supplier_id
+        can [:admin,:manage], Spree::Supplier, id: user.supplier_id
+        cannot [:index], Spree::Supplier
 
         # can [:create], Spree::AdmissionReview
         # can [:admin, :manage], Spree::AdmissionReview, supplier: { supplier_id: user.supplier_id }
 
-        can [:admin, :manage, :stock,:admission], Spree::Product do |product|
+        can [:admin, :manage, :stock], Spree::Product do |product|
           product.supplier_ids.include?(user.supplier_id)
         end
-        can [:admin, :create, :index,:admission], Spree::Product
+
+        can [:admin, :create, :index], Spree::Product
 
         can [:create], Spree::Prototype
         can [:admin, :manage], Spree::Prototype#, id: user.supplier.prototypes.pluck(:id)
@@ -43,7 +45,6 @@ module Spree
         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

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

@@ -3,7 +3,7 @@
 <% end -%>
 <%= render 'spree/shared/error_messages', :target => @supplier %>
 
-<div class="col-md-6 col-md-offset-3">
+<div class="col-md-12">
 	<div class="panel panel-default">
 		<div class="panel-heading">
 			<h1><%= Spree.t(:supplier_signup) %></h1>
@@ -19,7 +19,12 @@
 				<%= form.submit Spree.t(:signup), :class => 'btn btn-lg btn-success btn-block' %>
 				</p>
 			</div>
+
 		<% end %>
+
+
+
+
 			<div class="text-center">
 				<%= Spree.t('or') %> <%= link_to Spree.t('cancel'), spree.account_path %>
 			</div>

data/spree_marketplace.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name = "spree_marketplace"
-  s.version = "3.1.3"
+  s.version = "3.1.4"
 
   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.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Y F
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stripe