solidus_bling 2.0.6 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd3b2416612bb0c496adcbe4dadb851decd26a74c378ea362f5ab47a2cac9c50
-  data.tar.gz: 8b918c41a1a377631d470407b6d711f7dd57d4183d558e24ab99627f433b3394
+  metadata.gz: 6db82bc3c77223d35418dc4778dea214887526407f73b566a1e3e36929d9349a
+  data.tar.gz: fb46fb95a4787468f045fb0b3e4b28c5e9d51fe20b6cad8d2292f9c222f11bac
 SHA512:
-  metadata.gz: 82e33cf15f8c38519af2688ce3834aca4777c16995f83ddf394de8689d274459896357b910ccb23dc0e03aa5dbdf54a267ef5068fd799eb79ba24ea1061411d8
-  data.tar.gz: 246a8b67a86852e725584de7a7d413f293ac3c31984fa889baba8d188132d17e1325b800cb0b76cc9be5ce8d7c3ccc40637a385140b387429f1084206b6c3d96
+  metadata.gz: 5191696fc43ae7a0e9174bb03eb47464c21eab8f0e181533e4d4c1433e55dde194637af73e8a8363336929cc8e8b7eab28a4de810d102232e5d090488c5eb20f
+  data.tar.gz: d278d7f74dcfe34ddf36833fed252e9149011b7ad43131a034a0ab41854711938917fb3d255760734ff243f21a7b7cc9d2807ecb6a3dce7ca549394d9f923fc5

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/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/app/controllers/spree/admin/solidus_bling/accounts_controller.rb

@@ -0,0 +1,77 @@
+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
+          @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,21 +2,19 @@ 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
+
   end
 end

data/app/models/solidus_bling/account.rb

@@ -2,8 +2,14 @@ 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,163 @@
 module SolidusBling
-  class Order < SolidusBling::Api
+  class Order
 
-    def initialize order
-      super(SolidusBling::Account.first)
-      @order = 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.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 ? true : false,
+          numero_documento: @order.tax_id,
+          **build_customer
+        )
+      else
+        contato = BlingApi::Customer.new(
+          pessoa_juridica: @order.tax_id.length > 14 ? true : false,
+          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,
+          "id": product.id,
           "quantidade": item.quantity,
           "valor": item.price.to_f,
           "produto": {
-            "id": bling_product.external_id
+             "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(", ")}"
+         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
+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

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

@@ -1,10 +1,5 @@
 <%= form_with model: bling_account, url: form_url do |form| %>
   <h6>Dados da conta</h6>
-  <div>
-    <%= form.label :app_name, "Nome do Aplicativo: " %>
-    <%= form.text_field :app_name %>
-  </div>
-
   <div>
     <%= form.label :client_id, "Client ID: " %>
     <%= form.text_field :client_id %>
@@ -21,8 +16,18 @@
   </div>
 
   <div>
-    <%= form.label :api_base_url, "API URL: " %>
-    <%= form.text_field :api_base_url %>
+    <%= form.label :redirect_url, "Redirect URL: " %>
+    <%= form.text_field :redirect_url %>
+  </div>
+
+  <div>
+    <%= form.label :state, "State: " %>
+    <%= form.text_field :state %>
+  </div>
+
+  <div>
+    <%= form.label :access_token, "Access Token: " %>
+    <%= form.text_field :access_token %>
   </div>
 
   <div>
@@ -73,4 +78,12 @@
   </div>
 
   <%= form.submit "Salvar" %>
-<% end %>
+<% end %>
+
+<div>
+  <input value="https://www.bling.com.br/Api/v3/oauth/authorize?response_type=code&client_id=<%= bling_account.client_id %>&state=<%= bling_account.state %>&scopes=98308+98309+98310+98313+98314+507943+5990556+6631498+106168710+182224097+199272829+200802821+220621674+318257556+318257565+318257568+318257570+318257583+333936575+363921589+363921590+363921591+363921592+363953167+363953556+791588404+875116881+1869535257+5862218180+13645012997+13645013013">
+  <a target="_blank" class="" href="https://www.bling.com.br/Api/v3/oauth/authorize?response_type=code&client_id=<%= bling_account.client_id %>&state=<%= bling_account.state %>&scopes=98308+98309+98310+98313+98314+507943+5990556+6631498+106168710+182224097+199272829+200802821+220621674+318257556+318257565+318257568+318257570+318257583+333936575+363921589+363921590+363921591+363921592+363953167+363953556+791588404+875116881+1869535257+5862218180+13645012997+13645013013"> 
+    <svg style="width: 24px; height: 24px;" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+    <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 6H5.25A2.25 2.25 0 003 8.25v10.5A2.25 2.25 0 005.25 21h10.5A2.25 2.25 0 0018 18.75V10.5m-10.5 6L21 3m0 0h-5.25M21 3v5.25"></path></svg>
+  </a>
+</div>

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

@@ -0,0 +1 @@
+<%= render "form", bling_account: @bling_account, form_url: admin_solidus_bling_account_path(@bling_account.id) %>

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

@@ -0,0 +1,13 @@
+<%= link_to "Criar", new_admin_solidus_bling_account_path %>
+<div>
+  <% @accounts.each do |account| %>
+    <div>
+      <div>
+        Nome do aplicativo:
+        <span>ID - <%= account.id %></span>
+      </div>
+      <%= link_to "Editar", edit_admin_solidus_bling_account_path(account.id) %>
+      <%= link_to "Excluir", admin_solidus_bling_account_path(account.id), method: :delete  %>
+    </div>
+  <% end %>
+</div>

data/app/views/spree/admin/{accounts → solidus_bling/accounts}/new.html.erb

@@ -1,2 +1,2 @@
 
-<%= render "form", bling_account: @bling_account, form_url: admin_accounts_path %>
+<%= render "form", bling_account: @bling_account, form_url: admin_solidus_bling_accounts_path %>

data/bin/meu_sandbox

@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+
+bin/rails db:environment:set RAILS_ENV=development
+
+set -e
+test -z "${DEBUG+empty_string}" || set -x
+
+if [ -z "$SOLIDUS_BRANCH" ]
+then
+  echo "~~> Use 'export SOLIDUS_BRANCH=[main|v3.2|...]' to control the Solidus branch"
+  SOLIDUS_BRANCH="main"
+fi
+echo "~~> Using branch $SOLIDUS_BRANCH of solidus"
+
+extension_name="solidus_bling"
+
+# Stay away from the bundler env of the containing extension.
+function unbundled {
+  ruby -rbundler -e'b = proc {system *ARGV}; Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&b) : Bundler.with_clean_env(&b)' -- $@
+}
+
+rm -rf ./sandbox
+unbundled bundle exec rails new sandbox \
+  --database=postgresql \
+  --skip-bundle \
+  --skip-git \
+  --skip-keeps \
+  --skip-rc \
+  --skip-spring \
+  --skip-test \
+  --skip-javascript
+
+if [ ! -d "sandbox" ]; then
+  echo 'sandbox rails application failed'
+  exit 1
+fi
+
+cd ./sandbox
+cat <<RUBY >> Gemfile
+gem 'solidus', github: 'solidusio/solidus', branch: '$SOLIDUS_BRANCH'
+gem 'rails-i18n'
+gem 'solidus_i18n'
+
+gem '$extension_name', path: '..'
+
+group :test, :development do
+  platforms :mri do
+    gem 'pry-byebug'
+  end
+end
+RUBY
+
+unbundled bundle install --gemfile Gemfile
+
+unbundled bundle exec rake db:drop db:create
+
+unbundled bundle exec rails generate solidus:install \
+  --auto-accept \
+  --payment-method=none \
+  --frontend=starter \
+  $@
+
+unbundled bundle exec rails generate ${extension_name}:install --auto-run-migrations
+
+echo
+echo "🚀 Sandbox app successfully created for $extension_name!"
+echo "🧪 This app is intended for test purposes."

data/config/locales/pt-BR.yml

@@ -2,4 +2,4 @@ pt-BR:
   spree:
     admin:
       tab:
-        bling_account: "Conta Bling"
+        bling_account: "Bling"

data/config/routes.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
 Spree::Core::Engine.routes.draw do
+  # Add your extension routes here
   namespace :admin do
-    resources :accounts
-    resources :bling_products, only: [:update]
+    namespace :solidus_bling do
+      resources :accounts do
+        get "authorize", on: :collection
+      end
+    end
   end
 end