solidus_bling 2.0.7 → 3.0.2

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

@@ -0,0 +1,147 @@
+<%= render "link_auth", bling_account: bling_account %>
+
+<%= form_with model: bling_account, url: form_url do |form| %>
+  <fieldset class="no-border-top">
+    <legend>
+      Dados da Conta
+    </legend>
+      <div class="row">
+        <div class="col-12 col-md-6">
+
+          <%= 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 %>
+
+          <%= 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 %>
+
+          <%= 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 %>
+
+          <%= 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>
+
+        <div class="col-12 col-md-6">
+
+          <%= 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 %>
+
+          <%= 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>
+      </div>
+  </fieldset>
+
+  <fieldset class="no-border-top">
+    <legend>
+      Métodos de Pagamento
+    </legend>
+    <%= form.fields_for :payment_methods do |payment_form| %>
+      <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 %>
+  </fieldset>
+
+  <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 %>
+  </fieldset>
+
+    <fieldset class="no-border-top">
+    <legend>
+      Vendedores
+    </legend>
+    <% bling_account.sellers.each do |seller| %>
+      <%= form.fields_for :sellers do |seller_form| %>
+        <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 %>
+  </fieldset>
+
+
+  <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

@@ -0,0 +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

@@ -0,0 +1,67 @@
+
+<% 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| %>
+  <%= 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>
+    </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

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

data/db/migrate/{20230918141419_create_solidus_bling_accounts.rb → 20231109210635_create_solidus_bling_accounts.rb}

@@ -1,17 +1,16 @@
 class CreateSolidusBlingAccounts < ActiveRecord::Migration[7.0]
   def change
     create_table :solidus_bling_accounts do |t|
-      t.string :name
-      t.string :app_name
-      t.string :api_base_url
-      t.string :api_key
       t.string :client_id
       t.string :client_secret
       t.string :refresh_token
+      t.string :redirect_url
+      t.string :state
       t.string :access_token
+      t.string :api_key
+      t.datetime :token_expires_in
       t.string :external_store_id
       t.string :incoming_category_id
-      t.datetime :token_expires_in
 
       t.timestamps
     end

data/db/migrate/{20230918142547_create_solidus_bling_events.rb → 20231110112819_create_solidus_bling_events.rb}

@@ -5,8 +5,7 @@ class CreateSolidusBlingEvents < ActiveRecord::Migration[7.0]
       t.string :status
       t.string :message
       t.string :body
-      t.string :name
-      t.string :method
+      t.string :event
 
       t.timestamps
     end

data/db/migrate/{20230918143057_create_solidus_bling_shipping_methods.rb → 20231110113221_create_solidus_bling_shipping_methods.rb}

@@ -2,8 +2,9 @@ class CreateSolidusBlingShippingMethods < ActiveRecord::Migration[7.0]
   def change
     create_table :solidus_bling_shipping_methods do |t|
       t.string :alias
-      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.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.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,41 +1,38 @@
 # frozen_string_literal: true
 
-require 'solidus_core'
-require 'solidus_support'
+require "solidus_core"
+require "solidus_support"
 
 module SolidusBling
   class Engine < Rails::Engine
     include SolidusSupport::EngineExtensions
 
-    isolate_namespace 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(
-          [:bling_account],
-          'exclamation',
-          url: :admin_accounts_path,
+          label: "bling_account",
+          icon: "exclamation",
+          url: "/admin/solidus_bling/accounts",
           condition: -> { can?(:manage, ::Spree::Store) }
         )
       end
     end
 
-    # use rspec for tests
-    config.generators do |g|
-      g.test_framework :rspec
-    end
-
     initializer "solidus_bling.pub_sub", after: "spree.core.pub_sub" do |app|
       app.reloader.to_prepare do
-        ::Spree::Bus.register(:bling_products_updated)
-        ::Spree::Bus.register(:bling_contact_created)
         SolidusBling::Subscriber.new.subscribe_to(::Spree::Bus)
       end
     end
 
+    # use rspec for tests
+    config.generators do |g|
+      g.test_framework :rspec
+    end
   end
 end

data/lib/solidus_bling/version.rb

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

data/lib/solidus_bling.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'solidus_brazilian_adaptations'
-require 'typhoeus'
-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,38 +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 = ['ulysses-bull']
-  spec.email = 'contato7bulloleo@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/ulysses-bull/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/ulysses-bull/solidus_bling'
-  spec.metadata['changelog_uri'] = 'https://github.com/ulysses-bull/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 'typhoeus'
-  spec.add_dependency 'solidus_brazilian_adaptations'
-
-  spec.add_development_dependency 'solidus_dev_support', '~> 2.7'
+  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"
 end