solidus_brazilian_adaptations 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abf9b101cad24f96d6b95af4b1c1587666d279a7ec9c38cd6eadf80588c2de3a
-  data.tar.gz: cea1c5c853b54b8b10dc962476b05fe04f2f9819155e14cf3e3c5931919c055e
+  metadata.gz: 24fa67771b38cee0a4d92caf9fdae494846fb87023ddfce3f3ed4077433661e7
+  data.tar.gz: 2adf6fce94c6ebdc966e6ff986daf61462e92dc0576de84f47b8e4d2ac2f0e22
 SHA512:
-  metadata.gz: df1c8d4801d1a4c440c86ecdf94954145053cbbfd42ca61b365b4f93c22b6c38f0868645b73a0456bd9d0a07abc7b9c3bfb9038ed9998e1502e4a76e8dff15a2
-  data.tar.gz: 48da079873137eddebd6b0e1fdaf62605cd11446abaacff3641493429943395b3f187c2337382dad2f9be5c3921e7c0011a365ceefe6319283eab60732e0e5dc
+  metadata.gz: 77d168c0c7ad3c0cb2993817009a04a8cece0c88d1a5abf9ed9536ad594d34ca709d9069e7b4fb131fdf30c536c8362fd9f0755a46e75b185cdc4b5db87e7320
+  data.tar.gz: c37f09bace53817ef175c4758c199767726c466ef2399327bbf24b7275fe3526b90d8869bb28827f58d448813b39843140cb9cfa3f025b8ce5cd4c33405984a8

data/app/overrides/address_validations.rb

@@ -0,0 +1,10 @@
+module AddressValidations
+  extend ActiveSupport::Concern
+
+  prepended do
+    validates :number, presence: true
+    validates :district, presence: true
+  end
+
+  ::Spree::Address.prepend self
+end

data/app/overrides/order_validations.rb

@@ -0,0 +1,35 @@
+module OrderValidations
+  extend ActiveSupport::Concern
+
+  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)
+      if document.valid?
+        if document.document_type == :cnpj && cnpj_allowed == false
+          errors.add(:base, "Insira um CPF, não um CNPJ.")
+        end
+      else
+        errors.add(:base, "#{cnpj_allowed ? "CPF/CPNJ" : "CPF"} inválido.")
+      end
+    end
+
+    def format_tax_id
+      document = TaxIdBr.new(tax_id)
+      self.tax_id = document.formatted
+    end
+  end
+
+  ::Spree::Order.prepend self
+end

data/lib/solidus_brazilian_adaptations/version.rb

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

data/lib/solidus_brazilian_adaptations.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "cpf_cnpj"
+require "codigo_postal"
 require "solidus_brazilian_adaptations/configuration"
 require "solidus_brazilian_adaptations/version"
 require "solidus_brazilian_adaptations/engine"

data/solidus_brazilian_adaptations.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "solidus_core", [">= 2.0.0", "< 5"]
   spec.add_dependency "solidus_support", "~> 0.5"
   spec.add_dependency "cpf_cnpj"
+  spec.add_dependency "codigo_postal"
 
   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.5
+  version: 1.0.6
 platform: ruby
 authors:
 - ulysses-bull
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-24 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -58,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codigo_postal
+  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
@@ -89,8 +103,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/decorators/models/solidus_brazilian_adaptations/spree/order_decorator.rb
-- app/modules/tax_id_br.rb
+- app/models/tax_id_br.rb
+- app/overrides/address_validations.rb
+- app/overrides/order_validations.rb
 - bin/console
 - bin/rails
 - bin/rails-engine

data/app/decorators/models/solidus_brazilian_adaptations/spree/order_decorator.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module SolidusBrazilianAdaptations
-  module Spree
-    module OrderDecorator
-      def self.prepended(base)
-        base.class_eval do
-          validate :verify, if: :email_required?
-          before_update :format_tax_id
-
-          def verify
-            cnpj_allowed = SolidusBrazilianAdaptations.config.allow_cnpj
-            document = TaxIdBr.new(tax_id)
-            if document.valid?
-              if document.document_type == :cnpj && cnpj_allowed == false
-                errors.add(:base, "Insira um CPF, não um CNPJ.")
-              end
-            else
-              errors.add(:base, "#{cnpj_allowed ? "CPF/CPNJ" : "CPF"} inválido.")
-            end
-          end
-
-          def format_tax_id
-            document = TaxIdBr.new(tax_id)
-            self.tax_id = document.formatted
-          end
-        end
-      end
-
-      ::Spree::Order.prepend self
-    end
-  end
-end