solidus_brazilian_adaptations 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24fa67771b38cee0a4d92caf9fdae494846fb87023ddfce3f3ed4077433661e7
-  data.tar.gz: 2adf6fce94c6ebdc966e6ff986daf61462e92dc0576de84f47b8e4d2ac2f0e22
+  metadata.gz: fa340352bf3bdbd83004ac7e1586475c97b711dc885a1ff863e56217c635077c
+  data.tar.gz: c8380825a0d218d87b7627aaeb4cc16c2a0d3f06224794f2b42065849072d527
 SHA512:
-  metadata.gz: 77d168c0c7ad3c0cb2993817009a04a8cece0c88d1a5abf9ed9536ad594d34ca709d9069e7b4fb131fdf30c536c8362fd9f0755a46e75b185cdc4b5db87e7320
-  data.tar.gz: c37f09bace53817ef175c4758c199767726c466ef2399327bbf24b7275fe3526b90d8869bb28827f58d448813b39843140cb9cfa3f025b8ce5cd4c33405984a8
+  metadata.gz: 664b659cc65a2681ccc34177e1eeecb049384cdd1bc5bd95103a252700c0e894b33461d5ebc144a8551c4c2e17444f18aab19ae23331f8b2910541205d785c4b
+  data.tar.gz: 95579b93f2e3ca2beec1d5e51aed4cec713a52080ae30a7a36203107fc4a155761a4a1aa31c238445c4dd97e236f8c6d557f59d1ca15747979f21192aea01dde

data/Gemfile

@@ -1,42 +1,41 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
-gem 'solidus', github: 'solidusio/solidus', branch: branch
+branch = ENV.fetch("SOLIDUS_BRANCH", "main")
+gem "solidus", github: "solidusio/solidus", branch: branch
 
 # The solidus_frontend gem has been pulled out since v3.2
-if branch >= 'v3.2'
-  gem 'solidus_frontend'
-elsif branch == 'main'
-  gem 'solidus_frontend', github: 'solidusio/solidus_frontend'
+if branch >= "v3.2"
+  gem "solidus_frontend"
+elsif branch == "main"
+  gem "solidus_frontend", github: "solidusio/solidus_frontend"
 else
-  gem 'solidus_frontend', github: 'solidusio/solidus', branch: branch
+  gem "solidus_frontend", github: "solidusio/solidus", branch: branch
 end
 
 # Needed to help Bundler figure out how to resolve dependencies,
 # otherwise it takes forever to resolve them.
 # See https://github.com/bundler/bundler/issues/6677
-gem 'rails', '>0.a'
-
+gem "rails", ">0.a"
 
 # Provides basic authentication functionality for testing parts of your engine
-gem 'solidus_auth_devise'
+gem "solidus_auth_devise"
 
-case ENV.fetch('DB', nil)
-when 'mysql'
-  gem 'mysql2'
-when 'postgresql'
-  gem 'pg'
+case ENV.fetch("DB", nil)
+when "mysql"
+  gem "mysql2"
+when "postgresql"
+  gem "pg"
 else
-  gem 'sqlite3'
+  gem "sqlite3"
 end
 
 # While we still support Ruby < 3 we need to workaround a limitation in
 # the 'async' gem that relies on the latest ruby, since RubyGems doesn't
 # resolve gems based on the required ruby version.
-gem 'async', '< 3' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3')
+gem "async", "< 3" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3")
 
 gemspec
 
@@ -45,4 +44,4 @@ gemspec
 #
 # We use `send` instead of calling `eval_gemfile` to work around an issue with
 # how Dependabot parses projects: https://github.com/dependabot/dependabot-core/issues/1658.
-send(:eval_gemfile, 'Gemfile-local') if File.exist? 'Gemfile-local'
+send(:eval_gemfile, "Gemfile-local") if File.exist? "Gemfile-local"

data/README.md

@@ -21,6 +21,25 @@ bin/rails generate solidus_brazilian_adaptations:install
 
 ## Usage
 
+### Tradução e moeda padrão
+Editar `config/initializers/spree.rb` adicionando as seguintes configurações
+```ruby
+config.currency = "BRL"
+# Preenche automaticamente o campo de pais que vamos remover do formulário de endereço:
+config.default_country_iso = "BR"
+```
+Incluir no `config/application.rb`
+```ruby
+config.i18n.available_locales = ['pt-BR']
+config.i18n.default_locale = 'pt-BR'
+```
+E para interface admin, no initializer do spree
+```ruby
+Spree::Backend::Config.configure do |config|
+  config.locale = 'pt-BR'
+end
+```
+
 ### Configurações
 A partir do initializer da gem é possivel configurar se será permitido efetuar compras utilizando CNPJ. Por padrão é essa opção é `true`.
 

data/app/overrides/address_validations.rb

@@ -2,8 +2,17 @@ module AddressValidations
   extend ActiveSupport::Concern
 
   prepended do
-    validates :number, presence: true
-    validates :district, presence: true
+    validates :number, presence: true, if: -> { country.iso == "BR" }
+    validates :district, presence: true, if: -> { country.iso == "BR" }
+    validate :compatible_zipcode_and_state
+
+    def compatible_zipcode_and_state
+      return if country.iso != "BR"
+      cep = CodigoPostal.new(zipcode)
+      unless cep.state_code == state.abbr
+        errors.add(:base, "CEP não corresponde ao Estado.")
+      end
+    end
   end
 
   ::Spree::Address.prepend self

data/app/overrides/order_validations.rb

@@ -3,16 +3,8 @@ module OrderValidations
 
   prepended do
     validate :check_tax_id, if: :email_required?
-    validate :check_compatible_zipcode_and_state
     before_update :format_tax_id
 
-    def check_compatible_zipcode_and_state
-      cep = CodigoPostal.new(ship_address.zipcode)
-      unless cep.state_code == ship_address.state.abbr
-        errors.add(:base, "CEP não corresponde ao Estado.")
-      end
-    end
-
     def check_tax_id
       cnpj_allowed = SolidusBrazilianAdaptations.config.allow_cnpj
       document = TaxIdBr.new(tax_id)

data/db/migrate/20230911133000_add_tax_id_to_spree_orders.rb

@@ -1,5 +1,5 @@
 class AddTaxIdToSpreeOrders < ActiveRecord::Migration[7.0]
   def change
-    add_column :spree_orders, :tax_id, :string, default: "", if_not_exists: true
+    add_column :spree_orders, :tax_id, :string, if_not_exists: true
   end
 end

data/db/migrate/20231107142354_add_delivery_time_to_spree_shipping_rate.rb

@@ -0,0 +1,6 @@
+class AddDeliveryTimeToSpreeShippingRate < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_shipping_rates, :min_delivery_time, :integer, if_not_exists: true
+    add_column :spree_shipping_rates, :max_delivery_time, :integer, if_not_exists: true
+  end
+end

data/db/seeds.rb

@@ -1,4 +1,4 @@
-require 'thor'
+require "thor"
 shell = Thor::Base.shell.new
 
 %w[
@@ -15,4 +15,4 @@ shell = Thor::Base.shell.new
 ].each do |seed|
   shell.say_status :seed, seed
   require_relative "spree_br/#{seed}"
-end
+end

data/db/spree_br/countries.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'carmen'
+require "carmen"
 
 # Insert Countries into the spree_countries table, checking to ensure that no
 # duplicates are created, using as few SQL statements as possible (2)
@@ -8,11 +8,11 @@ require 'carmen'
 connection = Spree::Base.connection
 
 country_mapper = ->(country) do
-  name            = connection.quote country.name
-  iso3            = connection.quote country.alpha_3_code
-  iso             = connection.quote country.alpha_2_code
-  iso_name        = connection.quote country.name.upcase
-  numcode         = connection.quote country.numeric_code
+  name = connection.quote country.name
+  iso3 = connection.quote country.alpha_3_code
+  iso = connection.quote country.alpha_2_code
+  iso_name = connection.quote country.name.upcase
+  numcode = connection.quote country.numeric_code
   states_required = connection.quote country.subregions?
 
   [name, iso3, iso, iso_name, numcode, states_required].join(", ")
@@ -27,12 +27,12 @@ country_values = -> do
 
   # create VALUES statements for each country _not_ already in the database
   carmen_countries
-    .reject { |c| existing_country_isos.include?(c.alpha_2_code) || c.alpha_2_code != 'BR' }
+    .reject { |c| existing_country_isos.include?(c.alpha_2_code) || c.alpha_2_code != "BR" }
     .map(&country_mapper)
     .join("), (")
 end
 
-country_columns = %w(name iso3 iso iso_name numcode states_required).join(', ')
+country_columns = %w[name iso3 iso iso_name numcode states_required].join(", ")
 country_vals = country_values.call
 
 if country_vals.present?

data/db/spree_br/return_reasons.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-Spree::ReturnReason.find_or_create_by(name: 'Better price available')
-Spree::ReturnReason.find_or_create_by(name: 'Missed estimated delivery date')
-Spree::ReturnReason.find_or_create_by(name: 'Missing parts or accessories')
-Spree::ReturnReason.find_or_create_by(name: 'Damaged/Defective')
-Spree::ReturnReason.find_or_create_by(name: 'Different from what was ordered')
-Spree::ReturnReason.find_or_create_by(name: 'Different from description')
-Spree::ReturnReason.find_or_create_by(name: 'No longer needed/wanted')
-Spree::ReturnReason.find_or_create_by(name: 'Accidental order')
-Spree::ReturnReason.find_or_create_by(name: 'Unauthorized purchase')
+Spree::ReturnReason.find_or_create_by(name: "Better price available")
+Spree::ReturnReason.find_or_create_by(name: "Missed estimated delivery date")
+Spree::ReturnReason.find_or_create_by(name: "Missing parts or accessories")
+Spree::ReturnReason.find_or_create_by(name: "Damaged/Defective")
+Spree::ReturnReason.find_or_create_by(name: "Different from what was ordered")
+Spree::ReturnReason.find_or_create_by(name: "Different from description")
+Spree::ReturnReason.find_or_create_by(name: "No longer needed/wanted")
+Spree::ReturnReason.find_or_create_by(name: "Accidental order")
+Spree::ReturnReason.find_or_create_by(name: "Unauthorized purchase")

data/db/spree_br/stock_locations.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 Spree::StockLocation.create_with(backorderable_default: true)
-                    .find_or_create_by!(name: 'default')
+  .find_or_create_by!(name: "default")

data/db/spree_br/store_credit.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-
 Spree::PaymentMethod.create_with(
   name: "Store Credit",
   description: "Store credit",
@@ -14,10 +13,10 @@ Spree::PaymentMethod.create_with(
 Spree::StoreCreditType.create_with(priority: 1).find_or_create_by!(name: Spree::StoreCreditType::EXPIRING)
 Spree::StoreCreditType.create_with(priority: 2).find_or_create_by!(name: Spree::StoreCreditType::NON_EXPIRING)
 
-Spree::ReimbursementType.create_with(name: "Store Credit").find_or_create_by!(type: 'Spree::ReimbursementType::StoreCredit')
-Spree::ReimbursementType.create_with(name: "Original").find_or_create_by!(type: 'Spree::ReimbursementType::OriginalPayment')
+Spree::ReimbursementType.create_with(name: "Store Credit").find_or_create_by!(type: "Spree::ReimbursementType::StoreCredit")
+Spree::ReimbursementType.create_with(name: "Original").find_or_create_by!(type: "Spree::ReimbursementType::OriginalPayment")
 
 Spree::StoreCreditCategory.find_or_create_by!(name: Spree::StoreCreditCategory::GIFT_CARD)
 Spree::StoreCreditCategory.find_or_create_by!(name: Spree::StoreCreditCategory::REIMBURSEMENT)
 
-Spree::StoreCreditReason.find_or_create_by!(name: 'Credit Given In Error')
+Spree::StoreCreditReason.find_or_create_by!(name: "Credit Given In Error")

data/db/spree_br/stores.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-unless Spree::Store.where(code: 'sample-store').exists?
+unless Spree::Store.where(code: "sample-store").exists?
   Spree::Store.create!(
     name: "Sample Store",
     code: "sample-store",

data/lib/generators/solidus_brazilian_adaptations/install/install_generator.rb

@@ -4,26 +4,26 @@ module SolidusBrazilianAdaptations
   module Generators
     class InstallGenerator < Rails::Generators::Base
       class_option :auto_run_migrations, type: :boolean, default: false
-      source_root File.expand_path('templates', __dir__)
+      source_root File.expand_path("templates", __dir__)
 
       def self.exit_on_failure?
         true
       end
 
       def copy_initializer
-        template 'initializer.rb', 'config/initializers/solidus_brazilian_adaptations.rb'
+        template "initializer.rb", "config/initializers/solidus_brazilian_adaptations.rb"
       end
 
       def add_migrations
-        run 'bin/rails railties:install:migrations FROM=solidus_brazilian_adaptations'
+        run "bin/rails railties:install:migrations FROM=solidus_brazilian_adaptations"
       end
 
       def run_migrations
-        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]')) # rubocop:disable Layout/LineLength
+        run_migrations = options[:auto_run_migrations] || ["", "y", "Y"].include?(ask("Would you like to run the migrations now? [Y/n]")) # rubocop:disable Layout/LineLength
         if run_migrations
-          run 'bin/rails db:migrate'
+          run "bin/rails db:migrate"
         else
-          puts 'Skipping bin/rails db:migrate, don\'t forget to run it!' # rubocop:disable Rails/Output
+          puts "Skipping bin/rails db:migrate, don't forget to run it!" # rubocop:disable Rails/Output
         end
       end
     end

data/lib/solidus_brazilian_adaptations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusBrazilianAdaptations
-  VERSION = "1.0.6"
+  VERSION = "1.0.8"
 end

data/solidus_brazilian_adaptations.gemspec

@@ -31,6 +31,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "solidus_support", "~> 0.5"
   spec.add_dependency "cpf_cnpj"
   spec.add_dependency "codigo_postal"
+  spec.add_dependency "solidus_i18n"
+  spec.add_dependency "rails-i18n"
+  spec.add_dependency "kaminari-i18n"
 
   spec.add_development_dependency "solidus_dev_support", "~> 2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_brazilian_adaptations
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - ulysses-bull
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-25 00:00:00.000000000 Z
+date: 2023-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -72,6 +72,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: solidus_i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: kaminari-i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +159,7 @@ files:
 - config/routes.rb
 - db/migrate/20230911133000_add_tax_id_to_spree_orders.rb
 - db/migrate/20230911133157_add_number_district_to_addresses.rb
+- db/migrate/20231107142354_add_delivery_time_to_spree_shipping_rate.rb
 - db/seeds.rb
 - db/spree_br/countries.rb
 - db/spree_br/payment.rb