solidus_bling 3.4.4 → 3.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39972f690b188582eb90995659ea1f965d304b6739cfd1ed758f40fc667c0191
-  data.tar.gz: 199818222481a6e2a8dc44c4eeae4e2fb7ee0fd38515d6bc1d9db9713b6519fc
+  metadata.gz: 96ae26320b68f766dc44bb621d62ea6588edca4942dd652e27f9db773b3746a7
+  data.tar.gz: 3cc77c798db3a3e13fae2af0825d3ab9f1c11b9cec025873d7858a47bbb8ad75
 SHA512:
-  metadata.gz: adca05171481ba6bd6f08aff36f050ef95ac0f30aa2233f5c660cbae4079212ed27e452a9360714b41cf4067459766885c33b47c1fb242a3ae6c017ac77e64f8
-  data.tar.gz: 390625e14a64fb80333a4de9f9d0d9470bd528f2bd43beba00117732209b610a94b837b56f04df13e9e2fcc1dde088b659b5580d8d4672888372e3ccf5dff896
+  metadata.gz: e84e85d97a04a3515d3dda9d97e46f8fe947bf15590d315f4fef2a4972d3804c903244e074e041e270d635015db561a1c72a62514ad7de8d25ca5ffeef3bce2e
+  data.tar.gz: 4cf11ba85c9efe1315a498ef9bde72528ee84de38c4768ee416d2bc222adf9897ebb50def3d382e5cd21728441cbaa41f361af7d8c25df31a7ae362b69053d50

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

@@ -38,9 +38,11 @@ module Spree
         def edit
           @payment_methods = ::Spree::PaymentMethod.all.pluck(:name, :id)
           @shipping_methods = ::Spree::ShippingMethod.all.pluck(:name, :id)
+          @sellers = @bling_account.sellers.actives.order(:name).pluck(:name, :id)
         end
 
         def update
+          @bling_account.sellers.find_by_id(params[:account]["default_seller"]).update(default: true)
           @bling_account.update account_params
           redirect_to edit_admin_solidus_bling_account_path(@bling_account.id)
         end
@@ -74,8 +76,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

data/app/models/solidus_bling/seller.rb

@@ -2,8 +2,8 @@ module SolidusBling
   class Seller < ApplicationRecord
     validates :name, presence: true
     validates :external_id, presence: true
-
     belongs_to :account
+    after_save :falsify_all_others
 
     def self.upsert_sellers account
       account.check_token
@@ -30,5 +30,9 @@ module SolidusBling
       sellers_inactive = where(external_id: ids_sellers_inactive)
       sellers_inactive.update_all(active: false)
     end
+
+    def falsify_all_others
+      self.class.where("id != ?", id).update(default: false) if default
+    end
   end
 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>
@@ -120,16 +119,20 @@
     <% end %>
   </fieldset>
 
-  <fieldset class="no-border-top text-center">
-    <legend>
-      Vendedor padrão
-    </legend>
-    <% if bling_account.sellers.default %>
-      <span><%= bling_account.sellers.default.name %></span>
-    <% else %>
-      <span>Vendedor padrão não selecionado</span>
-    <% end %>
-  </fieldset>
+  <% if @sellers %>
+    <fieldset class="no-border-top text-center">
+      <legend>
+        Vendedor padrão
+      </legend>
+      <div class="col-12 col-md-6 mx-auto">
+          <div class="field">
+             <%= form.select "default_seller", @sellers, {selected: ::SolidusBling::Seller.default&.id, include_blank: true }, { class: "custom-select fullwidth" } %>
+          </div>
+        </div>
+     
+    </fieldset>
+  <% end %>
+
 
 
   <div class="form-buttons filter-actions actions" data-hook="buttons">

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.4"
+  VERSION = "3.4.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bling
 version: !ruby/object:Gem::Version
-  version: 3.4.4
+  version: 3.4.6
 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