solidus_bling 3.5.3 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfb6330d68260e87ced786bc5cb615ae777fb9bd50c8df5787c59d5a1f545c71
-  data.tar.gz: 16767abe285165ed7d2d347648cc3da9fea601e6aeb25d5cac68474d988ecca9
+  metadata.gz: 7efd0c005698628f0d0471a083c711277abd72af98f17aaf9e83ffcea7691890
+  data.tar.gz: 25aed12e345d68a9815f58a3eed202166c919892e3e6a6e32900bf929e628461
 SHA512:
-  metadata.gz: 7da7c993d84a4e54c1d7d592e045a8b4407a28d2820c686f516d44e25be38885ad64e9dfed4bda763e3b85c171dc1ddc1d58b75c7baa66083b908951ff8a84cb
-  data.tar.gz: d65185e97df8a2cf0102df23c5eedb0cf8908db00276d55b4d9ff996f2ab7a2053c56b01fbe24d1e70bf7c36c0768c27d09e7061c6b670fda32af1b245339fcd
+  metadata.gz: da4d6eec527a7fe1e41910611d2ce3c2ae4334e7cbcbc6aa9777bf9d33d9bebae2de5de8048c8a5b904caf13a6fe0894b223cc62d3b592469bc0f3a2a7dcb51c
+  data.tar.gz: 0f30f0daf84d487e3a5fc9001a6b94a230f83ca7352d2e0f73c9ab6c97b0fb28760903571ead67049543c0d68594143770325b766d9ae2952074aa9d1022b131

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

@@ -55,7 +55,7 @@ module Spree
         def authorize
           bling_account = ::SolidusBling::Account.first
           code = params[:code]
-          unless ::SolidusBling::Token.new.authorize(bling_account, code)
+          unless bling_account.authorize(code: code)
             bling_account.errors.add(:base, "Erro ao autorizar aplicativo 🦆")
             flash[:error] = bling_account.errors.full_messages.join("\n")
           end

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

@@ -2,19 +2,16 @@ module Spree
   module Admin
     module SolidusBling
       class OrdersController < BaseController
-
         def update
           order = Spree::Order.find(params[:id])
           if order.bling_order_id
             flash[:error] = "Pedido já enviado"
-            redirect_to edit_admin_order_customer_path(order)
           else
             ::SolidusBling::SendOrderJob.perform_later(order)
             flash[:success] = "O pedido está sendo enviado"
-            redirect_to edit_admin_order_customer_path(order)
           end
+          redirect_to edit_admin_order_customer_path(order)
         end
-
       end
     end
   end

data/app/jobs/solidus_bling/send_order_job.rb

@@ -3,16 +3,7 @@ module SolidusBling
     queue_as :default
 
     def perform(order)
-      bling_event = SolidusBling::Event.new(internal_id: order.id, body: order.to_json)
-      begin
-        SolidusBling::Order.new(order).send
-        bling_event.status = "success"
-      rescue => e
-        bling_event.status = "error"
-        bling_event.message = e.to_json
-      ensure
-        bling_event.save!
-      end
+      SolidusBling::Order.new(order).send
     end
   end
 end

data/app/models/solidus_bling/account.rb

@@ -5,10 +5,14 @@ module SolidusBling
     has_many :sellers, dependent: :destroy
     accepts_nested_attributes_for :payment_methods, :shipping_methods, :sellers
 
-    def check_token
-      return if client_id.blank? || client_secret.blank? || refresh_token.blank?
-      return if (token_expires_in - 1.hour).utc > DateTime.now.utc
-      Token.new.refresh self
+    def authorize(code:)
+      client = BlingApi::Client.new(client_id:, client_secret:)
+      client.authorize(code:)
+      update(
+        refresh_token: client.get_refresh_token,
+        access_token: client.access_token,
+        token_expires_in: client.token_expires_at
+      )
     end
   end
 end

data/app/models/solidus_bling/bling_client.rb

@@ -0,0 +1,34 @@
+module SolidusBling
+  class BlingClient < ::BlingApi::Client
+    def self.for_account(account)
+      self.new(account)
+    end
+
+    attr_accessor :account
+    def initialize(account)
+      @account = account
+      super(
+        client_id: account.client_id,
+        client_secret: account.client_secret,
+        refresh_token: account.refresh_token,
+        access_token: account.access_token,
+        token_expires_at: account.token_expires_in
+      )
+    end
+
+    def refresh_token
+      super
+      sync_account_tokens
+    end
+
+    private
+
+    def sync_account_tokens
+      account.update!(
+        access_token: access_token,
+        refresh_token: get_refresh_token,
+        token_expires_in: token_expires_at
+      )
+    end
+  end
+end

data/app/models/solidus_bling/order.rb

@@ -6,94 +6,83 @@ module SolidusBling
 
     def send
       @account = SolidusBling::Account.first
-      @account.check_token
-      BlingApi.configure { |config| config.access_token = @account.access_token }
+      @client = SolidusBling::BlingClient.for_account(@account)
 
-      contato = customer
-      items = products
-      parcelas = installments
+      contato = upsert_customer
+      itens = build_bling_items
+      parcelas = build_bling_installments
       observacoes_internas = internal_observations
-      transporte = shipment
+      transporte = build_bling_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(
+      response = @client.create_order(
+        data: @order.completed_at.strftime("%Y-%m-%d"),
         id_contato: contato.id,
+        itens: itens,
+        numero_pedido: @order.number,
+        id_loja: @account.external_store_id,
+        parcelas: parcelas,
+        transporte: transporte,
+        id_vendedor: id_vendedor,
         pessoa_juridica: @order.tax_id.length > 14,
         numero_documento: @order.tax_id,
-        items: items,
-        parcelas: parcelas,
-        numero_loja: @order.number,
-        data: @order.completed_at.strftime("%Y-%m-%d"),
-        total_produtos: @order.item_total.to_f,
-        total: @order.total.to_f,
-        id_loja: @account.external_store_id,
+        id_categoria_receita: id_categoria_receita,
         observacoes: "Número do pedido loja: #{@order.number}",
         observacoes_internas: observacoes_internas,
-        valor_desconto: @order.adjustment_total.abs,
-        id_categoria: id_categoria_receita,
-        transporte: transporte,
-        id_vendedor: id_vendedor
-      ).create
+        valor_desconto: @order.adjustment_total.abs
+      )
 
-      if bling_order
-        @order.update(bling_order_id: bling_order.id)
-      end
+      @order.update(bling_order_id: response.data.id)
+      puts "Pedido #{@order.number} enviado"
     end
 
-    def customer
-      contato = BlingApi::Customer.find_by_tax_id(@order.tax_id)
-      if contato
-        contato.update(
+    def upsert_customer
+      search_contato = @client.find_contact_by_document_number(@order.tax_id).data
+      contact_id = if search_contato.any?
+        @client.update_contact(
+          id: search_contato[0].id,
           pessoa_juridica: @order.tax_id.length > 14,
           numero_documento: @order.tax_id,
           situacao: "A",
-          codigo: contato.codigo,
-          vendedor: contato.vendedor,
-          dados_adicionais: contato.dados_adicionais,
-          financeiro: contato.financeiro,
-          pais: contato.pais,
-          tipos_contato: contato.tipos_contato,
-          pessoa_contato: contato.pessoa_contato,
           **build_customer
         )
+        search_contato[0].id
       else
-        contato = BlingApi::Customer.new(
+        response = @client.create_contact(
           pessoa_juridica: @order.tax_id.length > 14,
           numero_documento: @order.tax_id,
-          cod_contribuinte: (@order.tax_id.length > 14) ? nil : "9",
           situacao: "A",
+          cod_contribuinte: (@order.tax_id.length > 14) ? nil : "9",
           **build_customer
-        ).create
+        )
+        response.data.id
       end
-      contato
+      @client.get_contact(contact_id).data
     end
 
-    def products
+    def build_bling_items
       @order.line_items.map do |item|
-        product = BlingApi::Product.find_by_sku(item.sku)
-        {
-          id: product.id,
+        product = @client.find_product_by_sku(item.sku).data
+        raise "Produto com SKU #{item.sku} não encontrado no Bling" if product.blank?
+        BlingApi::Item.new(
+          id_produto: product[0].id,
+          codigo: item.sku,
           quantidade: item.quantity,
-          valor: item.price.to_f,
-          produto: {
-            id: product.id
-          }
-        }
+          valor: item.price.to_f
+        )
       end.compact
     end
 
-    def installments
+    def build_bling_installments
       @parcelas = @order.payments.last.source.try(:installments) || 1
       valor_parcela = @order.total.to_f / @parcelas
       1.upto(@parcelas).map do |parcela|
-        {
-          dataVencimento: (@order.completed_at + parcela.months).strftime("%Y-%m-%d"),
+        BlingApi::Installment.new(
+          id_forma_pagamento: @account.payment_methods.find_by(spree_payment_method_id: @order.payments.last.payment_method_id).external_id,
           valor: valor_parcela,
-          formaPagamento: {
-            id: @account.payment_methods.find_by(spree_payment_method_id: @order.payments.last.payment_method_id).external_id
-          }
-        }
+          data_vencimento: (@order.completed_at + parcela.months).strftime("%Y-%m-%d")
+        )
       end
     end
 
@@ -107,40 +96,32 @@ module SolidusBling
         build_order_url.to_s
     end
 
-    def shipment
+    def build_bling_shipment
       shipping_method = @account.shipping_methods.find_by(spree_shipping_method_id: @order.shipments.last.shipping_method.id)
       servico = shipping_method.nil? ? "" : shipping_method.alias
       transportadora = shipping_method.nil? ? "" : shipping_method.company
-      {
-        fretePorConta: 1,
-        frete: @order.shipment_total.to_f,
-        quantidadeVolumes: 1,
-        contato: {
-          nome: transportadora
-        },
-        etiqueta: {
-          nome: @order.ship_address.name.strip,
-          endereco: @order.ship_address.address1.strip,
-          numero: @order.ship_address.number.strip,
-          complemento: @order.ship_address.address2.strip,
-          municipio: @order.ship_address.city.strip,
-          uf: @order.ship_address.state.abbr.strip,
-          bairro: @order.ship_address.district.strip,
-          cep: @order.ship_address.zipcode.strip,
-          nomePais: "Brasil"
-        },
-        volumes: [
-          {
-            servico: servico,
-            codigoRastreamento: ""
-          }
-        ]
-      }
+
+      BlingApi::Shipment.new(
+        valor_frete: @order.shipment_total.to_f,
+        nome_transportadora: transportadora,
+        frete_por_conta: 1,
+        quantidade_volumes: 1,
+        nome_etiqueta: @order.ship_address.name.strip,
+        endereco: @order.ship_address.address1.strip,
+        numero: @order.ship_address.number.strip,
+        complemento: @order.ship_address.address2.strip,
+        municipio: @order.ship_address.city.strip,
+        uf: @order.ship_address.state.abbr.strip,
+        bairro: @order.ship_address.district.strip,
+        cep: @order.ship_address.zipcode.strip,
+        pais: "Brasil",
+        nome_servico: servico
+      )
     end
 
     def seller_external_id
       seller = SolidusBling::Seller.find_by_id(@order.solidus_bling_seller_id)
-      if seller&.active_from_api?
+      if seller && @client.get_seller(seller.external_id).data.contato.situacao == "A"
         seller.external_id
       else
         SolidusBling::Seller.default.external_id
@@ -152,24 +133,20 @@ module SolidusBling
         nome: @order.nf_name&.strip || @order.bill_address.name.strip,
         telefone: @order.bill_address.phone.strip,
         email: @order.email.strip,
-        endereco: {
-          "endereco" => @order.bill_address.address1.strip,
-          "cep" => @order.bill_address.zipcode.strip,
-          "bairro" => @order.bill_address.district.strip,
-          "municipio" => @order.bill_address.city.strip,
-          "uf" => @order.bill_address.state.abbr.strip,
-          "numero" => @order.bill_address.number.strip,
-          "complemento" => @order.bill_address.address2.strip
-        },
-        endereco_cobranca: {
-          "endereco" => @order.bill_address.address1.strip,
-          "cep" => @order.bill_address.zipcode.strip,
-          "bairro" => @order.bill_address.district.strip,
-          "municipio" => @order.bill_address.city.strip,
-          "uf" => @order.bill_address.state.abbr.strip,
-          "numero" => @order.bill_address.number.strip,
-          "complemento" => @order.bill_address.address2.strip
-        }
+        endereco: @order.bill_address.address1.strip,
+        endereco_cep: @order.bill_address.zipcode.strip,
+        endereco_bairro: @order.bill_address.district.strip,
+        endereco_municipio: @order.bill_address.city.strip,
+        endereco_uf: @order.bill_address.state.abbr.strip,
+        endereco_numero: @order.bill_address.number.strip,
+        endereco_complemento: @order.bill_address.address2.strip,
+        endereco_cob: @order.bill_address.address1.strip,
+        endereco_cob_cep: @order.bill_address.zipcode.strip,
+        endereco_cob_bairro: @order.bill_address.district.strip,
+        endereco_cob_municipio: @order.bill_address.city.strip,
+        endereco_cob_uf: @order.bill_address.state.abbr.strip,
+        endereco_cob_numero: @order.bill_address.number.strip,
+        endereco_cob_complemento: @order.bill_address.address2.strip
       }
     end
 

data/app/models/solidus_bling/seller.rb

@@ -6,11 +6,15 @@ module SolidusBling
     after_save :falsify_all_others
 
     def self.upsert_sellers account
-      account.check_token
-      BlingApi.configure { |config| config.access_token = account.access_token }
-
-      sellers = BlingApi::Seller.get_sellers
-      upsert_sellers = sellers.map { |seller| {name: seller[:nome], external_id: seller[:id], account_id: account.id, active: true} }
+      client = BlingApi::Client.new(
+        client_id: account.client_id,
+        client_secret: account.client_secret,
+        refresh_token: account.refresh_token,
+        access_token: account.access_token,
+        token_expires_at: account.token_expires_in
+      )
+      sellers = client.get_sellers(1, 100, "A").data
+      upsert_sellers = sellers.map { |seller| {name: seller.contato.nome, external_id: seller.id, account_id: account.id, active: true} }
       SolidusBling::Seller.upsert_all(upsert_sellers, unique_by: :external_id)
       inactivate_sellers(sellers)
     end
@@ -23,10 +27,6 @@ module SolidusBling
       where(active: true)
     end
 
-    def active_from_api?
-      BlingApi::Seller.find_by_id(external_id).try(:situacao) == "A"
-    end
-
     def self.inactivate_sellers sellers_bling
       ids_sellers_bling = sellers_bling.pluck(:id)
       ids_sellers_store = pluck(:external_id).map(&:to_i)

data/lib/solidus_bling/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bling
 version: !ruby/object:Gem::Version
-  version: 3.5.3
+  version: 4.0.0
 platform: ruby
 authors:
 - Todas Essas Coisas
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_brazilian_adaptations
@@ -38,7 +37,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email: hamiltontubo@gmail.com
 executables: []
 extensions: []
@@ -53,12 +51,12 @@ files:
 - app/jobs/solidus_bling/send_order_job.rb
 - app/jobs/solidus_bling/upsert_sellers_job.rb
 - app/models/solidus_bling/account.rb
+- app/models/solidus_bling/bling_client.rb
 - app/models/solidus_bling/event.rb
 - app/models/solidus_bling/order.rb
 - app/models/solidus_bling/payment_method.rb
 - app/models/solidus_bling/seller.rb
 - app/models/solidus_bling/shipping_method.rb
-- app/models/solidus_bling/token.rb
 - app/models/spree/permission_sets/seller_update.rb
 - app/subscribers/solidus_bling/subscriber.rb
 - app/views/spree/admin/orders/sellers/edit.html.erb
@@ -93,7 +91,6 @@ files:
 homepage: https://github.com/todasessascoisas/solidus_bling
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -111,8 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Solidus extension to integrate with the Bling
 test_files: []

data/app/models/solidus_bling/token.rb

@@ -1,40 +0,0 @@
-module SolidusBling
-  class Token < ::Ac::Base
-    BASE_URL = "https://www.bling.com.br/Api/v3"
-
-    def authorize bling_account, code
-      basic_encoded = Base64.strict_encode64("#{bling_account.client_id}:#{bling_account.client_secret}")
-      headers = {
-        "Content-Type": "application/x-www-form-urlencoded",
-        Authorization: "Basic #{basic_encoded}"
-      }
-      body = {
-        code: code,
-        grant_type: "authorization_code"
-      }
-      response_json = post("/oauth/token", headers:, body:).json
-      bling_account.update(
-        access_token: response_json["access_token"],
-        token_expires_in: DateTime.now.utc + response_json["expires_in"].seconds,
-        refresh_token: response_json["refresh_token"]
-      )
-    rescue
-      false
-    end
-
-    def refresh bling_account
-      response_json = BlingApi::Client.new.refresh_token(
-        client_id: bling_account.client_id,
-        client_secret: bling_account.client_secret,
-        refresh_token: bling_account.refresh_token
-      )
-      bling_account.update(
-        access_token: response_json["access_token"],
-        token_expires_in: DateTime.now.utc + response_json["expires_in"].seconds,
-        refresh_token: response_json["refresh_token"]
-      )
-    rescue
-      false
-    end
-  end
-end