spree_drop_ship 3.1.0.1 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8ec93dffafe0fa3317797b375deb1a2ac1de64e
-  data.tar.gz: 5550de66c5fcaf3adc6994e9892ebf554b70c705
+  metadata.gz: 9bfccc41f7846d3ac4e10410fa119be1fce2fa1d
+  data.tar.gz: 13035375388077460f4eeb9fecef8b479d07d637
 SHA512:
-  metadata.gz: 22e0e8ff176b4c628b1db7ea4f92eb7af1425af8bde1548395c0ca16b797cebe52c808ed027ea5c265927bfd3234bb4de3bf75a7e321af4e695994e17cd1a7e2
-  data.tar.gz: 882264fb878a354f141fe3e78eca54e1e3300b2d560cc46d65952bd8adbfea993a6109a58d3614dbdc6525b5422db90842adcf2c2173205c0449e5897f08b659
+  metadata.gz: d1f56e29dcd7cc1a5cb1603491162dad0f973546f603eefb22832a8126b5abf9200436e1e681f2a7ed9b025741feb94f0d5dbfd97bab2c9b26b7ea7a6741d069
+  data.tar.gz: 1f3597e4921b535b34621a1c0883736fe14a88db027277b865dd2ce6cbf3850fb6f03635ffb452e5f26d975b876551aa54315d2e4a9ee68adc5beaaaadd9533a

data/app/controllers/spree/admin/products_controller_decorator.rb

@@ -2,6 +2,16 @@ Spree::Admin::ProductsController.class_eval do
 
   before_filter :get_suppliers, only: [:edit, :update]
   before_filter :supplier_collection, only: [:index]
+  create.after :create_after
+
+  def create_after
+    if spree_current_user.supplier?
+      @product.add_supplier!(spree_current_user.supplier)
+    end
+  end
+
+
+
 
   private
 

data/app/controllers/spree/base_controller_decorator.rb

@@ -1,18 +1,18 @@
 Spree::BaseController.class_eval do
 
   prepend_before_filter :redirect_supplier
-  # before_action :authorize_supplier
+  before_action :authorize_supplier
 
   private
 
   def authorize_supplier
-    if respond_to?(:model_class, true) && model_class
-      record = model_class
-    else
-      record = controller_name.to_sym
-    end
-    authorize! :supplier, record
-    authorize! :action, record
+    # if respond_to?(:model_class, true) && model_class
+    #   record = model_class
+    # else
+    #   record = controller_name.to_sym
+    # end
+    # authorize! :supplier, record
+    # authorize! :action, record
   end
 
   def redirect_supplier

data/app/models/spree/product_decorator.rb

@@ -1,7 +1,9 @@
 Spree::Product.class_eval do
 
+  before_create :add_supplier_to_product
   has_many :suppliers, through: :master
 
+
   def add_supplier!(supplier_or_id)
     supplier = supplier_or_id.is_a?(Spree::Supplier) ? supplier_or_id : Spree::Supplier.find(supplier_or_id)
     populate_for_supplier! supplier if supplier
@@ -18,13 +20,13 @@ Spree::Product.class_eval do
     suppliers.present?
   end
 
-  private
+  # private
 
   def populate_for_supplier!(supplier)
     variants_including_master.each do |variant|
       unless variant.suppliers.pluck(:id).include?(supplier.id)
         variant.suppliers << supplier
-        supplier.stock_locations.each { |location| location.propagate_variant(variant) }
+        # supplier.stock_locations.each { |location| location.propagate_variant(variant) }
       end
     end
   end

data/app/models/spree/supplier.rb

@@ -43,6 +43,8 @@ class Spree::Supplier < Spree::Base
   # Instance Methods
   scope :active, -> { where(active: true) }
 
+
+
   def deleted?
     deleted_at.present?
   end

data/app/models/spree/variant_decorator.rb

@@ -4,21 +4,22 @@ module Spree
     has_many :suppliers, through: :supplier_variants
     has_many :supplier_variants
 
-    before_create :populate_for_suppliers
+    # before_create :populate_for_suppliers
 
-    private
 
-    durably_decorate :create_stock_items, mode: 'soft', sha: '98704433ac5c66ba46e02699f3cf03d13d4f1281' do
-      StockLocation.all.each do |stock_location|
-        if stock_location.supplier_id.blank? || self.suppliers.pluck(:id).include?(stock_location.supplier_id)
-          stock_location.propagate_variant(self) if stock_location.propagate_all_variants?
-        end
-      end
-    end
+    # private
 
-    def populate_for_suppliers
-      self.suppliers = self.product.suppliers
-    end
+    # durably_decorate :create_stock_items, mode: 'soft', sha: '98704433ac5c66ba46e02699f3cf03d13d4f1281' do
+    #   StockLocation.all.each do |stock_location|
+    #     if stock_location.supplier_id.blank? || self.suppliers.pluck(:id).include?(stock_location.supplier_id)
+    #       stock_location.propagate_variant(self) if stock_location.propagate_all_variants?
+    #     end
+    #   end
+    # end
+
+    # def populate_for_suppliers
+    #   self.suppliers = self.product.suppliers
+    # end
 
   end
 end

data/app/views/spree/admin/suppliers/_form.html.erb

@@ -30,6 +30,12 @@
       <%= form.text_field :tax_id, :class => 'form-control' %>
     <% end %>
     <% if spree_current_user.admin? %>
+     <div class="checkbox">
+        <%= label_tag :approved do %>
+            <%= form.check_box :approved %>
+            <%= Spree::Supplier.human_attribute_name(:approved) %>
+        <% end %>
+        </div>
       <%= form.field_container :commission_flat_rate, class: ['form-group'] do %>
         <%= form.label :commission_flat_rate, Spree::Supplier.human_attribute_name(:commission_flat_rate) %>:<br />
         <%= form.text_field :commission_flat_rate, :class => 'form-control' %>

data/app/views/spree/admin/suppliers/index.html.erb

@@ -34,6 +34,7 @@
     <thead>
       <tr data-hook='admin_suppliers_index_headers'>
         <th><%= sort_link @search, :name,  Spree::Supplier.human_attribute_name(:name) %></th>
+        <th><%= sort_link @search, :approved,  Spree::Supplier.human_attribute_name(:approved) %></th>
         <th><%= sort_link @search, :email, Spree::Supplier.human_attribute_name(:email) %></th>
         <th><%= Spree.t(:users) %></th>
         <th><%= sort_link @search, :active, Spree::Supplier.human_attribute_name(:active) %></th>
@@ -46,6 +47,7 @@
         <tr <%= "style='color: red;'" if supplier.deleted? %> id="<%= spree_dom_id supplier %>" data-hook="admin_suppliers_index_rows" class="<%= cycle('odd', 'even') %>">
           <!--todo: Fix this link!-->
           <td><%= link_to supplier.name, edit_object_url(supplier) %></td>
+          <td><%= supplier.approved %></td>
           <td><%= mail_to supplier.email %></td>
           <td><%= supplier.users.pluck(:email).join(', ') %></td>
           <td><%= supplier.active %></td>

data/spree_drop_ship.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_drop_ship'
-  s.version     = '3.1.0.1'
+  s.version     = '3.1.1'
   s.summary     = 'Upgraded Spree Drop Shipping Extension'
   s.description = 'Adds drop shipping functionality to Spree stores.'
   s.required_ruby_version = '>= 2.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_drop_ship
 version: !ruby/object:Gem::Version
-  version: 3.1.0.1
+  version: 3.1.1
 platform: ruby
 authors:
 - Yad Faeq
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: durable_decorator
@@ -299,7 +299,6 @@ files:
 - app/models/spree/stock/splitter/drop_ship.rb
 - app/models/spree/stock_location_decorator.rb
 - app/models/spree/supplier.rb
-- app/models/spree/supplier_ability.rb
 - app/models/spree/supplier_variant.rb
 - app/models/spree/user_decorator.rb
 - app/models/spree/variant_decorator.rb

data/app/models/spree/supplier_ability.rb

@@ -1,28 +0,0 @@
-module Spree
-  class SupplierAbility
-    include CanCan::Ability
-
-    def initialize(user)
-      user ||= Spree.user_class.new
-
-      if user.supplier
-        # TODO: Want this to be inline like:
-        # can [:admin, :read, :stock], Spree::Product, suppliers: { id: user.supplier_id }
-        # can [:admin, :read, :stock], Spree::Product, supplier_ids: user.supplier_id
-        can [:admin, :read, :stock], Spree::Product do |product|
-          product.supplier_ids.include?(user.supplier_id)
-        end
-        can [:admin, :index, :manage, :create], Spree::Product
-        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
-      end
-
-    end
-  end
-end