spree_multi_vendor 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5387ab5edeed4f158bfb7e5f264800ea5b02efc14c2048957501948c406dcca
-  data.tar.gz: 523fd3aea41eea77295a9f34d33ee3bcfb08dd9b615ddba74eda769b8e65f326
+  metadata.gz: 739faebda6a3b0fea3e9bb528131c08de2dde2f692dbca6b7346e8eaf0b5d9a1
+  data.tar.gz: 656938bba90616428bd534d7e64d94d2673e99a3ced0a8a2dfc0515d6eb4c0c6
 SHA512:
-  metadata.gz: 9a8768042a152773ff4059c05c4e49f5102048cc3538e0289a9f015daa4afe0bae20124bbd8a96f61bb4d2a6f48033b4c4f2cbefcc1650c1e1ff83211f6b20b6
-  data.tar.gz: 97901fc6622e7d5c208656630865c01da883cac4ee158309b62bce59984c69357b971a128257dca459e556ced2097ce3ecb5aec664b297ebeb0eaffb31dc2b18
+  metadata.gz: 639389fb453a10c7fc98328a6bcf1f8b4d834063f1be4983a5177a00e2dafcb447afc6d2f67095dd80ba716214546b645481703f131bffca8abd1214fd007125
+  data.tar.gz: 4d8c28520b08cc36c0fb130e77d566ff4aaeee9a63d971c52b8af6c61443047cddb2f18df2543c3b35b47e22c461f9d65b1d89a82825cf1c7c82ec5b6199aebf

data/README.md

@@ -1,16 +1,16 @@
 # Spree Multi Vendor
 
-This is a [spree multi vendor marketplace](https://spreecommerce.org/use-cases/multi-vendor-marketplace/) extension. It's a great starting point if you're building a marketplace on top of [Spree](https://spreecommerce.org). Our goal was flexibility to allow you to tweak it to your needs.
+This is a spree [multi vendor marketplace](https://getvendo.com) extension. It's a great starting point if you're building a marketplace on top of [Spree](https://spreecommerce.org). Our goal was flexibility to allow you to tweak it to your needs.
 
 ## Developed by
 
 [![Vendo](https://assets-global.website-files.com/6230c485f2c32ea1b0daa438/623372f40a8c54ca9aea34e8_vendo%202.svg)](https://getvendo.com?utm_source=spree_multi_vendor_github)
 
-> All-in-one platform for all your Marketplace and B2B eCommerce needs. [Start your 30-day free trial](https://e98esoirr8c.typeform.com/contactvendo?typeform-source=spree_multi_vendor_github)
+> All-in-one platform for all your multi-vendor Marketplace needs. [Get your free account](https://app.getvendo.com/users/new?utm_source=spree_multi_vendor_github)
 
 ## Open source vs Vendo
 
-If you need a product that has all of the features out of the box, such us supplier onboarding, Stripe connect payment splitting and payouts, and don't require any custom development - we recommend using [Vendo](http://getvendo.com?utm_source=spree_multi_vendor_github) which is also based on Spree.
+If you need a product that has all of the features out of the box, such us supplier onboarding, Stripe connect payment splitting and payouts, and don't require any custom development - we recommend using [Vendo](https://app.getvendo.com/users/new?utm_source=spree_multi_vendor_github).
 
 | feature | open source | [vendo] |
 |---|---|---|
@@ -168,14 +168,10 @@ and may be redistributed under the terms specified in the
 
 ## About Vendo
 
-<a href="https://getvendo.com?utm_source=spree_multi_vendor_github">
-  <img src="https://uploads-ssl.webflow.com/6230c485f2c32ea1b0daa438/62386b96518cdcbe111f134a_OG%20Image%20(2).png" style="max-height:400px" />
-</a>
-
 > [Vendo][vendo] is a great fit for marketplaces of all sizes - either with own fulfillment and multiple warehouses or in a dropshipping model. Vendo **automates everything** from **vendor onboarding**, accepting buyer **payments in over 135 currencies**, to supplier **payouts in 50 countries**. 
 
 > Vendo ensures excellent buyer experience with smooth product discovery and search, a multitude of payment methods and optimal shipping cost calculation. Vendo keeps suppliers happy with easy onboarding, automated products sync using their preferred method and easy payouts.
 
-> [Start your 30-day free trial](https://e98esoirr8c.typeform.com/contactvendo?typeform-source=spree_multi_vendor_github)
+> [Get your free account](https://app.getvendo.com/users/new?utm_source=spree_multi_vendor_github)
 
-[vendo]:http://getvendo.com?utm_source=spree_multi_vendor_github
+[vendo]:https://app.getvendo.com/users/new?utm_source=spree_multi_vendor_github

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

@@ -1,6 +1,7 @@
 module Spree
   module Admin
     class VendorsController < ResourceController
+      include Translatable
 
       def create
         if permitted_resource_params[:image]
@@ -13,7 +14,6 @@ module Spree
         if permitted_resource_params[:image]
           @vendor.create_image(attachment: permitted_resource_params.delete(:image))
         end
-        format_translations if defined? SpreeGlobalize
         super
       end
 
@@ -51,18 +51,6 @@ module Spree
           products: []
         }
       end
-
-      def format_translations
-        return if params[:vendor][:translations_attributes].blank?
-        params[:vendor][:translations_attributes].each do |_, data|
-          translation = @vendor.translations.find_or_create_by(locale: data[:locale])
-          translation.name = data[:name]
-          translation.about_us = data[:about_us]
-          translation.contact_us = data[:contact_us]
-          translation.slug = data[:slug]
-          translation.save!
-        end
-      end
     end
   end
 end

data/app/models/spree/vendor.rb

@@ -1,6 +1,11 @@
 module Spree
   class Vendor < Spree::Base
     extend FriendlyId
+    include TranslatableResource
+    include TranslatableResourceSlug
+
+    TRANSLATABLE_FIELDS = %i[name about_us contact_us slug].freeze
+    translates(*TRANSLATABLE_FIELDS)
 
     acts_as_paranoid
     acts_as_list column: :priority
@@ -48,16 +53,6 @@ module Spree
       update(notification_email: email)
     end
 
-    # Spree Globalize support
-    # https://github.com/spree-contrib/spree_multi_vendor/issues/104
-    if defined?(SpreeGlobalize)
-      attr_accessor :translations_attributes
-      translates :name,
-                 :about_us,
-                 :contact_us,
-                 :slug, fallbacks_for_empty_translations: true
-    end
-
     private
 
     def create_stock_location

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

@@ -33,7 +33,7 @@
 <%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection } %>
 
 <% if @vendors.any? %>
-  <table class="table sortable" data-hook="vendors_table" data-sortable-link="<%= update_positions_admin_vendors_url %>">
+  <table class="table border rounded sortable" data-hook="vendors_table" data-sortable-link="<%= update_positions_admin_vendors_url %>">
     <thead>
       <tr data-hook="vendors_header">
         <th>
@@ -66,9 +66,9 @@
             <!-- Add translation icon support -->
             <%= link_to_with_icon 'translate',
                                   nil,
-                                  spree.admin_translations_path('vendor', vendor.id),
+                                  spree.translations_admin_vendor_path(vendor.id),
                                   title: Spree.t(:'i18n.translations'),
-                                  class: 'btn btn-sm btn-primary' if defined? (SpreeGlobalize)%>
+                                  class: 'btn btn-sm btn-primary' %>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/vendors/translations.html.erb

@@ -0,0 +1,3 @@
+<div class="row" style="display: block">
+  <%= render 'spree/admin/translations/form', resource: @object %>
+</div>

data/config/locales/en.yml

@@ -32,3 +32,4 @@ en:
       pending: Pending
     admin:
       commission: Commission
+    vendors: Vendors

data/config/locales/es.yml

@@ -34,3 +34,4 @@ es:
       pending: Pendiente
     admin:
       commission: Comisión
+    vendors: Vendedores

data/config/locales/fr.yml

@@ -31,3 +31,4 @@ fr:
       pending: En attente
     admin:
       commission: Commission
+    vendors: Vendeurs

data/config/routes.rb

@@ -1,6 +1,11 @@
 Spree::Core::Engine.routes.draw do
   namespace :admin do
     resources :vendors do
+      member do
+        get :translations
+        post :translations, to: 'vendors#edit_translations'
+      end
+
       collection do
         post :update_positions
       end

data/db/migrate/20231114090744_add_mobility_translations_to_vendor.rb

@@ -0,0 +1,25 @@
+class AddMobilityTranslationsToVendor < ActiveRecord::Migration[6.1]
+  def change
+    if ActiveRecord::Base.connection.table_exists?('spree_vendor_translations')
+      if ActiveRecord::Migration.connection.index_exists?(:spree_vendors_translations, :spree_vendor_id)
+        remove_index :spree_vendor_translations, column: :spree_vendor_id, if_exists: true
+      end
+    else
+      create_table :spree_vendor_translations do |t|
+        # Translated attribute(s)
+        t.string :name
+        t.text :about_us
+        t.text :contact_us
+        t.string :slug
+
+        t.string  :locale, null: false
+        t.references :spree_vendor, null: false, foreign_key: true, index: false
+
+        t.timestamps null: false
+      end
+
+      add_index :spree_vendor_translations, :locale, name: :index_spree_vendor_translations_on_locale
+      add_index :spree_vendor_translations, [:locale, :slug], unique: true, name: 'vendor_unique_slug_per_locale'
+    end
+  end
+end

data/db/migrate/20231114093444_transfer_vendor_data_to_translatable_tables.rb

@@ -0,0 +1,11 @@
+class TransferVendorDataToTranslatableTables < ActiveRecord::Migration[6.1]
+  TRANSLATION_MIGRATION = Spree::TranslationMigrations.new(Spree::Vendor, 'en')
+
+  def up
+    TRANSLATION_MIGRATION.transfer_translation_data
+  end
+
+  def down
+    TRANSLATION_MIGRATION.revert_translation_data_transfer
+  end
+end

data/lib/spree_multi_vendor/configuration.rb

@@ -1,10 +1,27 @@
 module SpreeMultiVendor
-  class Configuration < ::Spree::Preferences::Configuration
+  class Configuration
     DEFAULT_VENDORIZED_MODELS ||= %w[product variant stock_location shipping_method].freeze
 
-   # Some example preferences are shown below, for more information visit:
-   # https://guides.spreecommerce.org/developer/core/preferences.html
+    attr_accessor :vendorized_models
 
-   preference :vendorized_models, :array, default: DEFAULT_VENDORIZED_MODELS
+    def initialize
+      self.vendorized_models = DEFAULT_VENDORIZED_MODELS
+    end
+
+    def configure
+      yield(self) if block_given?
+    end
+
+    def get(preference)
+      send(preference)
+    end
+
+    alias [] get
+
+    def set(preference, value)
+      send("#{preference}=", value)
+    end
+
+    alias []= set
   end
 end

data/lib/spree_multi_vendor/version.rb

@@ -1,5 +1,5 @@
 module SpreeMultiVendor
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 
   module_function
 

data/spree_multi_vendor.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  spree_version = '>= 4.3.0.rc1'
+  spree_version = '>= 4.6.0'
   s.add_dependency 'spree', spree_version
   s.add_dependency 'spree_backend', spree_version
   s.add_dependency 'spree_emails', spree_version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_multi_vendor
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Spark Solutions
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-21 00:00:00.000000000 Z
+date: 2023-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.0.rc1
+        version: 4.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.0.rc1
+        version: 4.6.0
 - !ruby/object:Gem::Dependency
   name: spree_backend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.0.rc1
+        version: 4.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.0.rc1
+        version: 4.6.0
 - !ruby/object:Gem::Dependency
   name: spree_emails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.0.rc1
+        version: 4.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.0.rc1
+        version: 4.6.0
 - !ruby/object:Gem::Dependency
   name: spree_extension
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,6 @@ files:
 - app/overrides/spree/admin/orders/index.rb
 - app/overrides/spree/admin/products/form.rb
 - app/overrides/spree/admin/products/new.rb
-- app/overrides/spree/admin/shared/_main_menu.rb
 - app/overrides/spree/admin/shared/_order_summary.rb
 - app/overrides/spree/admin/users/_form.rb
 - app/serializers/spree/v2/storefront/vendor_image_serializer.rb
@@ -177,6 +176,7 @@ files:
 - app/views/spree/admin/vendors/edit.html.erb
 - app/views/spree/admin/vendors/index.html.erb
 - app/views/spree/admin/vendors/new.html.erb
+- app/views/spree/admin/vendors/translations.html.erb
 - app/views/spree/api/v1/vendors/index.rabl
 - app/views/spree/api/v1/vendors/show.rabl
 - app/views/spree/vendor_mailer/vendor_notification_email.html.erb
@@ -204,6 +204,8 @@ files:
 - db/migrate/20210728120649_change_vendorized_models_vendor_id_type.rb
 - db/migrate/20210728120910_change_vendor_id_and_user_id_type_for_spree_vendor_users.rb
 - db/migrate/20210728121024_change_vendor_id_and_order_id_type_for_spree_order_commissions.rb
+- db/migrate/20231114090744_add_mobility_translations_to_vendor.rb
+- db/migrate/20231114093444_transfer_vendor_data_to_translatable_tables.rb
 - lib/generators/spree_multi_vendor/install/install_generator.rb
 - lib/generators/spree_multi_vendor/mailers_preview/mailers_preview_generator.rb
 - lib/generators/spree_multi_vendor/mailers_preview/templates/mailers/previews/vendor_notification_preview.rb
@@ -250,9 +252,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.4.0
+  changelog_uri: https://github.com/spree-contrib/spree_multi_vendor/releases/tag/v2.5.0
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree-contrib/spree_multi_vendor/tree/v2.4.0
+  source_code_uri: https://github.com/spree-contrib/spree_multi_vendor/tree/v2.5.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -269,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.0.9
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Spree Commerce multi vendor marketplace extension

data/app/overrides/spree/admin/shared/_main_menu.rb

@@ -1,23 +0,0 @@
-Deface::Override.new(
-  virtual_path: 'spree/admin/shared/_main_menu',
-  name: 'Display configuration tab for vendors',
-  replace: 'erb[silent]:contains("current_store")',
-  text: '<% if can?(:admin, current_store) || current_spree_user&.vendors&.any? %>'
-)
-Deface::Override.new(
-  virtual_path:  'spree/admin/shared/_main_menu',
-  name:          'vendors_main_menu_tabs',
-  insert_bottom: 'nav',
-  text:       <<-HTML
-                <% if current_spree_user.respond_to?(:has_spree_role?) && current_spree_user.has_spree_role?(:admin) %>
-                  <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 border-bottom">
-                    <%= tab Spree::Vendor.model_name.human, url: admin_vendor_settings_path, icon: 'money' %>
-                  </ul>
-                <% end %>
-HTML
-)