solidus_bling 3.4.3 → 3.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 474c1d7250f5abafe50d9c1b70978e78a16ee1d4954b85ca631be3829364a4c5
-  data.tar.gz: 3b2ed9546da3d3f3cd8a4e558ea4f5ef8ec09488e748f94fa3a95c602b1f8765
+  metadata.gz: 86fb55a042d40aa34d5eaf3c1dc697d189a8ab9d5bdf551410871eb002b816bd
+  data.tar.gz: b95270aa77365172bdab967704f0ad64ee4e3b26cef5daed44a007c80fd5892e
 SHA512:
-  metadata.gz: 8c0e2b194f2b37c398c8e8afc7edfd62b7ef85553ba6a0b398351c95c28e06268813b3da0c20476469ce71da3f1e372fb99a89757158f053872a916d3e9b4de7
-  data.tar.gz: 99c3756b1fdc64462729d68c12dc29329eb9e127fe95c1dcbaa7a30d861cfb55f0ce5a06b82b7a8e395be157130d16df25457f37310147f085942d2c9afd837f
+  metadata.gz: 64986dd4c0f9177c8ae667c8414d6b28e4aad0c0e821f614241c29ae426ebb8325993c0c3e4943dd8b7b7a1e2ce64bffc82a069de49c0faec72aca5cf141d536
+  data.tar.gz: f76a22b611035be87d7a326bb67441807df7b4ef115be32454a4b93691abc14b2716f0d929ab35a02a095400fe62a0bbad4b7c857bf00944d4f44aa402fab858

data/app/controllers/spree/admin/solidus_bling/accounts_controller.rb

@@ -74,8 +74,8 @@ module Spree
 
         def account_params
           params.require(:account).permit(
-            :client_id, :client_secret, :refresh_token, :redirect_url, :state, :access_token, :api_key, :external_store_id, :incoming_category_id,
-            payment_methods_attributes: [:id, :spree_payment_method_id, :external_id],
+            :client_id, :client_secret, :refresh_token, :redirect_url, :state, :access_token, :api_key, :external_store_id,
+            payment_methods_attributes: [:id, :spree_payment_method_id, :external_id, :incoming_category_id],
             shipping_methods_attributes: [:id, :spree_shipping_method_id, :alias, :company],
             sellers_attributes: [:id, :name, :external_id]
           )

data/app/models/solidus_bling/order.rb

@@ -15,6 +15,7 @@ module SolidusBling
       observacoes_internas = internal_observations
       transporte = shipment
       id_vendedor = seller_external_id
+      id_categoria_receita = @account.payment_methods.find_by(spree_payment_method_id: @order.payments.last.payment_method_id).incoming_category_id
 
       bling_order = BlingApi::Order.new(
         id_contato: contato.id,
@@ -30,7 +31,7 @@ module SolidusBling
         observacoes: "Número do pedido loja: #{@order.number}",
         observacoes_internas: observacoes_internas,
         valor_desconto: @order.adjustment_total.abs,
-        id_categoria: @account.incoming_category_id,
+        id_categoria: id_categoria_receita,
         transporte: transporte,
         id_vendedor: id_vendedor
       ).create
@@ -183,7 +184,7 @@ module SolidusBling
       payment_method = order.payments.valid.last&.payment_method
       importation_rules = SolidusBling.config.importation_rules
       if importation_rules
-        order.total >= importation_rules[:amount] && importation_rules[:payment_methods].include?(payment_method.type)
+        order.total >= importation_rules[:amount] && importation_rules[:payment_methods].include?(payment_method&.type)
       else
         false
       end

data/app/views/spree/admin/solidus_bling/accounts/_form.html.erb

@@ -25,13 +25,6 @@
             <%= form.text_field :external_store_id, required: true, class: 'fullwidth' %>
             <%= form.error_message_on :external_store_id %>
           <% end %>
-
-          <%= form.field_container :incoming_category_id do %>
-            <%= form.label :incoming_category_id, "ID Categoria Receita", class: 'required' %>
-            <%= form.text_field :incoming_category_id, required: true, class: 'fullwidth' %>
-            <%= form.error_message_on :incoming_category_id %>
-          <% end %>
-
         </div>
 
         <div class="col-12 col-md-6">
@@ -76,18 +69,24 @@
     </legend>
     <%= form.fields_for :payment_methods do |payment_form| %>
       <div class="row">
-        <div class="col-12 col-md-6">
+        <div class="col-12 col-md-4">
           <div class="field">
             <%= payment_form.label :spree_payment_method_id, "Método de Pagamento", class: 'required' %>
             <%= payment_form.select :spree_payment_method_id, @payment_methods, {}, { class: "custom-select fullwidth" } %>
           </div>
         </div>
-        <div class="col-12 col-md-6">
+        <div class="col-12 col-md-4">
           <div class="field">
             <%= payment_form.label :external_id, "ID Forma de Pagamento", class: 'required' %>
             <%= payment_form.text_field :external_id, required: true, class:"fullwidth" %>
           </div>
         </div>
+        <div class="col-12 col-md-4">
+          <div class="field">
+            <%= payment_form.label :incoming_category_id, "ID Categoria Receita", class: 'required' %>
+            <%= payment_form.text_field :incoming_category_id, required: true, class:"fullwidth" %>
+          </div>
+        </div>
       </div>
     <% end %>
   </fieldset>

data/db/migrate/20240830124253_add_incoming_category_id_on_payment_method.rb

@@ -0,0 +1,5 @@
+class AddIncomingCategoryIdOnPaymentMethod < ActiveRecord::Migration[7.1]
+  def change
+    add_column :solidus_bling_payment_methods, :incoming_category_id, :string
+  end
+end

data/db/migrate/20240830124611_remove_incoming_category_id_from_account.rb

@@ -0,0 +1,5 @@
+class RemoveIncomingCategoryIdFromAccount < ActiveRecord::Migration[7.1]
+  def change
+    remove_column :solidus_bling_accounts, :incoming_category_id, :string
+  end
+end

data/lib/solidus_bling/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusBling
-  VERSION = "3.4.3"
+  VERSION = "3.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bling
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.4.5
 platform: ruby
 authors:
 - Todas Essas Coisas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-23 00:00:00.000000000 Z
+date: 2024-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -151,6 +151,8 @@ files:
 - db/migrate/20240318171147_add_solidus_bling_seller_id_to_orders.rb
 - db/migrate/20240318180555_add_deafult_column_to_sellers.rb
 - db/migrate/20240424112257_add_active_column_to_sellers.rb
+- db/migrate/20240830124253_add_incoming_category_id_on_payment_method.rb
+- db/migrate/20240830124611_remove_incoming_category_id_from_account.rb
 - lib/generators/solidus_bling/install/install_generator.rb
 - lib/generators/solidus_bling/install/templates/initializer.rb
 - lib/solidus_bling.rb