From 3ac73626f79c0a8ee14bc177eabbee660437b81d Mon Sep 17 00:00:00 2001
From: usmanriaz111 <l124061@lhr.nu.edu.pk>
Date: Fri, 15 Nov 2019 20:57:39 +0500
Subject: [PATCH 01/26] updated the view of sidebar

---
 app/overrides/spree/admin/layouts/admin.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/overrides/spree/admin/layouts/admin.rb b/app/overrides/spree/admin/layouts/admin.rb
index 7c4d864a..08a7f881 100644
--- a/app/overrides/spree/admin/layouts/admin.rb
+++ b/app/overrides/spree/admin/layouts/admin.rb
@@ -1,7 +1,7 @@
 Deface::Override.new(
   virtual_path:  'spree/layouts/admin',
   name:          'vendors_main_menu_tabs',
-  insert_bottom: '#main-sidebar',
+  insert_bottom: '#custom_vendor_tab',
   text:       <<-HTML
                 <% if current_spree_user.respond_to?(:has_spree_role?) && current_spree_user.has_spree_role?(:admin) %>
                   <ul class="nav nav-sidebar">

From b24092dab977788a622d1ad39c7ec5e02b28c5d1 Mon Sep 17 00:00:00 2001
From: usmanriaz111 <l124061@lhr.nu.edu.pk>
Date: Wed, 20 Nov 2019 17:03:58 +0500
Subject: [PATCH 02/26] Updated the images for vendors many

---
 .../admin/images_controller_decorator.rb      | 197 ++++++++++++++++++
 app/models/spree/vendor.rb                    |   2 +-
 app/views/spree/admin/vendors/_form.html.erb  |  14 +-
 app/views/spree/admin/vendors/edit.html.erb   |   3 +
 4 files changed, 208 insertions(+), 8 deletions(-)
 create mode 100644 app/controllers/spree/admin/images_controller_decorator.rb

diff --git a/app/controllers/spree/admin/images_controller_decorator.rb b/app/controllers/spree/admin/images_controller_decorator.rb
new file mode 100644
index 00000000..374bedb9
--- /dev/null
+++ b/app/controllers/spree/admin/images_controller_decorator.rb
@@ -0,0 +1,197 @@
+module Spree
+  module Admin
+    class ImagesController < ResourceController
+      before_action :load_edit_data, except: :index
+      before_action :load_index_data, only: :index
+
+      create.before :set_viewable
+      update.before :set_viewable
+
+      def edit
+        if params[:vendor_id].present?
+          @vendor  = Spree::Vendor.friendly.find(params[:vendor_id])
+          render 'edit_vendor'
+        else
+          respond_with(@object) do |format|
+            format.html { render layout: !request.xhr? }
+            format.js   { render layout: false } if request.xhr?
+          end
+        end
+      end
+
+      def update
+        invoke_callbacks(:update, :before)
+        if @object.update(permitted_resource_params)
+          invoke_callbacks(:update, :after)
+          if params[:vendor_id].present?
+            @vendor  = Spree::Vendor.friendly.find(params[:vendor_id])
+            redirect_vendor_image
+          end
+          respond_with(@object) do |format|
+            format.html do
+              flash[:success] = flash_message_for(@object, :successfully_updated)
+              redirect_to location_after_save
+            end
+            format.js { render layout: false }
+          end
+        else
+          invoke_callbacks(:update, :fails)
+          if params[:vendor_id].present?
+            @vendor  = Spree::Vendor.friendly.find(params[:vendor_id])
+            redirect_vendor_image
+          end
+          respond_with(@object) do |format|
+            format.html { render action: :edit }
+            format.js { render layout: false }
+          end
+        end
+      end
+
+      def destroy
+        invoke_callbacks(:destroy, :before)
+        if @object.destroy
+          if params[:vendor_id].present?
+            @vendor  = Spree::Vendor.friendly.find(params[:vendor_id])
+            # redirect_vendor_image
+            respond_with(@vendor) do |format|
+              format.html {render :js => "window.location.href='"+request.referer+"'" }
+              format.js { render :js => "window.location.href='"+request.referer+"'" }
+            end
+            return
+          else
+            invoke_callbacks(:destroy, :after)
+            flash[:success] = flash_message_for(@object, :successfully_removed)
+          end
+
+        else
+          if params[:vendor_id].present?
+            @vendor  = Spree::Vendor.friendly.find(params[:vendor_id])
+            # redirect_vendor_image
+            respond_with(@vendor) do |format|
+              format.html {render :js => "window.location.href='"+request.referer+"'" }
+              format.js { render :js => "window.location.href='"+request.referer+"'" }
+            end
+            return
+          else
+            invoke_callbacks(:destroy, :fails)
+            flash[:error] = @object.errors.full_messages.join(', ')
+          end
+
+        end
+
+      end
+
+      def create
+
+        invoke_callbacks(:create, :before)
+        @object.attributes = permitted_resource_params
+        if @object.save
+          if params[:vendor_id].present?
+            @vendor  = Spree::Vendor.friendly.find(params[:vendor_id])
+            redirect_vendor_image
+          else
+            invoke_callbacks(:create, :after)
+            flash[:success] = flash_message_for(@object, :successfully_created)
+            respond_with(@object) do |format|
+              format.html { redirect_to location_after_save }
+              format.js   { render layout: false }
+            end
+          end
+
+        else
+          if params[:vendor_id].present?
+            redirect_vendor_image
+          end
+          invoke_callbacks(:create, :fails)
+          respond_with(@object) do |format|
+            format.html { render action: :new }
+            format.js { render layout: false }
+          end
+        end
+      end
+
+      def redirect_vendor_image
+          render "vendor_index"
+          # debugger
+          # redirect_to spree.admin_vendor_images_url(@vendor)
+          # return
+      end
+
+      private
+
+      def location_after_destroy
+        admin_product_images_url(@product)
+      end
+
+      def location_after_save
+        admin_product_images_url(@product)
+      end
+
+      def load_index_data
+        if params[:vendor_id].present?
+          @vendor = Vendor.friendly.find(params[:vendor_id])
+          render "vendor_index"
+        else
+          @product = Product.friendly.includes(*variant_index_includes).find(params[:product_id])
+        end
+      end
+
+      def load_edit_data
+        if params[:vendor_id].present?
+          load_edit_data_vendors
+          if params[:action] == "new"
+            render "spree/admin/images/new_vendor"
+          end
+        else
+          load_edit_data_products
+        end
+      end
+
+      def load_edit_data_products
+        @product = Product.friendly.includes(*variant_edit_includes).find(params[:product_id])
+        @variants = @product.variants.map do |variant|
+          [variant.sku_and_options_text, variant.id]
+        end
+        @variants.insert(0, [Spree.t(:all), @product.master.id])
+      end
+
+      def load_edit_data_vendors
+        @vendors = Vendor.friendly.find(params[:vendor_id])
+        @taxons = Spree::Taxonomy.includes(root: :children).find_by(name: 'Image_Category').taxons.select{|s|s.children.empty?}
+        # debugger
+        # if @vendors.present?
+        #   @vendors.insert(0, [Spree.t(:all), @vendors.id])
+        # end
+
+      end
+
+      def set_viewable
+        if params[:vendor_id].present?
+          @image.viewable_type = 'Spree::Vendor'
+          @image.viewable_id = Spree::Vendor.friendly.find(params[:vendor_id]).id
+          @taxons = Spree::Taxonomy.includes(root: :children).find_by(name: 'Image_Category').taxons.select{|s|s.children.empty?}
+          # render "new_vendor"
+        else
+          @image.viewable_type = 'Spree::Variant'
+          @image.viewable_id = params[:image][:viewable_id]
+        end
+
+      end
+
+      def variant_index_includes
+        [
+            variant_images: [viewable: { option_values: :option_type }]
+        ]
+      end
+
+      def variant_edit_includes
+        [
+            variants_including_master: { option_values: :option_type, images: :viewable }
+        ]
+      end
+      def permitted_resource_params
+        params[resource.object_name].present? ? params.require(resource.object_name).permit! : ActionController::Parameters.new
+      end
+    end
+  end
+end
diff --git a/app/models/spree/vendor.rb b/app/models/spree/vendor.rb
index 44911927..7eafc035 100644
--- a/app/models/spree/vendor.rb
+++ b/app/models/spree/vendor.rb
@@ -15,7 +15,6 @@ class Vendor < Spree::Base
     if Spree.version.to_f >= 3.6
       validates_associated :image
     end
-
     validates :notification_email, email: true, allow_blank: true
 
     with_options dependent: :destroy do
@@ -30,6 +29,7 @@ class Vendor < Spree::Base
       has_many :stock_locations
       has_many :variants
       has_many :vendor_users
+      has_many :images, -> { order(:position) }, as: :viewable, dependent: :destroy, class_name: 'Spree::Image'
     end
 
     has_many :users, through: :vendor_users
diff --git a/app/views/spree/admin/vendors/_form.html.erb b/app/views/spree/admin/vendors/_form.html.erb
index c7be68e7..3a623216 100644
--- a/app/views/spree/admin/vendors/_form.html.erb
+++ b/app/views/spree/admin/vendors/_form.html.erb
@@ -18,13 +18,13 @@
       options_for_select(Spree::Vendor.state_machines[:state].states.collect { |s| [Spree.t("vendor_states.#{s.name}"), s.value] }, selected: @vendor.state),
       {}, class: 'select2' %>
   <% end %>
-  <% if Spree.version.to_f >= 3.6 %>
-    <%= f.field_container :image do %>
-      <%= f.label :image %>
-      <%= f.file_field :image %>
-      <%= image_tag main_app.url_for(@vendor.image.url(:small)) if @vendor.image %>
-    <% end %>
-  <% end %>
+  <%# if Spree.version.to_f >= 3.6 %>
+    <%#= f.field_container :image do %>
+      <%#= f.label :image %>
+      <%#= f.file_field :image %>
+      <%#= image_tag main_app.url_for(@vendor.image.url(:small)) if @vendor.image %>
+    <%# end %>
+  <%# end %>
   <%= f.field_container :commission_rate do %>
     <%= f.label :commission_rate %>
     <%= f.number_field :commission_rate, step: '0.01', class: 'form-control' %>
diff --git a/app/views/spree/admin/vendors/edit.html.erb b/app/views/spree/admin/vendors/edit.html.erb
index 6c3187ce..9b562434 100644
--- a/app/views/spree/admin/vendors/edit.html.erb
+++ b/app/views/spree/admin/vendors/edit.html.erb
@@ -1,3 +1,6 @@
+<button class="btn btn-primary btn-success">
+  <%= link_to  'Add Images', spree.admin_vendor_images_url(@vendor) %>
+</button>
 <% content_for :page_title do %>
   <%= link_to plural_resource_name(Spree::Vendor), spree.admin_vendors_url %> /
   <%= @vendor.name %>

From b962fba922c9f900e114085c9ab6793c5c22cd85 Mon Sep 17 00:00:00 2001
From: usmanriaz111 <l124061@lhr.nu.edu.pk>
Date: Wed, 20 Nov 2019 18:09:10 +0500
Subject: [PATCH 03/26] Updated the update function of images

---
 .../admin/images_controller_decorator.rb      | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/app/controllers/spree/admin/images_controller_decorator.rb b/app/controllers/spree/admin/images_controller_decorator.rb
index 374bedb9..5b55891b 100644
--- a/app/controllers/spree/admin/images_controller_decorator.rb
+++ b/app/controllers/spree/admin/images_controller_decorator.rb
@@ -26,24 +26,28 @@ def update
           if params[:vendor_id].present?
             @vendor  = Spree::Vendor.friendly.find(params[:vendor_id])
             redirect_vendor_image
-          end
-          respond_with(@object) do |format|
-            format.html do
-              flash[:success] = flash_message_for(@object, :successfully_updated)
-              redirect_to location_after_save
+          else
+            respond_with(@object) do |format|
+              format.html do
+                flash[:success] = flash_message_for(@object, :successfully_updated)
+                redirect_to location_after_save
+              end
+              format.js { render layout: false }
             end
-            format.js { render layout: false }
           end
+
         else
           invoke_callbacks(:update, :fails)
           if params[:vendor_id].present?
             @vendor  = Spree::Vendor.friendly.find(params[:vendor_id])
             redirect_vendor_image
+          else
+            respond_with(@object) do |format|
+              format.html { render action: :edit }
+              format.js { render layout: false }
+            end
           end
-          respond_with(@object) do |format|
-            format.html { render action: :edit }
-            format.js { render layout: false }
-          end
+
         end
       end
 
@@ -112,9 +116,6 @@ def create
 
       def redirect_vendor_image
           render "vendor_index"
-          # debugger
-          # redirect_to spree.admin_vendor_images_url(@vendor)
-          # return
       end
 
       private
@@ -158,10 +159,6 @@ def load_edit_data_products
       def load_edit_data_vendors
         @vendors = Vendor.friendly.find(params[:vendor_id])
         @taxons = Spree::Taxonomy.includes(root: :children).find_by(name: 'Image_Category').taxons.select{|s|s.children.empty?}
-        # debugger
-        # if @vendors.present?
-        #   @vendors.insert(0, [Spree.t(:all), @vendors.id])
-        # end
 
       end
 

From 406c9ddef5395358cbf5dd65689a63208c013e76 Mon Sep 17 00:00:00 2001
From: usmanriaz111 <l124061@lhr.nu.edu.pk>
Date: Wed, 20 Nov 2019 20:31:59 +0500
Subject: [PATCH 04/26] Updated the drop down for category

---
 .../spree/admin/images_controller_decorator.rb            | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/spree/admin/images_controller_decorator.rb b/app/controllers/spree/admin/images_controller_decorator.rb
index 5b55891b..950cfb8c 100644
--- a/app/controllers/spree/admin/images_controller_decorator.rb
+++ b/app/controllers/spree/admin/images_controller_decorator.rb
@@ -86,7 +86,6 @@ def destroy
       end
 
       def create
-
         invoke_callbacks(:create, :before)
         @object.attributes = permitted_resource_params
         if @object.save
@@ -150,6 +149,7 @@ def load_edit_data
 
       def load_edit_data_products
         @product = Product.friendly.includes(*variant_edit_includes).find(params[:product_id])
+        @taxons = Spree::Taxonomy.includes(root: :children).find_by(name: 'Image').taxons.where(name: "product").first.children
         @variants = @product.variants.map do |variant|
           [variant.sku_and_options_text, variant.id]
         end
@@ -158,7 +158,8 @@ def load_edit_data_products
 
       def load_edit_data_vendors
         @vendors = Vendor.friendly.find(params[:vendor_id])
-        @taxons = Spree::Taxonomy.includes(root: :children).find_by(name: 'Image_Category').taxons.select{|s|s.children.empty?}
+        # @taxons = Spree::Taxonomy.includes(root: :children).find_by(name: 'Image_Category').taxons.select{|s|s.children.empty?}
+         @taxons = Spree::Taxonomy.includes(root: :children).find_by(name: 'Image').taxons.where(name: "vendor").first.children
 
       end
 
@@ -166,7 +167,8 @@ def set_viewable
         if params[:vendor_id].present?
           @image.viewable_type = 'Spree::Vendor'
           @image.viewable_id = Spree::Vendor.friendly.find(params[:vendor_id]).id
-          @taxons = Spree::Taxonomy.includes(root: :children).find_by(name: 'Image_Category').taxons.select{|s|s.children.empty?}
+          # @taxons = Spree::Taxonomy.includes(root: :children).find_by(name: 'Image_Category').taxons.select{|s|s.children.empty?}
+          @taxons = Spree::Taxonomy.includes(root: :children).find_by(name: 'Image').taxons.where(name: "vendor").first.children
           # render "new_vendor"
         else
           @image.viewable_type = 'Spree::Variant'

From 85dce0ce76af73e9a13fc11745ee4c545a8e6210 Mon Sep 17 00:00:00 2001
From: usmanriaz111 <l124061@lhr.nu.edu.pk>
Date: Fri, 22 Nov 2019 14:50:54 +0500
Subject: [PATCH 05/26] Rename the image controller

---
 .../{images_controller_decorator.rb => images_controller.rb}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/controllers/spree/admin/{images_controller_decorator.rb => images_controller.rb} (100%)

diff --git a/app/controllers/spree/admin/images_controller_decorator.rb b/app/controllers/spree/admin/images_controller.rb
similarity index 100%
rename from app/controllers/spree/admin/images_controller_decorator.rb
rename to app/controllers/spree/admin/images_controller.rb

From 0e1e670c96b6a09569820094cf67e58b5fe97530 Mon Sep 17 00:00:00 2001
From: usmanriaz111 <l124061@lhr.nu.edu.pk>
Date: Fri, 22 Nov 2019 23:59:54 +0500
Subject: [PATCH 06/26] Multiple images for vuctions

---
 .../spree/admin/images_controller.rb          | 41 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/app/controllers/spree/admin/images_controller.rb b/app/controllers/spree/admin/images_controller.rb
index 950cfb8c..1882e5e9 100644
--- a/app/controllers/spree/admin/images_controller.rb
+++ b/app/controllers/spree/admin/images_controller.rb
@@ -62,6 +62,13 @@ def destroy
               format.js { render :js => "window.location.href='"+request.referer+"'" }
             end
             return
+          elsif params[:auction_id].present?
+            @auction  = Spree::Auction.find(params[:auction_id])
+            respond_with(@auction) do |format|
+              format.html {render :js => "window.location.href='"+request.referer+"'" }
+              format.js { render :js => "window.location.href='"+request.referer+"'" }
+            end
+            return
           else
             invoke_callbacks(:destroy, :after)
             flash[:success] = flash_message_for(@object, :successfully_removed)
@@ -76,6 +83,13 @@ def destroy
               format.js { render :js => "window.location.href='"+request.referer+"'" }
             end
             return
+          elsif params[:auction_id].present?
+            @auction  = Spree::Auction.find(params[:auction_id])
+            respond_with(@auction) do |format|
+              format.html {render :js => "window.location.href='"+request.referer+"'" }
+              format.js { render :js => "window.location.href='"+request.referer+"'" }
+            end
+            return
           else
             invoke_callbacks(:destroy, :fails)
             flash[:error] = @object.errors.full_messages.join(', ')
@@ -131,6 +145,9 @@ def load_index_data
         if params[:vendor_id].present?
           @vendor = Vendor.friendly.find(params[:vendor_id])
           render "vendor_index"
+        elsif params[:auction_id].present?
+           @auction  = Auction.find(params[:auction_id])
+           render "auction_index"
         else
           @product = Product.friendly.includes(*variant_index_includes).find(params[:product_id])
         end
@@ -142,6 +159,11 @@ def load_edit_data
           if params[:action] == "new"
             render "spree/admin/images/new_vendor"
           end
+        elsif params[:auction_id].present?
+          load_edit_data_auctions
+          if params[:action] == "new"
+            render "spree/admin/images/new_auction"
+          end
         else
           load_edit_data_products
         end
@@ -149,7 +171,8 @@ def load_edit_data
 
       def load_edit_data_products
         @product = Product.friendly.includes(*variant_edit_includes).find(params[:product_id])
-        @taxons = Spree::Taxonomy.includes(root: :children).find_by(name: 'Image').taxons.where(name: "product").first.children
+        root_taxon  = get_root_taxon
+        @taxons =  root_taxon.present? ? root_taxon.taxons.where(name: "product").first.children : nil
         @variants = @product.variants.map do |variant|
           [variant.sku_and_options_text, variant.id]
         end
@@ -159,8 +182,18 @@ def load_edit_data_products
       def load_edit_data_vendors
         @vendors = Vendor.friendly.find(params[:vendor_id])
         # @taxons = Spree::Taxonomy.includes(root: :children).find_by(name: 'Image_Category').taxons.select{|s|s.children.empty?}
-         @taxons = Spree::Taxonomy.includes(root: :children).find_by(name: 'Image').taxons.where(name: "vendor").first.children
+        root_taxon  = get_root_taxon
+        @taxons =  root_taxon.present? ? root_taxon.taxons.where(name: "vendor").first.children : nil
+      end
 
+      def load_edit_data_auctions
+          @auctions = Auction.find(params[:auction_id])
+          root_taxon  = get_root_taxon
+          @taxons =  root_taxon.present? ? root_taxon.taxons.where(name: "auction").first.children : nil
+      end
+
+      def get_root_taxon
+         Spree::Taxonomy.includes(root: :children).find_by(name: 'Image')
       end
 
       def set_viewable
@@ -170,6 +203,10 @@ def set_viewable
           # @taxons = Spree::Taxonomy.includes(root: :children).find_by(name: 'Image_Category').taxons.select{|s|s.children.empty?}
           @taxons = Spree::Taxonomy.includes(root: :children).find_by(name: 'Image').taxons.where(name: "vendor").first.children
           # render "new_vendor"
+        elsif params[:auction_id].present?
+          @image.viewable_type = 'Spree::Auction'
+          @image.viewable_id = Spree::Auction.find(params[:auction_id]).id
+
         else
           @image.viewable_type = 'Spree::Variant'
           @image.viewable_id = params[:image][:viewable_id]

From 252b5bd0f9c7d9d0ecac1ffb54493d1437217c2a Mon Sep 17 00:00:00 2001
From: usmanriaz111 <l124061@lhr.nu.edu.pk>
Date: Sat, 23 Nov 2019 00:00:27 +0500
Subject: [PATCH 07/26] many to many relation for vendor and calendar

---
 app/models/spree/vendor.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/spree/vendor.rb b/app/models/spree/vendor.rb
index 7eafc035..56f6af6a 100644
--- a/app/models/spree/vendor.rb
+++ b/app/models/spree/vendor.rb
@@ -30,6 +30,8 @@ class Vendor < Spree::Base
       has_many :variants
       has_many :vendor_users
       has_many :images, -> { order(:position) }, as: :viewable, dependent: :destroy, class_name: 'Spree::Image'
+      has_many :vendor_calenders
+      has_many :calender, through: :vendor_calenders
     end
 
     has_many :users, through: :vendor_users

From 8eda61243ff47b0379979ec206aa07c9e69ebf32 Mon Sep 17 00:00:00 2001
From: usmanriaz111 <l124061@lhr.nu.edu.pk>
Date: Tue, 26 Nov 2019 13:07:45 +0500
Subject: [PATCH 08/26] Updated the create and update function for
 auction-images

---
 app/controllers/spree/admin/images_controller.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/controllers/spree/admin/images_controller.rb b/app/controllers/spree/admin/images_controller.rb
index 1882e5e9..b269b3bb 100644
--- a/app/controllers/spree/admin/images_controller.rb
+++ b/app/controllers/spree/admin/images_controller.rb
@@ -26,6 +26,9 @@ def update
           if params[:vendor_id].present?
             @vendor  = Spree::Vendor.friendly.find(params[:vendor_id])
             redirect_vendor_image
+          elsif params[:auction_id].present?
+            @auction = Spree::Auction.find(params[:auction_id])
+            render "auction_index"
           else
             respond_with(@object) do |format|
               format.html do
@@ -41,6 +44,8 @@ def update
           if params[:vendor_id].present?
             @vendor  = Spree::Vendor.friendly.find(params[:vendor_id])
             redirect_vendor_image
+          elsif params[:auction_id].present?
+            render "auction_index"
           else
             respond_with(@object) do |format|
               format.html { render action: :edit }
@@ -106,6 +111,9 @@ def create
           if params[:vendor_id].present?
             @vendor  = Spree::Vendor.friendly.find(params[:vendor_id])
             redirect_vendor_image
+          elsif params[:auction_id].present?
+              @auction = Spree::Auction.find(params[:auction_id])
+              render "auction_index"
           else
             invoke_callbacks(:create, :after)
             flash[:success] = flash_message_for(@object, :successfully_created)
@@ -118,6 +126,8 @@ def create
         else
           if params[:vendor_id].present?
             redirect_vendor_image
+          elsif params[:auction_id].present?
+             render "auction_index"
           end
           invoke_callbacks(:create, :fails)
           respond_with(@object) do |format|

From 26f4fcf39f1a184f0d4608e793c68ded4dafbaf9 Mon Sep 17 00:00:00 2001
From: usmanriaz111 <l124061@lhr.nu.edu.pk>
Date: Tue, 26 Nov 2019 14:24:13 +0500
Subject: [PATCH 09/26] Commented commission

---
 app/views/spree/admin/vendors/_form.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/spree/admin/vendors/_form.html.erb b/app/views/spree/admin/vendors/_form.html.erb
index 3a623216..03e10612 100644
--- a/app/views/spree/admin/vendors/_form.html.erb
+++ b/app/views/spree/admin/vendors/_form.html.erb
@@ -25,10 +25,10 @@
       <%#= image_tag main_app.url_for(@vendor.image.url(:small)) if @vendor.image %>
     <%# end %>
   <%# end %>
-  <%= f.field_container :commission_rate do %>
-    <%= f.label :commission_rate %>
-    <%= f.number_field :commission_rate, step: '0.01', class: 'form-control' %>
-  <% end %>
+  <%#= f.field_container :commission_rate do %>
+    <%#= f.label :commission_rate %>
+    <%#= f.number_field :commission_rate, step: '0.01', class: 'form-control' %>
+  <%# end %>
   <%= f.field_container :notification_email do%>
     <%= f.label :notification_email %>
     <%= f.email_field :notification_email, class: 'form-control' %>

From 22508d40a867b23ff1f46eb449aef54ab38fdaae Mon Sep 17 00:00:00 2001
From: usmanriaz111 <l124061@lhr.nu.edu.pk>
Date: Tue, 26 Nov 2019 14:36:03 +0500
Subject: [PATCH 10/26] Auction edit function of images updated

---
 app/controllers/spree/admin/images_controller.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/controllers/spree/admin/images_controller.rb b/app/controllers/spree/admin/images_controller.rb
index b269b3bb..41b1d0b2 100644
--- a/app/controllers/spree/admin/images_controller.rb
+++ b/app/controllers/spree/admin/images_controller.rb
@@ -11,6 +11,9 @@ def edit
         if params[:vendor_id].present?
           @vendor  = Spree::Vendor.friendly.find(params[:vendor_id])
           render 'edit_vendor'
+        elsif params[:auction_id].present?
+          @auction = Spree::Auction.find(params[:auction_id])
+          render "auction_index"
         else
           respond_with(@object) do |format|
             format.html { render layout: !request.xhr? }

From 51119163ccfc2be7efa27d1f3d16f03a8362d81b Mon Sep 17 00:00:00 2001
From: usmanriaz111 <l124061@lhr.nu.edu.pk>
Date: Tue, 26 Nov 2019 14:54:38 +0500
Subject: [PATCH 11/26] Updated the edit of auction images

---
 app/controllers/spree/admin/images_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/spree/admin/images_controller.rb b/app/controllers/spree/admin/images_controller.rb
index 41b1d0b2..511e32aa 100644
--- a/app/controllers/spree/admin/images_controller.rb
+++ b/app/controllers/spree/admin/images_controller.rb
@@ -13,7 +13,7 @@ def edit
           render 'edit_vendor'
         elsif params[:auction_id].present?
           @auction = Spree::Auction.find(params[:auction_id])
-          render "auction_index"
+          render "edit_auction"
         else
           respond_with(@object) do |format|
             format.html { render layout: !request.xhr? }

From 9ecdca502b2e312f837f5f1045a0b8409f01188f Mon Sep 17 00:00:00 2001
From: usmanriaz111 <l124061@lhr.nu.edu.pk>
Date: Tue, 26 Nov 2019 15:48:16 +0500
Subject: [PATCH 12/26] Updated the calender to calenders

---
 app/models/spree/vendor.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/spree/vendor.rb b/app/models/spree/vendor.rb
index 56f6af6a..0b9fece3 100644
--- a/app/models/spree/vendor.rb
+++ b/app/models/spree/vendor.rb
@@ -31,7 +31,7 @@ class Vendor < Spree::Base
       has_many :vendor_users
       has_many :images, -> { order(:position) }, as: :viewable, dependent: :destroy, class_name: 'Spree::Image'
       has_many :vendor_calenders
-      has_many :calender, through: :vendor_calenders
+      has_many :calenders, through: :vendor_calenders
     end
 
     has_many :users, through: :vendor_users

From e171bc909c0e4f09cb74a1cc7762c49e0143e999 Mon Sep 17 00:00:00 2001
From: usmanriaz111 <l124061@lhr.nu.edu.pk>
Date: Thu, 28 Nov 2019 11:59:18 +0500
Subject: [PATCH 13/26] Updated many auctions line in vendor.rb

---
 app/models/spree/vendor.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/spree/vendor.rb b/app/models/spree/vendor.rb
index 0b9fece3..d5177284 100644
--- a/app/models/spree/vendor.rb
+++ b/app/models/spree/vendor.rb
@@ -16,6 +16,7 @@ class Vendor < Spree::Base
       validates_associated :image
     end
     validates :notification_email, email: true, allow_blank: true
+    has_many :auctions, class_name: 'Spree::Auction'
 
     with_options dependent: :destroy do
       if Spree.version.to_f >= 3.6

From 513706137c4c1de5b825d6e7f0a2344b139d4389 Mon Sep 17 00:00:00 2001
From: usmanriaz111 <l124061@lhr.nu.edu.pk>
Date: Tue, 3 Dec 2019 16:54:56 +0500
Subject: [PATCH 14/26] Updated the scope Ajmal did

---
 app/models/spree/vendor.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/spree/vendor.rb b/app/models/spree/vendor.rb
index d5177284..9b9314bd 100644
--- a/app/models/spree/vendor.rb
+++ b/app/models/spree/vendor.rb
@@ -34,7 +34,8 @@ class Vendor < Spree::Base
       has_many :vendor_calenders
       has_many :calenders, through: :vendor_calenders
     end
-
+    
+    scope :from_collection, -> (vendors_arr) {where("spree_vendors.id IN (?)", vendors_arr)}
     has_many :users, through: :vendor_users
 
     after_create :create_stock_location

From f3ab70c6dca54182b686c7f029e9f180011aa853 Mon Sep 17 00:00:00 2001
From: Ajmal-hassan <ajmalhassan651@gmail.com>
Date: Mon, 9 Dec 2019 13:15:17 +0500
Subject: [PATCH 15/26] add available vendors scope

---
 app/models/spree/vendor.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/spree/vendor.rb b/app/models/spree/vendor.rb
index 9b9314bd..503072ad 100644
--- a/app/models/spree/vendor.rb
+++ b/app/models/spree/vendor.rb
@@ -36,6 +36,8 @@ class Vendor < Spree::Base
     end
     
     scope :from_collection, -> (vendors_arr) {where("spree_vendors.id IN (?)", vendors_arr)}
+    scope :available_vendors, -> {pluck(:id, :name)}
+
     has_many :users, through: :vendor_users
 
     after_create :create_stock_location

From 4cf02cf23a0ad3114dacb6d1f18ad795f62ee325 Mon Sep 17 00:00:00 2001
From: usmanriaz111 <49909779+usmanriaz111@users.noreply.github.com>
Date: Fri, 13 Dec 2019 15:10:57 +0500
Subject: [PATCH 16/26] Update admin.rb

updted the override
---
 app/overrides/spree/admin/layouts/admin.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/overrides/spree/admin/layouts/admin.rb b/app/overrides/spree/admin/layouts/admin.rb
index 08a7f881..b4b2f418 100644
--- a/app/overrides/spree/admin/layouts/admin.rb
+++ b/app/overrides/spree/admin/layouts/admin.rb
@@ -4,12 +4,12 @@
   insert_bottom: '#custom_vendor_tab',
   text:       <<-HTML
                 <% if current_spree_user.respond_to?(:has_spree_role?) && current_spree_user.has_spree_role?(:admin) %>
-                  <ul class="nav nav-sidebar">
+                  <ul class="nav nav-sidebar border-bottom">
                     <%= tab plural_resource_name(Spree::Vendor), url: admin_vendors_path, icon: 'money' %>
                   </ul>
                 <% end %>
                 <% if defined?(current_spree_vendor) && current_spree_vendor %>
-                  <ul class="nav nav-sidebar">
+                  <ul class="nav nav-sidebar border-bottom">
                     <%= tab Spree::Vendor.model_name.human, url: admin_vendor_settings_path, icon: 'money' %>
                   </ul>
                 <% end %>

From 9bd1e5d04aaf002cd4ca8753f522d21f1718b973 Mon Sep 17 00:00:00 2001
From: YaseenIqbal75 <58855776+YaseenIqbal75@users.noreply.github.com>
Date: Mon, 16 Dec 2019 20:02:23 +0500
Subject: [PATCH 17/26] add delete link for admin auction

---
 app/views/spree/admin/vendors/index.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/spree/admin/vendors/index.html.erb b/app/views/spree/admin/vendors/index.html.erb
index 0bb34eef..9c53f0f4 100644
--- a/app/views/spree/admin/vendors/index.html.erb
+++ b/app/views/spree/admin/vendors/index.html.erb
@@ -91,6 +91,7 @@
           </td>
           <td class="actions actions-2 text-right">
             <%= link_to_edit vendor, no_text: true, class: 'edit' if can?(:edit, vendor) %>
+            <%= link_to_delete vendor, no_text: true %>
           </td>
         </tr>
       <% end %>

From 97b8e32d5c9861064269817f6738e35cc17d97b7 Mon Sep 17 00:00:00 2001
From: YaseenIqbal75 <58855776+YaseenIqbal75@users.noreply.github.com>
Date: Mon, 30 Dec 2019 15:53:02 +0500
Subject: [PATCH 18/26] update create method for vendors controller

---
 .../spree/admin/vendors_controller.rb         | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/controllers/spree/admin/vendors_controller.rb b/app/controllers/spree/admin/vendors_controller.rb
index 1a4d2a19..92099963 100644
--- a/app/controllers/spree/admin/vendors_controller.rb
+++ b/app/controllers/spree/admin/vendors_controller.rb
@@ -6,7 +6,27 @@ def create
         if permitted_resource_params[:image] && Spree.version.to_f >= 3.6
           @vendor.build_image(attachment: permitted_resource_params.delete(:image))
         end
-        super
+        invoke_callbacks(:create, :before)
+        @object.attributes = permitted_resource_params
+        if @object.save
+          invoke_callbacks(:create, :after)
+          flash[:success] = flash_message_for(@object, :successfully_created)
+          respond_with(@object) do |format|
+            if params[:controller].include?('spree/dropit_admin/calenders')
+              format.html { redirect_to dropit_admin_dashboards_path }
+              format.js { render layout: false }
+            else
+              format.html { redirect_to location_after_save }
+              format.js { render layout: false }
+            end
+          end
+        else
+          invoke_callbacks(:create, :fails)
+          respond_with(@object) do |format|
+            format.html { render action: :new }
+            format.js { render layout: false }
+          end
+        end
       end
 
       def update

From 4bc9c99a2eaedba12e0ddd579b4258baa2bbf61f Mon Sep 17 00:00:00 2001
From: YaseenIqbal75 <58855776+YaseenIqbal75@users.noreply.github.com>
Date: Mon, 30 Dec 2019 16:24:48 +0500
Subject: [PATCH 19/26] modify check in vendors controller

---
 app/controllers/spree/admin/vendors_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/spree/admin/vendors_controller.rb b/app/controllers/spree/admin/vendors_controller.rb
index 92099963..2f322de3 100644
--- a/app/controllers/spree/admin/vendors_controller.rb
+++ b/app/controllers/spree/admin/vendors_controller.rb
@@ -12,7 +12,7 @@ def create
           invoke_callbacks(:create, :after)
           flash[:success] = flash_message_for(@object, :successfully_created)
           respond_with(@object) do |format|
-            if params[:controller].include?('spree/dropit_admin/calenders')
+            if spree_current_user.has_spree_role? :dropit_admin
               format.html { redirect_to dropit_admin_dashboards_path }
               format.js { render layout: false }
             else

From 4f2c565243ef971e9ac1a94820b009d86ef8022d Mon Sep 17 00:00:00 2001
From: Ajmal hassan <ajmalhassan651@gmail.com>
Date: Mon, 30 Dec 2019 21:34:12 +0500
Subject: [PATCH 20/26] Update vendors_controller.rb

route change dashboard to mainpage
---
 app/controllers/spree/admin/vendors_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/spree/admin/vendors_controller.rb b/app/controllers/spree/admin/vendors_controller.rb
index 2f322de3..d12a9fb1 100644
--- a/app/controllers/spree/admin/vendors_controller.rb
+++ b/app/controllers/spree/admin/vendors_controller.rb
@@ -13,7 +13,7 @@ def create
           flash[:success] = flash_message_for(@object, :successfully_created)
           respond_with(@object) do |format|
             if spree_current_user.has_spree_role? :dropit_admin
-              format.html { redirect_to dropit_admin_dashboards_path }
+              format.html { redirect_to dropit_admin_mainpage_path }
               format.js { render layout: false }
             else
               format.html { redirect_to location_after_save }

From c6e38c237a8bd11d1e078520bc0e25ecd6744631 Mon Sep 17 00:00:00 2001
From: YaseenIqbal75 <58855776+YaseenIqbal75@users.noreply.github.com>
Date: Tue, 31 Dec 2019 20:55:32 +0500
Subject: [PATCH 21/26] add redirect check on create

---
 app/controllers/spree/admin/vendors_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/spree/admin/vendors_controller.rb b/app/controllers/spree/admin/vendors_controller.rb
index d12a9fb1..50c4140e 100644
--- a/app/controllers/spree/admin/vendors_controller.rb
+++ b/app/controllers/spree/admin/vendors_controller.rb
@@ -23,7 +23,8 @@ def create
         else
           invoke_callbacks(:create, :fails)
           respond_with(@object) do |format|
-            format.html { render action: :new }
+            format.html { redirect_to spree.new_dropit_admin_vendor_path } if spree_current_user.has_spree_role? :dropit_admin
+            format.html { render action: :new } if spree_current_user.has_spree_role? :admin
             format.js { render layout: false }
           end
         end

From 673e4879fdf62abf902e369c56419d296ab23c83 Mon Sep 17 00:00:00 2001
From: YaseenIqbal75 <58855776+YaseenIqbal75@users.noreply.github.com>
Date: Wed, 1 Jan 2020 21:00:31 +0500
Subject: [PATCH 22/26] update  w.r.t redirect route

---
 .../spree/admin/vendors_controller.rb         | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/controllers/spree/admin/vendors_controller.rb b/app/controllers/spree/admin/vendors_controller.rb
index 50c4140e..08d074b6 100644
--- a/app/controllers/spree/admin/vendors_controller.rb
+++ b/app/controllers/spree/admin/vendors_controller.rb
@@ -34,7 +34,27 @@ def update
         if permitted_resource_params[:image] && Spree.version.to_f >= 3.6
           @vendor.create_image(attachment: permitted_resource_params.delete(:image))
         end
-        super
+
+        invoke_callbacks(:update, :before)
+        if @object.update(permitted_resource_params)
+          invoke_callbacks(:update, :after)
+          respond_with(@object) do |format|
+            if spree_current_user.has_spree_role? :dropit_admin
+              format.html { redirect_to dropit_admin_mainpage_path }
+              format.js { render layout: false }
+            else
+              format.html { redirect_to location_after_save }
+              format.js { render layout: false }
+            end
+          end
+        else
+          invoke_callbacks(:update, :fails)
+          respond_with(@object) do |format|
+            format.html { redirect_to spree.new_dropit_admin_vendor_path } if spree_current_user.has_spree_role? :dropit_admin
+            format.html { render action: :new } if spree_current_user.has_spree_role? :admin
+            format.js { render layout: false }
+          end
+        end
       end
 
       def update_positions

From 1bb3230d1745036c234fe746ec2c62991a2206f1 Mon Sep 17 00:00:00 2001
From: YaseenIqbal75 <58855776+YaseenIqbal75@users.noreply.github.com>
Date: Wed, 1 Jan 2020 21:08:34 +0500
Subject: [PATCH 23/26] copy destroy from resource controller for redirect
 route

---
 .../spree/admin/vendors_controller.rb         | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/app/controllers/spree/admin/vendors_controller.rb b/app/controllers/spree/admin/vendors_controller.rb
index 08d074b6..fb3c53fd 100644
--- a/app/controllers/spree/admin/vendors_controller.rb
+++ b/app/controllers/spree/admin/vendors_controller.rb
@@ -67,6 +67,28 @@ def update_positions
           format.js { render plain: 'Ok' }
         end
       end
+      
+      def destroy
+        invoke_callbacks(:destroy, :before)
+        if @object.destroy
+          invoke_callbacks(:destroy, :after)
+          flash[:success] = flash_message_for(@object, :successfully_removed)
+        else
+          invoke_callbacks(:destroy, :fails)
+          flash[:error] = @object.errors.full_messages.join(', ')
+        end
+
+        respond_with(@object) do |format|
+          if spree_current_user.has_spree_role? :dropit_admin
+            format.html { redirect_to dropit_admin_mainpage_path }
+            format.js { render layout: false }
+          else
+            format.html { redirect_to location_after_destroy }
+            format.js   { render_js_for_destroy }
+          end
+        end
+
+      end
 
       private
 

From c58197aebeb8cccf59cef49d4556d3cc4b9f200d Mon Sep 17 00:00:00 2001
From: YaseenIqbal75 <58855776+YaseenIqbal75@users.noreply.github.com>
Date: Wed, 1 Jan 2020 21:32:30 +0500
Subject: [PATCH 24/26] add active tab to vendors listing in url

---
 app/controllers/spree/admin/vendors_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/spree/admin/vendors_controller.rb b/app/controllers/spree/admin/vendors_controller.rb
index fb3c53fd..e36ec260 100644
--- a/app/controllers/spree/admin/vendors_controller.rb
+++ b/app/controllers/spree/admin/vendors_controller.rb
@@ -13,7 +13,7 @@ def create
           flash[:success] = flash_message_for(@object, :successfully_created)
           respond_with(@object) do |format|
             if spree_current_user.has_spree_role? :dropit_admin
-              format.html { redirect_to dropit_admin_mainpage_path }
+              format.html { redirect_to dropit_admin_mainpage_path(active_tab: 'vendors') }
               format.js { render layout: false }
             else
               format.html { redirect_to location_after_save }
@@ -40,7 +40,7 @@ def update
           invoke_callbacks(:update, :after)
           respond_with(@object) do |format|
             if spree_current_user.has_spree_role? :dropit_admin
-              format.html { redirect_to dropit_admin_mainpage_path }
+              format.html { redirect_to dropit_admin_mainpage_path(active_tab: 'vendors') }
               format.js { render layout: false }
             else
               format.html { redirect_to location_after_save }
@@ -80,7 +80,7 @@ def destroy
 
         respond_with(@object) do |format|
           if spree_current_user.has_spree_role? :dropit_admin
-            format.html { redirect_to dropit_admin_mainpage_path }
+            format.html { redirect_to dropit_admin_mainpage_path(active_tab: 'vendors') }
             format.js { render layout: false }
           else
             format.html { redirect_to location_after_destroy }

From a12177767f1544b8a66a821a86434a13836e80d9 Mon Sep 17 00:00:00 2001
From: YaseenIqbal75 <58855776+YaseenIqbal75@users.noreply.github.com>
Date: Mon, 6 Jan 2020 13:46:53 +0500
Subject: [PATCH 25/26] revert dropit admin redirection

---
 .../spree/admin/vendors_controller.rb         | 65 -------------------
 1 file changed, 65 deletions(-)

diff --git a/app/controllers/spree/admin/vendors_controller.rb b/app/controllers/spree/admin/vendors_controller.rb
index e36ec260..767eda7b 100644
--- a/app/controllers/spree/admin/vendors_controller.rb
+++ b/app/controllers/spree/admin/vendors_controller.rb
@@ -6,55 +6,12 @@ def create
         if permitted_resource_params[:image] && Spree.version.to_f >= 3.6
           @vendor.build_image(attachment: permitted_resource_params.delete(:image))
         end
-        invoke_callbacks(:create, :before)
-        @object.attributes = permitted_resource_params
-        if @object.save
-          invoke_callbacks(:create, :after)
-          flash[:success] = flash_message_for(@object, :successfully_created)
-          respond_with(@object) do |format|
-            if spree_current_user.has_spree_role? :dropit_admin
-              format.html { redirect_to dropit_admin_mainpage_path(active_tab: 'vendors') }
-              format.js { render layout: false }
-            else
-              format.html { redirect_to location_after_save }
-              format.js { render layout: false }
-            end
-          end
-        else
-          invoke_callbacks(:create, :fails)
-          respond_with(@object) do |format|
-            format.html { redirect_to spree.new_dropit_admin_vendor_path } if spree_current_user.has_spree_role? :dropit_admin
-            format.html { render action: :new } if spree_current_user.has_spree_role? :admin
-            format.js { render layout: false }
-          end
-        end
       end
 
       def update
         if permitted_resource_params[:image] && Spree.version.to_f >= 3.6
           @vendor.create_image(attachment: permitted_resource_params.delete(:image))
         end
-
-        invoke_callbacks(:update, :before)
-        if @object.update(permitted_resource_params)
-          invoke_callbacks(:update, :after)
-          respond_with(@object) do |format|
-            if spree_current_user.has_spree_role? :dropit_admin
-              format.html { redirect_to dropit_admin_mainpage_path(active_tab: 'vendors') }
-              format.js { render layout: false }
-            else
-              format.html { redirect_to location_after_save }
-              format.js { render layout: false }
-            end
-          end
-        else
-          invoke_callbacks(:update, :fails)
-          respond_with(@object) do |format|
-            format.html { redirect_to spree.new_dropit_admin_vendor_path } if spree_current_user.has_spree_role? :dropit_admin
-            format.html { render action: :new } if spree_current_user.has_spree_role? :admin
-            format.js { render layout: false }
-          end
-        end
       end
 
       def update_positions
@@ -67,28 +24,6 @@ def update_positions
           format.js { render plain: 'Ok' }
         end
       end
-      
-      def destroy
-        invoke_callbacks(:destroy, :before)
-        if @object.destroy
-          invoke_callbacks(:destroy, :after)
-          flash[:success] = flash_message_for(@object, :successfully_removed)
-        else
-          invoke_callbacks(:destroy, :fails)
-          flash[:error] = @object.errors.full_messages.join(', ')
-        end
-
-        respond_with(@object) do |format|
-          if spree_current_user.has_spree_role? :dropit_admin
-            format.html { redirect_to dropit_admin_mainpage_path(active_tab: 'vendors') }
-            format.js { render layout: false }
-          else
-            format.html { redirect_to location_after_destroy }
-            format.js   { render_js_for_destroy }
-          end
-        end
-
-      end
 
       private
 

From a1d161095315a3321c914804ca8f019f2cceaa86 Mon Sep 17 00:00:00 2001
From: YaseenIqbal75 <58855776+YaseenIqbal75@users.noreply.github.com>
Date: Tue, 7 Jan 2020 15:45:58 +0500
Subject: [PATCH 26/26] add supper to create and update method

---
 app/controllers/spree/admin/vendors_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/spree/admin/vendors_controller.rb b/app/controllers/spree/admin/vendors_controller.rb
index 767eda7b..1a4d2a19 100644
--- a/app/controllers/spree/admin/vendors_controller.rb
+++ b/app/controllers/spree/admin/vendors_controller.rb
@@ -6,12 +6,14 @@ def create
         if permitted_resource_params[:image] && Spree.version.to_f >= 3.6
           @vendor.build_image(attachment: permitted_resource_params.delete(:image))
         end
+        super
       end
 
       def update
         if permitted_resource_params[:image] && Spree.version.to_f >= 3.6
           @vendor.create_image(attachment: permitted_resource_params.delete(:image))
         end
+        super
       end
 
       def update_positions