solidus_bling 3.2.9 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cabc5846e34b3e9c1c422581c3ad569483a648c34862d9c9a92999a0b8889e6d
-  data.tar.gz: 9c1c10957436f7431e873f85acc8c54081be03ff47a10432d65a4a8db9677bca
+  metadata.gz: a518315c339e59749416c354476f5074b785e5f6221aa2f85f48ff97589090bf
+  data.tar.gz: 39d8b9d853e301213aa05996f618537c6348e77d7f9d3bb93e911db04540a45d
 SHA512:
-  metadata.gz: 870b5efd4acc82ec2ec78347e53d63d18496dafdc7a274c7270a5e1a5c423c92318099b994093bd86d9dcdcacad0d1df762053fa983301b3bb2cc08a4783377b
-  data.tar.gz: 5776751a2fd3812a9155441476a049ecdd6f8ab619362534746c7b09cb5e6c03c52abf87b523e9c3d37baf43f1fe119c1fb5e5dc5b7d8bc10a0f77e2ac25a8d0
+  metadata.gz: 77d81b06264164cb160cb1c34a104235d654143d95f63d1ae1e8f7a4cdda3c51850b671c2d7da91556301be365e9cf8b10b21af8007a390e23449d30bd06b4df
+  data.tar.gz: 1bfea6fd4602f7602430750b32510c86ea91f00807c1906b997ae7a020912d270f170fcd9a40878d4f7e8978f8a4e4beada389a1308269bce53365a50b04a29c

data/app/controllers/spree/admin/orders/sellers_controller.rb

@@ -0,0 +1,36 @@
+module Spree
+  module Admin
+    module Orders
+      class SellersController < BaseController
+        before_action :set_order, only: [:edit, :update]
+
+        def edit
+          @sellers = ::SolidusBling::Seller.all.order(:name)
+        end
+
+        def update
+          if @order.update(solidus_bling_seller_id: params[:order][:seller_id])
+            flash[:success] = "Vendedor atualizado com sucesso."
+          else
+            flash[:error] = "Erro ao atualizar vendedor."
+          end  
+          redirect_to admin_orders_seller_path(@order)
+        end
+
+        def model_class
+          ::SolidusBling::Seller
+        end
+
+        private
+        
+        def order_params
+          params.require(:order).permit(:seller_id)
+        end
+
+        def set_order
+          @order = Spree::Order.find_by!(number: params[:order_number])
+        end
+      end
+    end
+  end
+end

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

@@ -60,6 +60,12 @@ module Spree
           redirect_to edit_admin_solidus_bling_account_path(bling_account.id)
         end
 
+        def upsert_sellers
+          ::SolidusBling::UpsertSellersJob.perform_later
+          flash[:success] = "Vendedores atualizados"
+          redirect_to admin_solidus_bling_accounts_path
+        end
+
         private
 
         def set_account

data/app/jobs/solidus_bling/upsert_sellers_job.rb

@@ -0,0 +1,9 @@
+module SolidusBling
+  class UpsertSellersJob < ApplicationJob
+    queue_as :default
+
+    def perform
+      SolidusBling::Seller.upsert_sellers SolidusBling::Account.first
+    end
+  end
+end

data/app/models/solidus_bling/order.rb

@@ -14,6 +14,7 @@ module SolidusBling
       parcelas = installments
       observacoes_internas = internal_observations
       transporte = shipment
+      id_vendedor = seller_external_id
 
       bling_order = BlingApi::Order.new(
         id_contato: contato.id,
@@ -31,7 +32,7 @@ module SolidusBling
         valor_desconto: @order.adjustment_total.abs,
         id_categoria: @account.incoming_category_id,
         transporte: transporte,
-        id_vendedor: @account.sellers.first.external_id
+        id_vendedor: id_vendedor
       ).create
 
       if bling_order
@@ -129,6 +130,10 @@ module SolidusBling
       }
     end
 
+    def seller_external_id
+      @order.solidus_bling_seller_id ? @account.sellers.find(@order.solidus_bling_seller_id).external_id : SolidusBling::Seller.default.external_id
+    end
+
     def build_customer
       {
         nome: @order.bill_address.name.strip,

data/app/models/solidus_bling/seller.rb

@@ -4,5 +4,18 @@ module SolidusBling
     validates :external_id, presence: true
 
     belongs_to :account
+
+    def self.upsert_sellers account
+      account.check_token
+      BlingApi.configure { |config| config.access_token = account.access_token }
+
+      sellers = BlingApi::Seller.get_sellers
+      upsert_sellers = sellers.map { |seller| { name: seller[:nome], external_id: seller[:id], account_id: account.id } }
+      SolidusBling::Seller.upsert_all(upsert_sellers, unique_by: :external_id)
+    end
+
+    def self.default
+      find_by(default: true)
+    end
   end
 end

data/app/models/spree/permission_sets/seller_update.rb

@@ -0,0 +1,9 @@
+module Spree
+  module PermissionSets
+    class SellerUpdate < Spree::PermissionSets::Base
+      def activate!
+        can :manage, ::SolidusBling::Seller
+      end
+    end
+  end
+end

data/app/views/spree/admin/orders/sellers/edit.html.erb

@@ -0,0 +1,19 @@
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Vendedor' } %>
+
+<% admin_breadcrumb("Vendedor") %>
+
+<div data-order-number="<%= @order.number %>">
+  <div>
+    <fieldset class="no-border-bottom">
+      <legend>Vendedor</legend>
+      <%= form_with model: @order, url: admin_orders_update_seller_path(@order) do |form| %>
+        <%= form.select :seller_id, @sellers.pluck(:name, :id), { selected: @order.solidus_bling_seller_id || @sellers.default&.id }, class:"custom-select fullwidth" %>
+        <div class="form-buttons filter-actions actions" data-hook="buttons">
+          <%= form.submit t('spree.actions.update'), class: 'btn btn-primary mt-4' %>
+        </div>
+      <% end %>
+    </fieldset>
+  </div>
+
+  <%= render partial: 'spree/shared/error_messages', locals: { target: @order } %>
+</div>

data/app/views/spree/admin/shared/_order_submenu.html.erb

@@ -0,0 +1,67 @@
+<nav>
+  <ul class="tabs" data-hook="admin_order_tabs">
+    <% if (@order.shipments.count == 0 || @order.shipped_shipments.count == 0) %>
+      <li class="<%= "active" if current == "Cart" %>" data-hook='admin_order_tabs_order_details'>
+        <%= link_to t('spree.cart'), spree.cart_admin_order_url(@order) %>
+      </li>
+    <% end %>
+
+    <% if checkout_steps.include?("address") %>
+      <li class="<%= "active" if (current == "Customer Details") %>" data-hook='admin_order_tabs_customer_details'>
+        <% if can?(:update, @order) %>
+          <%= link_to t('spree.customer'), spree.edit_admin_order_customer_url(@order) %>
+        <% else %>
+          <%= link_to t('spree.customer'), spree.admin_order_customer_url(@order) %>
+        <% end %>
+      </li>
+    <% end %>
+
+    <li class="<%= "active" if current == "Vendedor" %>" data-hook='admin_order_tabs_order_details'>
+      <%= link_to "Vendedor", admin_orders_seller_path(@order) %>
+    </li>
+
+    <li class="<%= "active" if current == "Shipments" %>" data-hook='admin_order_tabs_order_details'>
+      <%= link_to plural_resource_name(Spree::Shipment), spree.edit_admin_order_url(@order) %>
+    </li>
+
+    <% if can? :show, Spree::Adjustment %>
+      <li class="<%= "active" if current == "Adjustments" %>" data-hook='admin_order_tabs_adjustments'>
+        <%= link_to plural_resource_name(Spree::Adjustment), spree.admin_order_adjustments_url(@order) %>
+      </li>
+    <% end %>
+
+    <% if can?(:show, Spree::Payment) %>
+      <li class="<%= "active" if current == "Payments" %>" data-hook='admin_order_tabs_payments'>
+        <%= link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_url(@order) %>
+      </li>
+    <% end %>
+
+    <% if !@order.completed? && can?(:update, @order) %>
+      <li class="<%= "active" if current == "Confirm" %>" data-hook='admin_order_tabs_confirm'>
+        <%= link_to t('spree.confirm'), spree.confirm_admin_order_url(@order) %>
+      </li>
+    <% end %>
+
+    <% if can? :show, Spree::ReturnAuthorization %>
+      <% if @order.completed? %>
+        <li class="tab <%= "active" if current == "Return Authorizations" %>" data-hook='admin_order_tabs_return_authorizations'>
+          <%= link_to t('spree.admin.tab.rma'), spree.admin_order_return_authorizations_url(@order) %>
+        </li>
+      <% end %>
+    <% end %>
+
+    <% if can? :show, Spree::CustomerReturn %>
+      <% if @order.completed? %>
+        <li class="<%= "active" if current == "Customer Returns" %>" data-hook='admin_order_tabs_customer_returns'>
+          <%= link_to plural_resource_name(Spree::CustomerReturn), spree.admin_order_customer_returns_url(@order) %>
+        </li>
+      <% end %>
+    <% end %>
+
+    <% if can?(:manage, Spree::OrderCancellations) && @order.inventory_units.cancelable.present? %>
+      <li class="<%= "active" if current == "Cancel Inventory" %>" data-hook='admin_order_tabs_cancel_inventory'>
+        <%= link_to t('spree.cancel_inventory'), spree.admin_order_cancellations_path(@order) %>
+      </li>
+    <% end %>
+  </ul>
+</nav>

data/app/views/spree/admin/shared/_order_summary.html.erb

@@ -0,0 +1,75 @@
+
+<header id="order_tab_summary" data-hook>
+  <dl class="additional-info">
+    <dt class="order-state" id="order_status" data-hook><%= t('spree.status') %>:</dt>
+    <dd class="order-state">
+      <span class="pill pill-<%= @order.state %>">
+        <%= t(@order.state, scope: 'spree.order_state') %>
+      </span>
+
+    <% if @order.user.present? %>
+      <dt data-hook='admin_order_user_link'><%= t('spree.user') %>:</dt>
+      <dd id='order_user_link'><%= link_to @order.user.email, spree.edit_admin_user_path(@order.user) %></dd>
+    <% end %>
+
+    <dt data-hook='admin_order_tab_subtotal_title'><%= Spree::Order.human_attribute_name(:item_total) %>:</dt>
+    <dd id='item_total'><%= @order.display_item_total.to_html %></dd>
+
+    <% if checkout_steps.include?("delivery") %>
+      <dt class="order-shipment_total <%= "hidden" if @order.ship_total.zero? %>" data-hook='admin_order_tab_ship_total_title'><%= Spree::Order.human_attribute_name(:shipment_total) %>:</dt>
+      <dd class="order-shipment_total <%= "hidden" if @order.ship_total.zero? %>" id='ship_total'><%= @order.display_ship_total.to_html %></dd>
+    <% end %>
+
+    <dt class="order-included_tax_total <%= "hidden" if @order.included_tax_total.zero? %>" data-hook='admin_order_tab_included_tax_title'><%= Spree::Order.human_attribute_name(:included_tax_total) %>:</dt>
+    <dd class="order-included_tax_total <%= "hidden" if @order.included_tax_total.zero? %>" id='included_tax_total'><%= @order.display_included_tax_total.to_html %></dd>
+
+    <dt class="order-additional_tax_total <%= "hidden" if @order.additional_tax_total.zero? %>" data-hook='admin_order_tab_additional_tax_title'><%= Spree::Order.human_attribute_name(:additional_tax_total) %>:</dt>
+    <dd class="order-additional_tax_total <%= "hidden" if @order.additional_tax_total.zero? %>" id='additional_tax_total'><%= @order.display_additional_tax_total.to_html %></dd>
+
+    <dt data-hook='admin_order_tab_total_title'><%= Spree::Order.human_attribute_name(:total) %>:</dt>
+    <dd id='order_total'><%= @order.display_total.to_html %></dd>
+
+    <% if @order.shipment_state %>
+      <dt class="order-shipment_state"><%= Spree::Shipment.model_name.human %>: </dt>
+      <dd class="order-shipment_state" id='shipment_status'>
+        <span class="pill pill-<%= @order.shipment_state %>">
+          <%= t(@order.shipment_state, scope: 'spree.shipment_states') %>
+        </span>
+      </dd>
+    <% end %>
+
+    <% if @order.payment_state %>
+      <dt class="order-payment_state"><%= Spree::Payment.model_name.human %>: </dt>
+      <dd class="order-payment_state" id='payment_status'>
+        <span class="pill pill-<%= @order.payment_state %>">
+          <%= t(@order.payment_state, scope: 'spree.payment_states') %>
+        </span>
+      </dd>
+    <% end %>
+
+    <% if @order.completed? %>
+      <dt data-hook='admin_order_tab_date_completed_title'><%= Spree::Order.human_attribute_name(:completed_at) %>:</dt>
+      <dd id='date_complete'><%= pretty_time(@order.completed_at) %></dd>
+    <% end %>
+
+    <% if @order.approved? %>
+      <dt><%= Spree::Order.human_attribute_name(:approver) %></dt>
+      <dd><%= @order.approver.try(:email) || @order.approver_name %></dd>
+      <dt><%= Spree::Order.human_attribute_name(:approved_at) %></dt>
+      <dd><%= pretty_time(@order.approved_at) %></dd>
+    <% end %>
+
+    <% if @order.canceled? && @order.canceler && @order.canceled_at %>
+      <dt><%= Spree::Order.human_attribute_name(:canceler) %></dt>
+      <dd><%= @order.canceler.email %></dd>
+      <dt><%= Spree::Order.human_attribute_name(:canceled_at) %></dt>
+      <dd><%= pretty_time(@order.canceled_at) %></dd>
+    <% end %>
+
+    <% if @order.solidus_bling_seller_id %>
+      <dt data-hook='admin_order_tab_seller_title'>Vendedor:</dt>
+      <dd id='seller'><%= ::SolidusBling::Seller.find_by(id: @order.solidus_bling_seller_id).name %></dd>
+    <% end %>
+  </dl>
+
+</header>

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

@@ -120,27 +120,14 @@
     <% end %>
   </fieldset>
 
-    <fieldset class="no-border-top">
+  <fieldset class="no-border-top text-center">
     <legend>
-      Vendedores
+      Vendedor padrão
     </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 %>
+    <% if bling_account.sellers.default %>
+      <span><%= bling_account.sellers.default.name %></span>
+    <% else %>
+      <span>Vendedor padrão não selecionado</span>
     <% end %>
   </fieldset>
 

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

@@ -36,6 +36,9 @@
           <%= label_tag :refresh_token, "Refresh Token" %>
           <%= text_field_tag :refresh_token, account.refresh_token, class:"fullwidth", disabled: true %>
         </div>
+        <div class="field">
+          <%= button_to "Atualizar vendedores", upsert_sellers_admin_solidus_bling_accounts_path %>
+        </div>
       </div>
 
       <div class="col-12 col-md-6">

data/config/routes.rb

@@ -3,9 +3,15 @@
 Spree::Core::Engine.routes.draw do
   # Add your extension routes here
   namespace :admin do
+    namespace :orders do
+      get "/:order_number/sellers", controller: "sellers", action: "edit", as: :seller
+      patch "/:order_number/sellers", controller: "sellers", action: "update", as: :update_seller
+    end
+    
     namespace :solidus_bling do
       resources :accounts do
         get "authorize", on: :collection
+        post "upsert_sellers", on: :collection
       end
       resources :orders, only: [:update]
     end

data/db/migrate/20240318171147_add_solidus_bling_seller_id_to_orders.rb

@@ -0,0 +1,5 @@
+class AddSolidusBlingSellerIdToOrders < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :spree_orders, :solidus_bling_seller, foreign_key: true
+  end
+end

data/db/migrate/20240318180555_add_deafult_column_to_sellers.rb

@@ -0,0 +1,6 @@
+class AddDeafultColumnToSellers < ActiveRecord::Migration[7.0]
+  def change
+    add_column :solidus_bling_sellers, :default, :boolean, default: false
+    add_index :solidus_bling_sellers, :external_id, unique: true
+  end
+end

data/lib/solidus_bling/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusBling
-  VERSION = "3.2.9"
+  VERSION = "3.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bling
 version: !ruby/object:Gem::Version
-  version: 3.2.9
+  version: 3.3.1
 platform: ruby
 authors:
 - Hamilton Tumenas Borges
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-14 00:00:00.000000000 Z
+date: 2024-03-21 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: []
@@ -105,10 +105,12 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/spree/admin/orders/sellers_controller.rb
 - app/controllers/spree/admin/solidus_bling/accounts_controller.rb
 - app/controllers/spree/admin/solidus_bling/orders_controller.rb
 - app/jobs/solidus_bling/application_job.rb
 - app/jobs/solidus_bling/order_job.rb
+- app/jobs/solidus_bling/upsert_sellers_job.rb
 - app/models/solidus_bling/account.rb
 - app/models/solidus_bling/event.rb
 - app/models/solidus_bling/order.rb
@@ -116,7 +118,11 @@ files:
 - app/models/solidus_bling/seller.rb
 - app/models/solidus_bling/shipping_method.rb
 - app/models/solidus_bling/token.rb
+- app/models/spree/permission_sets/seller_update.rb
 - app/subscribers/solidus_bling/subscriber.rb
+- app/views/spree/admin/orders/sellers/edit.html.erb
+- app/views/spree/admin/shared/_order_submenu.html.erb
+- app/views/spree/admin/shared/_order_summary.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
@@ -140,6 +146,8 @@ files:
 - 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
+- db/migrate/20240318171147_add_solidus_bling_seller_id_to_orders.rb
+- db/migrate/20240318180555_add_deafult_column_to_sellers.rb
 - lib/generators/solidus_bling/install/install_generator.rb
 - lib/generators/solidus_bling/install/templates/initializer.rb
 - lib/solidus_bling.rb
@@ -155,7 +163,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
@@ -173,8 +181,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Solidus extension to integrate with the Bling
 test_files: []