solidus_bling 2.0.7 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6174ab1749491921d0e680b8b72635346b35cc38155d40b1ef0dc6a50a75ade
-  data.tar.gz: 87b31e5d61269b0fe8999bee491d565853494aabbeebda3902d5c2336bafcd8f
+  metadata.gz: '06007929028aa91ff59c2aa725b53c6e68b177ac56d4e5c53a4443b645dabc17'
+  data.tar.gz: de6672cddf389140fdafb5b2580bc98e93d9c8a989b6769a6dcf5581d982948d
 SHA512:
-  metadata.gz: e128a60e203a6bcc189a70152bc46d3a254616162cf06e1b1ba3e8722b7b61705a7af171081bd32d8fe7df4e044ba49325d6970350b3605b4b38d0ef2a388633
-  data.tar.gz: 7b46c4aead25b783e38df50bc1c64f19e8797bd13f5ed470eaa8d5b006354e339c84f9d02d2639eda4371a3b1cbafe4f4c0c2a30ba38024d9343e48eab125376
+  metadata.gz: a55d2735828682b6ab1e53f25683e678fd33f3ec893ea568ed8f963430f908096da5c52b886c0f9905b87facf2909cc7144cd526578336803aff14c3fe5b688e
+  data.tar.gz: 9cd9a628c2ecdbd68a7f300ce0a6d2dc108ff3679c65812d532421232415c702bb0f80e618e08666a1ba7011ceab7f8729847d78f00b16241297c1a2a984bdf1

data/.gitattributes

@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto

data/.gitignore

@@ -19,4 +19,3 @@ spec/examples.txt
 .rvmrc
 .ruby-version
 .ruby-gemset
-release.sh

data/CHANGELOG.md

@@ -1,5 +1,3 @@
 # Changelog
 
-
-
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
+See https://github.com/solidusio-contrib/solidus_bling/releases or OLD_CHANGELOG.md for older versions.

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/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2023 ulysses-bull
+Copyright (c) 2023 Hamilton Tumenas Borges
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/README.md

@@ -70,4 +70,4 @@ Please refer to the [dedicated page](https://github.com/solidusio/solidus/wiki/H
 
 ## License
 
-Copyright (c) 2023 ulysses-bull, released under the New BSD License.
+Copyright (c) 2023 Hamilton Tumenas Borges, released under the New BSD License.

data/Rakefile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"
-require 'solidus_dev_support/rake_tasks'
+require "solidus_dev_support/rake_tasks"
 SolidusDevSupport::RakeTasks.install
 
-task default: 'extension:specs'
+task default: "extension:specs"

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

@@ -0,0 +1,80 @@
+module Spree
+  module Admin
+    module SolidusBling
+      class AccountsController < BaseController
+        before_action :set_account, only: [:show, :edit, :update, :destroy]
+
+        def index
+          @accounts = ::SolidusBling::Account.all
+        end
+
+        def show
+        end
+
+        def new
+          if ::SolidusBling::Account.any?
+            flash[:error] = "Você só pode ter uma conta Bling cadastrada"
+            redirect_to admin_solidus_bling_accounts_path
+          end
+          @bling_account = ::SolidusBling::Account.new
+          @payment_methods = ::Spree::PaymentMethod.all.pluck(:name, :id)
+          @shipping_methods = ::Spree::ShippingMethod.all.pluck(:name, :id)
+          @bling_account.payment_methods.build
+          @bling_account.shipping_methods.build
+          @bling_account.sellers.build
+        end
+
+        def create
+          bling_account = ::SolidusBling::Account.new account_params
+          if bling_account.save
+            flash[:success] = "Conta criada com sucesso"
+            redirect_to admin_solidus_bling_accounts_path
+          else
+            flash[:error] = bling_account.errors.full_messages.join("\n")
+            redirect_to new_admin_solidus_bling_account_path
+          end
+        end
+
+        def edit
+          @payment_methods = ::Spree::PaymentMethod.all.pluck(:name, :id)
+          @shipping_methods = ::Spree::ShippingMethod.all.pluck(:name, :id)
+        end
+
+        def update
+          @bling_account.update account_params
+          redirect_to edit_admin_solidus_bling_account_path(@bling_account.id)
+        end
+
+        def destroy
+          @bling_account.delete
+          redirect_to admin_solidus_bling_accounts_path
+        end
+
+        def authorize
+          bling_account = ::SolidusBling::Account.first
+          code = params[:code]
+          unless ::SolidusBling::Token.new.authorize(bling_account, code)
+            bling_account.errors.add(:base, "Erro ao autorizar aplicativo 🦆")
+            flash[:error] = bling_account.errors.full_messages.join("\n")
+          end
+          redirect_to edit_admin_solidus_bling_account_path(bling_account.id)
+        end
+
+        private
+
+        def set_account
+          @bling_account = ::SolidusBling::Account.find(params[:id])
+        end
+
+        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],
+            shipping_methods_attributes: [:id, :spree_shipping_method_id, :alias, :company],
+            sellers_attributes: [:id, :name, :external_id]
+          )
+        end
+      end
+    end
+  end
+end

data/app/jobs/solidus_bling/order_job.rb

@@ -2,19 +2,16 @@ module SolidusBling
   class OrderJob < ApplicationJob
     queue_as :default
 
-    def perform event:, method_name:
-      bling_event = SolidusBling::Event.new
+    def perform(event:)
       order = event[:order]
-      bling_event.internal_id = order.id
-      bling_event.method = method_name
+      bling_event = SolidusBling::Event.new(internal_id: order.id, body: order.to_json)
       begin
         SolidusBling::Order.new(order).send
-        bling_event.status = 'success'
+        bling_event.status = "success"
       rescue => e
-        bling_event.status = 'error'
+        bling_event.status = "error"
         bling_event.message = e.to_json
       ensure
-        bling_event.body = order.to_json
         bling_event.save!
       end
     end

data/app/models/solidus_bling/account.rb

@@ -2,8 +2,13 @@ module SolidusBling
   class Account < ApplicationRecord
     has_many :payment_methods, dependent: :destroy
     has_many :shipping_methods, dependent: :destroy
-    has_many :products, dependent: :destroy
     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.day) > DateTime.now
+      Token.new.refresh self
+    end
   end
 end

data/app/models/solidus_bling/order.rb

@@ -1,136 +1,161 @@
 module SolidusBling
-  class Order < SolidusBling::Api
-
-    def initialize order
-      super(SolidusBling::Account.first)
-      @order = order
+  class Order
+    def initialize spree_order
+      @order = spree_order
     end
 
     def send
-      if @order.present?
-        contato = SolidusBling::Contact.new(@order, @account)
-        hash_order = build_hash_order(@order, contato.info)
-        begin
-          attempts ||= 1
-          req = Typhoeus.post("#{@account.api_base_url}/pedidos/vendas", headers: @headers, body: JSON.dump(hash_order))
-          raise if req.code == 429
-        rescue
-          retry if (attempts += 1) < 5
-        ensure
-          json = JSON.parse(req.body)
-          response_has_error?(json)
-          if json.include? "data"
-            @order.bling_order_id = json["data"]["id"]
-            @order.save
-          end
-        end
-      end
-    end
+      @account = SolidusBling::Account.first
+      @account.check_token
+      BlingApi.configuration.access_token = @account.access_token
 
-    private
-    
-    def build_hash_order order, contato
-      {
-        "numeroLoja": order.number,
-        "data": order.completed_at.strftime("%Y-%m-%d"),
-        "loja": {
-          "id": @account.external_store_id
-        },
-        "contato": {
-          "id": contato["id"]
-        },
-        "itens": build_array_items(order.line_items),
-        "vendedor": {
-          "id": @account.sellers.first.external_id
-        },
-        "transporte": build_hash_transporte(order),
-        "parcelas": build_array_parcelas(order),
-        "desconto": {
-          "valor": order.promo_total&.to_f.abs || 0,
-          "unidade": "REAL"
-        },
-        "totalProdutos": order.item_total.to_f,
-        "total": order.total.to_f,
-        "observacoes": " Nº Pedido Loja: #{order.number}",
-        "observacoesInternas": "Pagamento: #{@parcelas}x R$ #{(order.total.to_f / @parcelas).round(2)}\nForma de envio: #{order.shipments.last.selected_shipping_rate.name}\n#{build_cupons(order.promotions)}#{build_order_url(order)}",
-        "categoria": {
-          "id": @account.incoming_category_id
-        }
-      }
+      contato = costumer
+      items = products
+      parcelas = installments
+      observacoes_internas = internal_observations
+      transporte = shipment
+
+      bling_order = BlingApi::Order.new(
+        id_contato: contato.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,
+        observacoes: "Número do pedido loja: #{@order.number}",
+        observacoes_internas: observacoes_internas,
+        valor_desconto: @order.adjustment_total,
+        id_categoria: @account.incoming_category_id,
+        transporte: transporte,
+        id_vendedor: @account.sellers.first.external_id
+      ).create
     end
 
-    def build_order_url order
-      "Link para o pedido: #{order.store.url}/orders/#{order.number}/token/#{order.guest_token}"
+    def costumer
+      contato = BlingApi::Customer.find_by_tax_id(@order.tax_id)
+      if contato
+        contato.update(
+          pessoa_juridica: @order.tax_id.length > 14,
+          numero_documento: @order.tax_id,
+          **build_customer
+        )
+      else
+        contato = BlingApi::Customer.new(
+          pessoa_juridica: @order.tax_id.length > 14,
+          numero_documento: @order.tax_id,
+          **build_customer
+        ).create
+      end
+      contato
     end
 
-    def build_array_items items
-      items.map do |item|
-        bling_product = SolidusBling::Product.find_by(sku: item.sku)
+    def products
+      @order.line_items.map do |item|
+        product = BlingApi::Product.find_by_sku(item.sku)
         {
-          "id": bling_product.external_id,
-          "quantidade": item.quantity,
-          "valor": item.price.to_f,
-          "produto": {
-            "id": bling_product.external_id
+          id: product.id,
+          quantidade: item.quantity,
+          valor: item.price.to_f,
+          produto: {
+            id: product.id
           }
         }
-      end
+      end.compact
     end
 
-    def build_array_parcelas order
-      @parcelas = 1
-      if order.payments.last.source
-        @parcelas = order.payments.last.source.try(:installments) || 1
-      end
-      valor_parcela = order.total.to_f / @parcelas
+    def 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"),
-          "valor": valor_parcela,
-          "formaPagamento": {
-            "id": @account.payment_methods.find_by(spree_payment_method_id: order.payments.last.payment_method_id).external_id
+          dataVencimento: (@order.completed_at + parcela.months).strftime("%Y-%m-%d"),
+          valor: valor_parcela,
+          formaPagamento: {
+            id: @account.payment_methods.find_by(spree_payment_method_id: @order.payments.last.payment_method_id).external_id
           }
         }
       end
     end
 
-    def build_hash_transporte order
-      shipping_method = @account.shipping_methods.find_by(spree_shipping_method_id: order.shipments.last.shipping_method.id)
+    def internal_observations
+      "Pagamento: #{@parcelas}x R$ #{(@order.total.to_f / @parcelas).round(2)}" +
+        "\n" +
+        "Forma de envio: #{@order.shipments.last.selected_shipping_rate.name}" +
+        "\n" +
+        "#{build_cupons(@order.promotions)}" +
+        "\n" +
+        "#{build_order_url}"
+    end
+
+    def 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,
+        fretePorConta: 1,
+        frete: @order.shipment_total.to_f,
+        quantidadeVolumes: 1,
+        contato: {
+          nome: transportadora
         },
-        "etiqueta": {
-          "nome": order.ship_address.name,
-          "endereco": order.ship_address.address1,
-          "numero": order.ship_address.number,
-          "complemento": order.ship_address.address2,
-          "municipio": order.ship_address.city,
-          "uf": order.ship_address.state.abbr,
-          "bairro": order.ship_address.district,
-          "cep": order.ship_address.zipcode,
-          "nomePais": "Brasil"
+        etiqueta: {
+          nome: @order.ship_address.name,
+          endereco: @order.ship_address.address1,
+          numero: @order.ship_address.number,
+          complemento: @order.ship_address.address2,
+          municipio: @order.ship_address.city,
+          uf: @order.ship_address.state.abbr,
+          bairro: @order.ship_address.district,
+          cep: @order.ship_address.zipcode,
+          nomePais: "Brasil"
         },
-        "volumes": [
+        volumes: [
           {
-            "servico": servico,
-            "codigoRastreamento": ""
+            servico: servico,
+            codigoRastreamento: ""
           }
         ]
       }
     end
 
+    def build_customer
+      {
+        nome: @order.bill_address.name,
+        telefone: @order.bill_address.phone,
+        email: @order.email,
+        endereco: {
+          "endereco" => @order.bill_address.address1,
+          "cep" => @order.bill_address.zipcode,
+          "bairro" => @order.bill_address.district,
+          "municipio" => @order.bill_address.city,
+          "uf" => @order.bill_address.state.abbr,
+          "numero" => @order.bill_address.number,
+          "complemento" => @order.bill_address.address2
+        },
+        endereco_cobranca: {
+          "endereco" => @order.bill_address.address1,
+          "cep" => @order.bill_address.zipcode,
+          "bairro" => @order.bill_address.district,
+          "municipio" => @order.bill_address.city,
+          "uf" => @order.bill_address.state.abbr,
+          "numero" => @order.bill_address.number,
+          "complemento" => @order.bill_address.address2
+        }
+      }
+    end
+
     def build_cupons cupons
-      string_cupons = ''
+      string_cupons = ""
       if !cupons.empty?
         string_cupons = "Cupons utilizados: #{cupons.pluck(:name).join(", ")}"
       end
       string_cupons
     end
+
+    def build_order_url
+      "Link para o pedido: #{@order.store.url}/orders/#{@order.number}/token/#{@order.guest_token}"
+    end
   end
 end

data/app/models/solidus_bling/token.rb

@@ -0,0 +1,44 @@
+module SolidusBling
+  class Token < ::Ac::Base
+    BASE_URL = "https://www.bling.com.br/Api/v3"
+
+    def initialize
+      super
+    end
+
+    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

data/app/subscribers/solidus_bling/subscriber.rb

@@ -3,30 +3,10 @@ module SolidusBling
     include Omnes::Subscriber
 
     handle :order_finalized,
-    with: :send_order_to_bling,
-    id: :send_order_to_bling
-
-    handle :bling_products_updated,
-    with: :products_updated,
-    id: :products_updated
-
-    handle :bling_contact_created,
-    with: :contato_created,
-    id: :contato_created
+      with: :send_order_to_bling
 
     def send_order_to_bling event, debug_info = {}
-      method = __method__.to_s
-      SolidusBling::OrderJob.perform_later(event: event.payload, method_name: method)
-    end
-
-    def contato_created event, debug_info = {}
-      method = __method__.to_s
-      SolidusBling::ContactJob.perform_later(event: event.payload, method_name: method)
-    end
-
-    def products_updated event, debug_info = {}
-      method = __method__.to_s
-      SolidusBling::ProductJob.perform_later(event: event.payload, method_name: method)
+      SolidusBling::OrderJob.perform_later(event: event.payload)
     end
   end
 end