solidus_bling 3.0.0 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6db82bc3c77223d35418dc4778dea214887526407f73b566a1e3e36929d9349a
-  data.tar.gz: fb46fb95a4787468f045fb0b3e4b28c5e9d51fe20b6cad8d2292f9c222f11bac
+  metadata.gz: fe9686f547075a1388e93b0d93ef24e9be44988cce5deb8f7a122ab0ff80ac15
+  data.tar.gz: 8d06bef816cc6d034daa37e0c54088e5724ca1098b471d266f88e9684810c0a8
 SHA512:
-  metadata.gz: 5191696fc43ae7a0e9174bb03eb47464c21eab8f0e181533e4d4c1433e55dde194637af73e8a8363336929cc8e8b7eab28a4de810d102232e5d090488c5eb20f
-  data.tar.gz: d278d7f74dcfe34ddf36833fed252e9149011b7ad43131a034a0ab41854711938917fb3d255760734ff243f21a7b7cc9d2807ecb6a3dce7ca549394d9f923fc5
+  metadata.gz: bfd59588eea2c8b706ca6dd40f51eaafd56a60f87ca4bf39d05641395437262fbf878731b5e0a0acf142ce1a5b1b646dd0ef70e7f79dbd0f085d389b8dfd47eb
+  data.tar.gz: 8c4d46c87072916920882e754055889b54bd78a141b72f55fe9c7896a8c700fe74b289337b3fe4d168d70bb84283ab35553372baa13dfa6fd26d5a9939bb08d8

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

@@ -1,7 +1,6 @@
 module Spree
   module Admin
     module SolidusBling
-
       class AccountsController < BaseController
         before_action :set_account, only: [:show, :edit, :update, :destroy]
 
@@ -13,6 +12,10 @@ module Spree
         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)
@@ -62,7 +65,7 @@ module Spree
         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,

data/app/jobs/solidus_bling/order_job.rb

@@ -15,6 +15,5 @@ module SolidusBling
         bling_event.save!
       end
     end
-
   end
 end

data/app/models/solidus_bling/account.rb

@@ -10,6 +10,5 @@ module SolidusBling
       return if (token_expires_in - 1.day) > DateTime.now
       Token.new.refresh self
     end
-
   end
 end

data/app/models/solidus_bling/order.rb

@@ -1,6 +1,5 @@
 module SolidusBling
   class Order
-
     def initialize spree_order
       @order = spree_order
     end
@@ -8,7 +7,7 @@ module SolidusBling
     def send
       @account = SolidusBling::Account.first
       @account.check_token
-      BlingApi.access_token = @account.access_token
+      BlingApi.configuration.access_token = @account.access_token
 
       contato = costumer
       items = products
@@ -16,7 +15,7 @@ module SolidusBling
       observacoes_internas = internal_observations
       transporte = shipment
 
-      bling_order = BlingApi::Order.new(
+      BlingApi::Order.new(
         id_contato: contato.id,
         items: items,
         parcelas: parcelas,
@@ -38,13 +37,13 @@ module SolidusBling
       contato = BlingApi::Customer.find_by_tax_id(@order.tax_id)
       if contato
         contato.update(
-          pessoa_juridica: @order.tax_id.length > 14 ? true : false,
+          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 ? true : false,
+          pessoa_juridica: @order.tax_id.length > 14,
           numero_documento: @order.tax_id,
           **build_customer
         ).create
@@ -56,13 +55,13 @@ module SolidusBling
       @order.line_items.map do |item|
         product = BlingApi::Product.find_by_sku(item.sku)
         {
-          "id": product.id,
-          "quantidade": item.quantity,
-          "valor": item.price.to_f,
-          "produto": {
-             "id": product.id
+          id: product.id,
+          quantidade: item.quantity,
+          valor: item.price.to_f,
+          produto: {
+            id: product.id
           }
-         }
+        }
       end.compact
     end
 
@@ -81,13 +80,13 @@ module SolidusBling
     end
 
     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}"
+      "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).to_s +
+        "\n" +
+        build_order_url.to_s
     end
 
     def shipment
@@ -123,9 +122,9 @@ module SolidusBling
 
     def build_customer
       {
-        nome: @order.bill_address.name, 
-        telefone: @order.bill_address.phone, 
-        email: @order.email, 
+        nome: @order.bill_address.name,
+        telefone: @order.bill_address.phone,
+        email: @order.email,
         endereco: {
           "endereco" => @order.bill_address.address1,
           "cep" => @order.bill_address.zipcode,
@@ -133,8 +132,8 @@ module SolidusBling
           "municipio" => @order.bill_address.city,
           "uf" => @order.bill_address.state.abbr,
           "numero" => @order.bill_address.number,
-          "complemento" => @order.bill_address.address2,
-        }, 
+          "complemento" => @order.bill_address.address2
+        },
         endereco_cobranca: {
           "endereco" => @order.bill_address.address1,
           "cep" => @order.bill_address.zipcode,
@@ -142,7 +141,7 @@ module SolidusBling
           "municipio" => @order.bill_address.city,
           "uf" => @order.bill_address.state.abbr,
           "numero" => @order.bill_address.number,
-          "complemento" => @order.bill_address.address2,
+          "complemento" => @order.bill_address.address2
         }
       }
     end
@@ -150,7 +149,7 @@ module SolidusBling
     def build_cupons 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
@@ -158,6 +157,5 @@ module SolidusBling
     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

@@ -2,10 +2,6 @@ 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 = {
@@ -22,8 +18,8 @@ module SolidusBling
         token_expires_in: DateTime.now.utc + response_json["expires_in"].seconds,
         refresh_token: response_json["refresh_token"]
       )
-      rescue
-        false
+    rescue
+      false
     end
 
     def refresh bling_account
@@ -37,8 +33,8 @@ module SolidusBling
         token_expires_in: DateTime.now.utc + response_json["expires_in"].seconds,
         refresh_token: response_json["refresh_token"]
       )
-      rescue
-        false
+    rescue
+      false
     end
   end
-end
+end

data/app/subscribers/solidus_bling/subscriber.rb

@@ -3,7 +3,7 @@ module SolidusBling
     include Omnes::Subscriber
 
     handle :order_finalized,
-    with: :send_order_to_bling
+      with: :send_order_to_bling
 
     def send_order_to_bling event, debug_info = {}
       SolidusBling::OrderJob.perform_later(event: event.payload)

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

@@ -1,89 +1,154 @@
+<%= render "link_auth", bling_account: bling_account %>
+
 <%= form_with model: bling_account, url: form_url do |form| %>
-  <h6>Dados da conta</h6>
-  <div>
-    <%= form.label :client_id, "Client ID: " %>
-    <%= form.text_field :client_id %>
-  </div>
+  <fieldset class="no-border-top">
+    <legend>
+      Dados da Conta
+    </legend>
+      <div class="row">
+        <div class="col-12 col-md-6">
 
-  <div>
-    <%= form.label :client_secret, "Client Secret: " %>
-    <%= form.text_field :client_secret %>
-  </div>
+          <%= form.field_container :client_id do %>
+            <%= form.label :client_id, "Client ID", class: 'required' %>
+            <%= form.text_field :client_id, required: true, class: 'fullwidth' %>
+            <%= form.error_message_on :client_id %>
+          <% end %>
 
-  <div>
-    <%= form.label :refresh_token, "Refresh Token: " %>
-    <%= form.text_field :refresh_token %>
-  </div>
+          <%= form.field_container :client_secret do %>
+            <%= form.label :client_secret, "Client Secret", class: 'required' %>
+            <%= form.text_field :client_secret, required: true, class: 'fullwidth' %>
+            <%= form.error_message_on :client_secret %>
+          <% end %>
 
-  <div>
-    <%= form.label :redirect_url, "Redirect URL: " %>
-    <%= form.text_field :redirect_url %>
-  </div>
+          <%= form.field_container :external_store_id do %>
+            <%= form.label :external_store_id, "ID Loja", class: 'required' %>
+            <%= form.text_field :external_store_id, required: true, class: 'fullwidth' %>
+            <%= form.error_message_on :external_store_id %>
+          <% end %>
 
-  <div>
-    <%= form.label :state, "State: " %>
-    <%= form.text_field :state %>
-  </div>
+          <%= 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>
-    <%= form.label :access_token, "Access Token: " %>
-    <%= form.text_field :access_token %>
-  </div>
+        </div>
 
-  <div>
-    <%= form.label :external_store_id, "ID da Loja no Bling: " %>
-    <%= form.text_field :external_store_id %>
-  </div>
+        <div class="col-12 col-md-6">
 
-  <div>
-    <%= form.label :incoming_category_id, "ID da Categoria de Receita: " %>
-    <%= form.text_field :incoming_category_id %>
-  </div>
+          <%= form.field_container :redirect_url do %>
+            <%= form.label :redirect_url, "Redirect URL", class: 'required' %>
+            <%= form.text_field :redirect_url, required: true, class: 'fullwidth' %>
+            <%= form.error_message_on :redirect_url %>
+          <% end %>
+
+          <%= form.field_container :state do %>
+            <%= form.label :state, "State", class: 'required' %>
+            <%= form.text_field :state, required: true, class: 'fullwidth' %>
+            <%= form.error_message_on :state %>
+          <% end %>
 
-  <div style="margin: 10px 0">
-    <h6>Métodos de Pagamento</h6>
+          <%= form.field_container :refresh_token do %>
+            <%= form.label :refresh_token, "Refresh Token" %>
+            <%= form.text_field :refresh_token, class: 'fullwidth' %>
+            <%= form.error_message_on :refresh_token %>
+          <% end %>
+
+          <%= form.field_container :access_token do %>
+            <%= form.label :access_token, "Access Token" %>
+            <%= form.text_field :access_token, class: 'fullwidth' %>
+            <%= form.error_message_on :access_token %>
+          <% end %>
+
+          <div class="field">
+            <%= label_tag :token_expires_in, "Token Expiration" %>
+            <div class="fullwidth" id="token_expires_in" name="token_expires_in">
+              <%= bling_account.token_expires_in %>
+            </div>
+          </div>
+        </div>
+      </div>
+  </fieldset>
+
+  <fieldset class="no-border-top">
+    <legend>
+      Métodos de Pagamento
+    </legend>
     <%= form.fields_for :payment_methods do |payment_form| %>
-      <div>
-        <%= payment_form.select :spree_payment_method_id, @payment_methods %>
-        <%= payment_form.label :external_id, "ID Forma de Pagamento: " %>
-        <%= payment_form.text_field :external_id %>
+      <div class="row">
+        <div class="col-12 col-md-6">
+          <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="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>
     <% end %>
-  </div>
+  </fieldset>
 
-  <div style="margin: 10px 0">
-    <h6>Métodos de Envio</h6>
-    <%= form.fields_for :shipping_methods do |shipping_form| %>
-      <div>
-        <%= shipping_form.select :spree_shipping_method_id, @shipping_methods %>
-        <%= shipping_form.label :alias, "Alias: " %>
-        <%= shipping_form.text_field :alias %>
-        <%= shipping_form.label :company, "Nome Transportadora: " %>
-        <%= shipping_form.text_field :company %>
+  <fieldset class="no-border-top">
+    <legend>
+      Métodos de Envio
+    </legend>
+    <%= form.fields_for :shipping_methods do |ship_form| %>
+      <div class="row">
+        <div class="col-12 col-md-4">
+          <div class="field">
+            <%= ship_form.label :spree_shipping_method_id, "Método de Envio", class: 'required' %>
+            <%= ship_form.select :spree_shipping_method_id, @shipping_methods, {}, { class: "custom-select fullwidth" } %>
+          </div>
+        </div>
+        <div class="col-12 col-md-4">
+          <div class="field">
+            <%= ship_form.label :alias, "Alias", class: 'required' %>
+            <%= ship_form.text_field :alias, required: true, class:"fullwidth" %>
+          </div>
+        </div>
+        <div class="col-12 col-md-4">
+          <div class="field">
+            <%= ship_form.label :company, "Nome Transportadora", class: 'required' %>
+            <%= ship_form.text_field :company, required: true, class:"fullwidth" %>
+          </div>
+        </div>
       </div>
     <% end %>
-  </div>
+  </fieldset>
 
-  <div style="margin: 10px 0">
-    <h6>Vendedores</h6>
+    <fieldset class="no-border-top">
+    <legend>
+      Vendedores
+    </legend>
     <% bling_account.sellers.each do |seller| %>
       <%= form.fields_for :sellers do |seller_form| %>
-        <%= seller_form.label :name, "Nome do Vendedor: " %>
-        <%= seller_form.text_field :name %>
-
-        <%= seller_form.label :external_id, "ID do Vendedor: " %>
-        <%= seller_form.text_field :external_id %>
+        <div class="row">
+          <div class="col-12 col-md-6">
+            <div class="field">
+              <%= seller_form.label :name, "Nome do Vendedor", class: 'required' %>
+              <%= seller_form.text_field :name, required: true, class:"fullwidth" %>
+            </div>
+          </div>
+          <div class="col-12 col-md-6">
+            <div class="field">
+              <%= seller_form.label :external_id, "ID Vendedor", class: 'required' %>
+              <%= seller_form.text_field :external_id, required: true, class:"fullwidth" %>
+            </div>
+          </div>
+        </div>
       <% end %>
     <% end %>
-  </div>
+  </fieldset>
 
-  <%= form.submit "Salvar" %>
-<% 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>
+  <div class="form-buttons filter-actions actions" data-hook="buttons">
+    <%= form.submit "Salvar", class: 'btn btn-primary' %>
+    <% if params["action"] == 'edit' %>
+      <%= link_to "Excluir", admin_solidus_bling_account_path(bling_account.id), method: :delete, data: { confirm: "Tem certeza que deseja excluir a conta?"}, class: 'button'  %>
+    <% end %>
+  </div>
+<% end %>

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

@@ -0,0 +1,10 @@
+<div class="field">
+  <div style="display: flex; align-items: center; margin-bottom: 6px">
+    <label style="margin-right: 5px; margin-bottom: 0" for="bling_url">URL de autorização</label>
+      <a target="_blank" 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: 18px; height: 18px; color: black" 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>
+    <input id="bling_url" class="fullwidth" 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">
+</div>

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

@@ -1 +1,3 @@
+<% admin_breadcrumb("Bling") %>
+
 <%= 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

@@ -1,13 +1,74 @@
-<%= link_to "Criar", new_admin_solidus_bling_account_path %>
-<div>
+
+<% admin_layout "full-width" %>
+
+<% admin_breadcrumb("Bling") %>
+
+<% content_for :page_actions do %>
+  <% if SolidusBling::Account.count < 1 %>
+    <li>
+      <%= link_to "Nova Conta", new_admin_solidus_bling_account_path, class: 'btn btn-primary' %>
+    </li>
+  <% end %>
+<% end %>
+
+<div class="content-wrapper">
   <% @accounts.each do |account| %>
-    <div>
-      <div>
-        Nome do aplicativo:
-        <span>ID - <%= account.id %></span>
+  <%= render "link_auth", bling_account: account %>
+
+  <fieldset class="no-border-top">
+    <legend>
+      Dados da Conta
+    </legend>
+    <div class="row">
+      <div class="col-12 col-md-6">
+
+        <div class="field">
+          <%= label_tag :client_id, "Client ID" %>
+          <%= text_field_tag :client_id, account.client_id, class:"fullwidth", disabled: true %>
+        </div>
+
+        <div class="field">
+          <%= label_tag :client_secret, "Client Secret" %>
+          <%= text_field_tag :client_secret, account.client_secret, class:"fullwidth", disabled: true %>
+        </div>
+
+        <div class="field">
+          <%= label_tag :refresh_token, "Refresh Token" %>
+          <%= text_field_tag :refresh_token, account.refresh_token, class:"fullwidth", disabled: true %>
+        </div>
+      </div>
+
+      <div class="col-12 col-md-6">
+
+        <div class="field">
+          <%= label_tag :redirect_url, "Redirect URL" %>
+          <%= text_field_tag :redirect_url, account.redirect_url, class:"fullwidth", disabled: true %>
+        </div>
+        
+        <div class="field">
+          <%= label_tag :state, "State" %>
+          <%= text_field_tag :state, account.state, class:"fullwidth", disabled: true %>
+        </div>
+
+        <div class="field">
+          <%= label_tag :access_token, "Access Token" %>
+          <%= text_field_tag :access_token, account.access_token, class:"fullwidth", disabled: true %>
+        </div>
+
+        <div class="field">
+          <%= label_tag :token_expires_in, "Token Expiration" %>
+          <div class="fullwidth" id="token_expires_in" name="token_expires_in">
+            <%= account.token_expires_in %>
+          </div>
+        </div>
       </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>
+  </fieldset>
+
+  <div class="form-buttons filter-actions actions" data-hook="buttons">
+    <%= link_to "Editar", edit_admin_solidus_bling_account_path(account.id), class: 'btn btn-primary' %>
+    <%= link_to "Excluir", admin_solidus_bling_account_path(account.id), method: :delete, data: { confirm: "Tem certeza que deseja excluir a conta?"}, class: 'button'  %>
+  </div>
   <% end %>
 </div>
+

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

@@ -1,2 +1,3 @@
+<% admin_breadcrumb("Conta Bling") %>
 
 <%= render "form", bling_account: @bling_account, form_url: admin_solidus_bling_accounts_path %>

data/db/migrate/20231110113221_create_solidus_bling_shipping_methods.rb

@@ -3,8 +3,8 @@ class CreateSolidusBlingShippingMethods < ActiveRecord::Migration[7.0]
     create_table :solidus_bling_shipping_methods do |t|
       t.string :alias
       t.string :company
-      t.integer :account_id, null: false, index: true, index: { name: "solidus_bling_shipping_account_index" }
-      t.integer :spree_shipping_method_id, null: false, index: true, index: { name: "solidus_bling_spree_shipping_index" }
+      t.integer :account_id, null: false, index: {name: "solidus_bling_shipping_account_index"}
+      t.integer :spree_shipping_method_id, null: false, index: {name: "solidus_bling_spree_shipping_index"}
 
       t.timestamps
 

data/lib/generators/solidus_bling/install/install_generator.rb

@@ -4,26 +4,26 @@ module SolidusBling
   module Generators
     class InstallGenerator < Rails::Generators::Base
       class_option :auto_run_migrations, type: :boolean, default: false
-      source_root File.expand_path('templates', __dir__)
+      source_root File.expand_path("templates", __dir__)
 
       def self.exit_on_failure?
         true
       end
 
       def copy_initializer
-        template 'initializer.rb', 'config/initializers/solidus_bling.rb'
+        template "initializer.rb", "config/initializers/solidus_bling.rb"
       end
 
       def add_migrations
-        run 'bin/rails railties:install:migrations FROM=solidus_bling'
+        run "bin/rails railties:install:migrations FROM=solidus_bling"
       end
 
       def run_migrations
-        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]')) # rubocop:disable Layout/LineLength
+        run_migrations = options[:auto_run_migrations] || ["", "y", "Y"].include?(ask("Would you like to run the migrations now? [Y/n]")) # rubocop:disable Layout/LineLength
         if run_migrations
-          run 'bin/rails db:migrate'
+          run "bin/rails db:migrate"
         else
-          puts 'Skipping bin/rails db:migrate, don\'t forget to run it!' # rubocop:disable Rails/Output
+          puts "Skipping bin/rails db:migrate, don't forget to run it!" # rubocop:disable Rails/Output
         end
       end
 

data/lib/solidus_bling/configuration.rb

@@ -12,7 +12,7 @@ module SolidusBling
       @configuration ||= Configuration.new
     end
 
-    alias config configuration
+    alias_method :config, :configuration
 
     def configure
       yield configuration

data/lib/solidus_bling/engine.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'solidus_core'
-require 'solidus_support'
+require "solidus_core"
+require "solidus_support"
 
 module SolidusBling
   class Engine < Rails::Engine
@@ -9,15 +9,15 @@ module SolidusBling
 
     isolate_namespace ::SolidusBling
 
-    engine_name 'solidus_bling'
+    engine_name "solidus_bling"
 
-    initializer 'solidus_bling.configure_backend' do
+    initializer "solidus_bling.configure_backend" do
       next unless ::Spree::Backend::Config.respond_to?(:menu_items)
 
       ::Spree::Backend::Config.configure do |config|
         config.menu_items << config.class::MenuItem.new(
           label: "bling_account",
-          icon: 'exclamation',
+          icon: "exclamation",
           url: "/admin/solidus_bling/accounts",
           condition: -> { can?(:manage, ::Spree::Store) }
         )

data/lib/solidus_bling/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusBling
-  VERSION = '3.0.0'
+  VERSION = "3.0.3"
 end

data/lib/solidus_bling.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'solidus_brazilian_adaptations'
-require 'bling_api'
-require 'solidus_bling/configuration'
-require 'solidus_bling/version'
-require 'solidus_bling/engine'
+require "solidus_brazilian_adaptations"
+require "bling_api"
+require "solidus_bling/configuration"
+require "solidus_bling/version"
+require "solidus_bling/engine"

data/solidus_bling.gemspec

@@ -1,37 +1,36 @@
 # frozen_string_literal: true
 
-require_relative 'lib/solidus_bling/version'
+require_relative "lib/solidus_bling/version"
 
 Gem::Specification.new do |spec|
-  spec.name = 'solidus_bling'
+  spec.name = "solidus_bling"
   spec.version = SolidusBling::VERSION
-  spec.authors = ['Hamilton Tumenas Borges']
-  spec.email = 'hamiltontubo@gmail.com'
+  spec.authors = ["Hamilton Tumenas Borges"]
+  spec.email = "hamiltontubo@gmail.com"
 
-  spec.summary = 'Solidus extension to integrate with the Bling'
-  spec.homepage = 'https://github.com/hamiltontborges/solidus_bling#readme'
-  spec.license = 'BSD-3-Clause'
+  spec.summary = "Solidus extension to integrate with the Bling"
+  spec.homepage = "https://github.com/hamiltontborges/solidus_bling#readme"
+  spec.license = "BSD-3-Clause"
 
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/hamiltontborges/solidus_bling'
-  spec.metadata['changelog_uri'] = 'https://github.com/hamiltontborges/solidus_bling/blob/master/CHANGELOG.md'
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/hamiltontborges/solidus_bling"
+  spec.metadata["changelog_uri"] = "https://github.com/hamiltontborges/solidus_bling/blob/master/CHANGELOG.md"
 
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.5', '< 4')
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5", "< 4")
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   files = Dir.chdir(__dir__) { `git ls-files -z`.split("\x0") }
 
   spec.files = files.grep_v(%r{^(test|spec|features)/})
-  spec.test_files = files.grep(%r{^(test|spec|features)/})
   spec.bindir = "exe"
   spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 5']
-  spec.add_dependency 'solidus_support', '~> 0.5'
-  spec.add_dependency 'solidus_brazilian_adaptations'
-  spec.add_dependency 'bling_api'
+  spec.add_dependency "solidus_core", [">= 2.0.0", "< 5"]
+  spec.add_dependency "solidus_support", "~> 0.5"
+  spec.add_dependency "solidus_brazilian_adaptations"
+  spec.add_dependency "bling_api"
 
-  spec.add_development_dependency 'solidus_dev_support', '~> 2.7'
+  spec.add_development_dependency "solidus_dev_support", "~> 2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bling
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.3
 platform: ruby
 authors:
 - Hamilton Tumenas Borges
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-13 00:00:00.000000000 Z
+date: 2023-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -86,7 +86,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
-description: 
+description:
 email: hamiltontubo@gmail.com
 executables: []
 extensions: []
@@ -117,6 +117,7 @@ files:
 - app/models/solidus_bling/token.rb
 - app/subscribers/solidus_bling/subscriber.rb
 - app/views/spree/admin/solidus_bling/accounts/_form.html.erb
+- app/views/spree/admin/solidus_bling/accounts/_link_auth.html.erb
 - app/views/spree/admin/solidus_bling/accounts/edit.html.erb
 - app/views/spree/admin/solidus_bling/accounts/index.html.erb
 - app/views/spree/admin/solidus_bling/accounts/new.html.erb
@@ -146,13 +147,6 @@ files:
 - lib/solidus_bling/testing_support/factories.rb
 - lib/solidus_bling/version.rb
 - solidus_bling.gemspec
-- spec/jobs/solidus_bling/order_job_spec.rb
-- spec/models/solidus_bling/account_spec.rb
-- spec/models/solidus_bling/event_spec.rb
-- spec/models/solidus_bling/payment_method_spec.rb
-- spec/models/solidus_bling/seller_spec.rb
-- spec/models/solidus_bling/shipping_method_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/hamiltontborges/solidus_bling#readme
 licenses:
 - BSD-3-Clause
@@ -160,7 +154,7 @@ metadata:
   homepage_uri: https://github.com/hamiltontborges/solidus_bling#readme
   source_code_uri: https://github.com/hamiltontborges/solidus_bling
   changelog_uri: https://github.com/hamiltontborges/solidus_bling/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -178,15 +172,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: Solidus extension to integrate with the Bling
-test_files:
-- spec/jobs/solidus_bling/order_job_spec.rb
-- spec/models/solidus_bling/account_spec.rb
-- spec/models/solidus_bling/event_spec.rb
-- spec/models/solidus_bling/payment_method_spec.rb
-- spec/models/solidus_bling/seller_spec.rb
-- spec/models/solidus_bling/shipping_method_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/spec/jobs/solidus_bling/order_job_spec.rb

@@ -1,7 +0,0 @@
-require 'rails_helper'
-
-module SolidusBling
-  RSpec.describe OrderJob, type: :job do
-    pending "add some examples to (or delete) #{__FILE__}"
-  end
-end

data/spec/models/solidus_bling/account_spec.rb

@@ -1,7 +0,0 @@
-require 'rails_helper'
-
-module SolidusBling
-  RSpec.describe Account, type: :model do
-    pending "add some examples to (or delete) #{__FILE__}"
-  end
-end

data/spec/models/solidus_bling/event_spec.rb

@@ -1,7 +0,0 @@
-require 'rails_helper'
-
-module SolidusBling
-  RSpec.describe Event, type: :model do
-    pending "add some examples to (or delete) #{__FILE__}"
-  end
-end

data/spec/models/solidus_bling/payment_method_spec.rb

@@ -1,7 +0,0 @@
-require 'rails_helper'
-
-module SolidusBling
-  RSpec.describe PaymentMethod, type: :model do
-    pending "add some examples to (or delete) #{__FILE__}"
-  end
-end

data/spec/models/solidus_bling/seller_spec.rb

@@ -1,7 +0,0 @@
-require 'rails_helper'
-
-module SolidusBling
-  RSpec.describe Seller, type: :model do
-    pending "add some examples to (or delete) #{__FILE__}"
-  end
-end

data/spec/models/solidus_bling/shipping_method_spec.rb

@@ -1,7 +0,0 @@
-require 'rails_helper'
-
-module SolidusBling
-  RSpec.describe ShippingMethod, type: :model do
-    pending "add some examples to (or delete) #{__FILE__}"
-  end
-end

data/spec/spec_helper.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-# Configure Rails Environment
-ENV['RAILS_ENV'] = 'test'
-
-# Run Coverage report
-require 'solidus_dev_support/rspec/coverage'
-
-# Create the dummy app if it's still missing.
-dummy_env = "#{__dir__}/dummy/config/environment.rb"
-system 'bin/rake extension:test_app' unless File.exist? dummy_env
-require dummy_env
-
-# Requires factories and other useful helpers defined in spree_core.
-require 'solidus_dev_support/rspec/feature_helper'
-
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-Dir["#{__dir__}/support/**/*.rb"].sort.each { |f| require f }
-
-# Requires factories defined in Solidus core and this extension.
-# See: lib/solidus_bling/testing_support/factories.rb
-SolidusDevSupport::TestingSupport::Factories.load_for(SolidusBling::Engine)
-
-RSpec.configure do |config|
-  config.infer_spec_type_from_file_location!
-  config.use_transactional_fixtures = false
-
-  if Spree.solidus_gem_version < Gem::Version.new('2.11')
-    config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :system
-  end
-end