solidus_bling 2.0.7 → 3.0.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bling
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 3.0.2
 platform: ruby
 authors:
-- ulysses-bull
-autorequire: 
+- Hamilton Tumenas Borges
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-20 00:00:00.000000000 Z
+date: 2023-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -45,7 +45,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: solidus_brazilian_adaptations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,7 +59,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: solidus_brazilian_adaptations
+  name: bling_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -86,14 +86,15 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
-description: 
-email: contato7bulloleo@gmail.com
+description:
+email: hamiltontubo@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gem_release.yml"
+- ".gitattributes"
 - ".github/stale.yml"
 - ".github_changelog_generator"
 - ".gitignore"
@@ -104,33 +105,25 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/controllers/spree/admin/accounts_controller.rb
-- app/controllers/spree/admin/bling_products_controller.rb
-- app/decorators/models/solidus_bling/spree/payment_method_decorator.rb
-- app/decorators/models/solidus_bling/spree/shipping_method_decorator.rb
-- app/helpers/solidus_bling/accounts_helper.rb
-- app/helpers/solidus_bling/bling_products_helper.rb
+- app/controllers/spree/admin/solidus_bling/accounts_controller.rb
 - app/jobs/solidus_bling/application_job.rb
-- app/jobs/solidus_bling/contact_job.rb
 - app/jobs/solidus_bling/order_job.rb
-- app/jobs/solidus_bling/product_job.rb
-- app/jobs/solidus_bling/update_product_job.rb
 - app/models/solidus_bling/account.rb
-- app/models/solidus_bling/api.rb
-- app/models/solidus_bling/contact.rb
 - app/models/solidus_bling/event.rb
 - app/models/solidus_bling/order.rb
 - app/models/solidus_bling/payment_method.rb
-- app/models/solidus_bling/product.rb
 - app/models/solidus_bling/seller.rb
 - app/models/solidus_bling/shipping_method.rb
+- app/models/solidus_bling/token.rb
 - app/subscribers/solidus_bling/subscriber.rb
-- app/views/spree/admin/accounts/_form.html.erb
-- app/views/spree/admin/accounts/edit.html.erb
-- app/views/spree/admin/accounts/index.html.erb
-- app/views/spree/admin/accounts/new.html.erb
-- app/views/spree/admin/accounts/show.html.erb
+- 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
+- app/views/spree/admin/solidus_bling/accounts/show.html.erb
 - bin/console
+- bin/meu_sandbox
 - bin/rails
 - bin/rails-engine
 - bin/rails-sandbox
@@ -140,14 +133,12 @@ files:
 - config/locales/en.yml
 - config/locales/pt-BR.yml
 - config/routes.rb
-- db/migrate/20230918141419_create_solidus_bling_accounts.rb
-- db/migrate/20230918141505_add_bling_order_id_to_spree_orders.rb
-- db/migrate/20230918141700_create_solidus_bling_products.rb
-- db/migrate/20230918142547_create_solidus_bling_events.rb
-- db/migrate/20230918142742_create_solidus_bling_payment_methods.rb
-- db/migrate/20230918142953_create_solidus_bling_sellers.rb
-- db/migrate/20230918143057_create_solidus_bling_shipping_methods.rb
-- db/migrate/20231018141940_add_company_to_solidus_bling_shipping_methods.rb
+- db/migrate/20231109210635_create_solidus_bling_accounts.rb
+- db/migrate/20231110112528_add_bling_order_id_to_spree_orders.rb
+- db/migrate/20231110112819_create_solidus_bling_events.rb
+- db/migrate/20231110112958_create_solidus_bling_payment_methods.rb
+- db/migrate/20231110113122_create_solidus_bling_sellers.rb
+- db/migrate/20231110113221_create_solidus_bling_shipping_methods.rb
 - lib/generators/solidus_bling/install/install_generator.rb
 - lib/generators/solidus_bling/install/templates/initializer.rb
 - lib/solidus_bling.rb
@@ -156,29 +147,14 @@ files:
 - lib/solidus_bling/testing_support/factories.rb
 - lib/solidus_bling/version.rb
 - solidus_bling.gemspec
-- spec/helpers/solidus_bling/accounts_helper_spec.rb
-- spec/helpers/solidus_bling/bling_products_helper_spec.rb
-- spec/jobs/solidus_bling/contact_job_spec.rb
-- spec/jobs/solidus_bling/order_job_spec.rb
-- spec/jobs/solidus_bling/product_job_spec.rb
-- spec/jobs/solidus_bling/update_product_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/product_spec.rb
-- spec/models/solidus_bling/seller_spec.rb
-- spec/models/solidus_bling/shipping_method_spec.rb
-- spec/requests/solidus_bling/accounts_spec.rb
-- spec/requests/solidus_bling/bling_products_spec.rb
-- spec/spec_helper.rb
-homepage: https://github.com/ulysses-bull/solidus_bling#readme
+homepage: https://github.com/hamiltontborges/solidus_bling#readme
 licenses:
 - BSD-3-Clause
 metadata:
-  homepage_uri: https://github.com/ulysses-bull/solidus_bling#readme
-  source_code_uri: https://github.com/ulysses-bull/solidus_bling
-  changelog_uri: https://github.com/ulysses-bull/solidus_bling/blob/master/CHANGELOG.md
-post_install_message: 
+  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:
 rdoc_options: []
 require_paths:
 - lib
@@ -196,23 +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/helpers/solidus_bling/accounts_helper_spec.rb
-- spec/helpers/solidus_bling/bling_products_helper_spec.rb
-- spec/jobs/solidus_bling/contact_job_spec.rb
-- spec/jobs/solidus_bling/order_job_spec.rb
-- spec/jobs/solidus_bling/product_job_spec.rb
-- spec/jobs/solidus_bling/update_product_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/product_spec.rb
-- spec/models/solidus_bling/seller_spec.rb
-- spec/models/solidus_bling/shipping_method_spec.rb
-- spec/requests/solidus_bling/accounts_spec.rb
-- spec/requests/solidus_bling/bling_products_spec.rb
-- spec/spec_helper.rb
+test_files: []

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

@@ -1,67 +0,0 @@
-module Spree
-  module Admin
-    class AccountsController < ResourceController
-      def index
-      end
-
-      def show
-        @bling_account = SolidusBling::Account.find(params[:id])
-      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.merge(name: "Bling")
-        if bling_account.save
-          flash[:success] = "Conta criada com sucesso"
-          redirect_to admin_accounts_path
-        else
-          flash[:error] = bling_account.errors.full_messages.join("\n")
-          redirect_to new_admin_account_path
-        end
-      end
-
-      def edit
-        @bling_account = SolidusBling::Account.find(params[:id])
-        @payment_methods = ::Spree::PaymentMethod.all.pluck(:name, :id)
-        @shipping_methods = ::Spree::ShippingMethod.all.pluck(:name, :id)
-        @products_count = @bling_account.products.count
-        @last_update = SolidusBling::Event.where(method: "products_updated").max.try(:created_at)
-      end
-
-      def update
-        bling_account = SolidusBling::Account.find(params[:id])
-        bling_account.update account_params
-        redirect_to edit_admin_account_path(bling_account.id)
-      end
-
-      def delete
-        bling_account = SolidusBling::Account.find(params[:id])
-        bling_account.delete
-        redirect_to admin_accounts_path
-      end
-
-      private
-
-      def model_class
-        SolidusBling::Account
-      end
-
-      def account_params
-        params.require(:account).permit(
-          :app_name, :client_id, :client_secret, :refresh_token, :api_base_url, :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

data/app/controllers/spree/admin/bling_products_controller.rb

@@ -1,20 +0,0 @@
-module Spree
-  module Admin
-    class BlingProductsController < ResourceController
-
-      def update
-        account = SolidusBling::Account.find(params[:id])
-        SolidusBling::UpdateProductJob.perform_later(account)
-        flash[:success] = "Baixando produtos"
-        redirect_to edit_admin_account_path(account)
-      end
-
-      private
-
-      def model_class
-        SolidusBling::Account
-      end
-
-    end
-  end
-end

data/app/decorators/models/solidus_bling/spree/payment_method_decorator.rb

@@ -1,13 +0,0 @@
-module SolidusBling
-  module Spree
-    module PaymentMethodDecorator
-      def self.prepended(base)
-        base.class_eval do
-          has_many :solidus_bling_payment_methods, class_name: "SolidusBling::PaymentMethod", foreign_key: "spree_payment_method_id"
-        end
-      end
-
-      ::Spree::PaymentMethod.prepend self
-    end
-  end
-end

data/app/decorators/models/solidus_bling/spree/shipping_method_decorator.rb

@@ -1,13 +0,0 @@
-module SolidusBling
-  module Spree
-    module ShippingMethodDecorator
-      def self.prepended(base)
-        base.class_eval do
-          has_many :solidus_bling_shipping_methods, class_name: "SolidusBling::ShippingMethod", foreign_key: "spree_shipping_method_id"
-        end
-      end
-
-      ::Spree::ShippingMethod.prepend self
-    end
-  end
-end

data/app/helpers/solidus_bling/accounts_helper.rb

@@ -1,4 +0,0 @@
-module SolidusBling
-  module AccountsHelper
-  end
-end

data/app/helpers/solidus_bling/bling_products_helper.rb

@@ -1,4 +0,0 @@
-module SolidusBling
-  module BlingProductsHelper
-  end
-end

data/app/jobs/solidus_bling/contact_job.rb

@@ -1,22 +0,0 @@
-module SolidusBling
-  class ContactJob < ApplicationJob
-    queue_as :default
-
-    def perform event:, method_name:
-      bling_event = SolidusBling::Event.new
-      contact = event[:args][:contato]
-      order = event[:args][:order]
-      bling_event.internal_id = order.id
-      bling_event.name = "event.omnes_event_name"
-      bling_event.method = method_name
-      if contact.include? "error"
-        bling_event.status = 'error'
-        bling_event.message = contact["error"]["description"]
-      else
-        bling_event.status = 'success'
-      end
-      bling_event.body = order.to_json
-      bling_event.save!
-    end
-  end
-end

data/app/jobs/solidus_bling/product_job.rb

@@ -1,13 +0,0 @@
-module SolidusBling
-  class ProductJob < ApplicationJob
-    queue_as :default
-
-    def perform event:, method_name:
-      bling_event = SolidusBling::Event.new
-      products = event[:products]
-      bling_event.method = method_name
-      bling_event.body = products.to_json
-      bling_event.save!
-    end
-  end
-end

data/app/jobs/solidus_bling/update_product_job.rb

@@ -1,9 +0,0 @@
-module SolidusBling
-  class UpdateProductJob < ApplicationJob
-    queue_as :default
-
-    def perform(account)
-      SolidusBling::Product.update(account)
-    end
-  end
-end

data/app/models/solidus_bling/api.rb

@@ -1,57 +0,0 @@
-module SolidusBling
-  class Api
-
-    attr_reader :account, :headers
-    def initialize account
-      @account = account
-      verify_token
-      @headers = {
-        "Content-Type": "application/json",
-        "Authorization": "Bearer #{@account.access_token}"
-      }
-    end
-
-    def refresh_token
-      basic_encoded = Base64.strict_encode64("#{@account.client_id}:#{@account.client_secret}")
-      headers = {
-        "Content-Type": "application/x-www-form-urlencoded",
-        "Authorization": "Basic #{basic_encoded}"
-      }
-      body = "grant_type=refresh_token&refresh_token=#{@account.refresh_token}"
-      res = ::Typhoeus.post("#{@account.api_base_url}/oauth/token", headers: headers, body: body)
-      body = JSON.parse(res.body)
-      response_has_error? body
-      expire_datetime = res.headers["date"].to_datetime.utc + body["expires_in"].seconds
-      @account.update(
-        access_token: body["access_token"],
-        refresh_token: body["refresh_token"],
-        token_expires_in: expire_datetime
-      )
-    end
-
-    def need_refresh_token?
-      return true if @account.token_expires_in.nil?
-      DateTime.now.utc > (@account.token_expires_in - 2.hours)
-    end
-
-    def verify_token
-      refresh_token if need_refresh_token?
-    end
-
-    def response_has_error? json
-      if json.include? "error"
-        error = json["error"]
-        raise "ERROR: #{json}"
-      end
-    end
-
-    private
-
-    def find_account app_name
-      account = SolidusBling::Account.find_by(app_name: app_name)
-      raise 'Conta de aplicativo inexistente' if account.nil?
-      account
-    end
-    
-  end
-end

data/app/models/solidus_bling/contact.rb

@@ -1,83 +0,0 @@
-module SolidusBling
-  class Contact < SolidusBling::Api
-
-    attr_reader :info
-
-    def initialize order, account
-      super(account)
-      @info = find_or_create(order)
-    end
-
-    def find_or_create order
-      raise "Order com CPF/CNPJ vazio" if order.tax_id.nil?
-      contato = find_by_cpf(order.tax_id)
-      if contato.nil?
-        contato_external_id = create(order)
-        contato = {"id" => contato_external_id}
-      end
-      contato
-    end
-
-    def find_by_cpf tax_id
-      req = Typhoeus.get("#{@account.api_base_url}/contatos?numeroDocumento=#{tax_id.gsub(/\D/, "")}", headers: @headers)
-      json = JSON.parse(req.body)
-      response_has_error?(json)
-      user = {}
-      if json.include? "data" || !json["data"].empty?
-        user = json["data"].first
-      end
-    end
-
-    def create order
-      contato = build_hash_contato(order)
-      begin
-        attempts ||= 1
-        req = Typhoeus.post("#{@account.api_base_url}/contatos", headers: @headers, body: JSON.dump(contato))
-        raise if req.code == 429
-      rescue
-        retry if (attempts += 1) < 5
-      ensure
-        json = JSON.parse(req.body)
-        response_has_error?(json)
-        ::Spree::Bus.publish :bling_contact_created, args: {order: order, contato: json}
-        return json.dig("data", "id")
-      end
-    end
-
-    private
-
-    def tipo_pessoa doc
-      doc.gsub(/\D/, "").length > 11 ? "J" : "F" 
-    end
-
-    def build_hash_contato order
-      {
-          "nome": order.ship_address.name,
-          "telefone": order.ship_address.phone,
-          "tipo": tipo_pessoa(order.tax_id),
-          "numeroDocumento": order.tax_id,
-          "email": order.email,
-          "endereco": {
-            "geral": {
-              "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
-            },
-            "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
-  end
-end

data/app/models/solidus_bling/product.rb

@@ -1,36 +0,0 @@
-module SolidusBling
-  class Product < ApplicationRecord
-    belongs_to :account
-
-    def self.update bling_account
-      bling_api = SolidusBling::Api.new(bling_account)
-      skus = ::Spree::Variant.pluck(:sku)
-      hash_products = {}
-      products = skus.map do |sku|
-        begin 
-          attempts ||= 1
-          req = Typhoeus.get("#{bling_api.account.api_base_url}/produtos?codigo=#{sku}", headers: bling_api.headers)
-          res_json = JSON.parse(req.body)
-          # p "#{sku} => #{res_json}"
-          next if res_json["data"] == []
-          product = res_json["data"].first
-          hash_products[sku] = product["id"]
-          { 
-            account_id: bling_api.account.id,
-            sku: sku,
-            external_id: product["id"].to_s,
-            name: product["nome"]
-          }
-        rescue => e
-          hash_products[sku] = res_json
-          # p "#{sku} => #{res_json} => #{e}"
-          sleep 1
-          retry if (attempts += 1) < 5
-        end
-      end.compact.uniq
-      SolidusBling::Product.upsert_all(products, unique_by: :sku)
-      ::Spree::Bus.publish :bling_products_updated, products: hash_products
-    end
-
-  end
-end

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

@@ -1,76 +0,0 @@
-<%= 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 %>
-  </div>
-
-  <div>
-    <%= form.label :client_secret, "Client Secret: " %>
-    <%= form.text_field :client_secret %>
-  </div>
-
-  <div>
-    <%= form.label :refresh_token, "Refresh Token: " %>
-    <%= form.text_field :refresh_token %>
-  </div>
-
-  <div>
-    <%= form.label :api_base_url, "API URL: " %>
-    <%= form.text_field :api_base_url %>
-  </div>
-
-  <div>
-    <%= form.label :external_store_id, "ID da Loja no Bling: " %>
-    <%= form.text_field :external_store_id %>
-  </div>
-
-  <div>
-    <%= form.label :incoming_category_id, "ID da Categoria de Receita: " %>
-    <%= form.text_field :incoming_category_id %>
-  </div>
-
-  <div style="margin: 10px 0">
-    <h6>Métodos de Pagamento</h6>
-    <%= 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>
-    <% end %>
-  </div>
-
-  <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 %>
-      </div>
-    <% end %>
-  </div>
-
-  <div style="margin: 10px 0">
-    <h6>Vendedores</h6>
-    <% 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 %>
-      <% end %>
-    <% end %>
-  </div>
-
-  <%= form.submit "Salvar" %>
-<% end %>

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

@@ -1,11 +0,0 @@
-<div style="margin: 10px 0px">
-  <%= button_to "Baixar produtos", admin_bling_product_path(@bling_account.id), method: :put, data:
-  {confirm: "Deseja baixar os produtos?" } %>
-  <span>Produtos baixados: <%= @products_count %></span>
-  <br>
-  <% if @last_update.present? %>
-    <span>Ultima atualização: <%= @last_update.strftime("%d/%m/%Y %H:%M") %> </span>
-  <% end %>
-</div>
-
-<%= render "form", bling_account: @bling_account, form_url: admin_account_path(@bling_account.id) %>

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

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

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

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

data/db/migrate/20230918141700_create_solidus_bling_products.rb

@@ -1,12 +0,0 @@
-class CreateSolidusBlingProducts < ActiveRecord::Migration[7.0]
-  def change
-    create_table :solidus_bling_products do |t|
-      t.string :external_id, null: false, index: { unique: true }
-      t.string :name, null: false
-      t.string :sku, null: false, index: { unique: true }
-      t.integer :account_id, null: false, index: true
-
-      t.timestamps
-    end
-  end
-end

data/db/migrate/20231018141940_add_company_to_solidus_bling_shipping_methods.rb

@@ -1,5 +0,0 @@
-class AddCompanyToSolidusBlingShippingMethods < ActiveRecord::Migration[7.0]
-  def change
-    add_column :solidus_bling_shipping_methods, :company, :string, default: ""
-  end
-end