solidus_bling 2.0.4 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e4a5f9765d1f7f6e6b29effcaac981bbe0dfd62b8786d643f9d2a60b9340a59
-  data.tar.gz: 8b153d5ba28e4f284521f6721309188d8ff87ec7826f1093a57c741c27a2480a
+  metadata.gz: fd3b2416612bb0c496adcbe4dadb851decd26a74c378ea362f5ab47a2cac9c50
+  data.tar.gz: 8b918c41a1a377631d470407b6d711f7dd57d4183d558e24ab99627f433b3394
 SHA512:
-  metadata.gz: 557622616334f5524f651a6e30e3ec1d17b0f01ff4e5c7c97a74daca156543e5f003c7b2f015bcfb17e03986054b02f2b8f85b2d125147b96b79247ce2b3fad7
-  data.tar.gz: '099ecd7d4c1b2f485884124545fe25fedeb8c168b6da4b6f8bce124f37e4de289cf4d281f35d0d316e56f6b87d4853687b2ef24ac7a2970166cc5194acecd0ac'
+  metadata.gz: 82e33cf15f8c38519af2688ce3834aca4777c16995f83ddf394de8689d274459896357b910ccb23dc0e03aa5dbdf54a267ef5068fd799eb79ba24ea1061411d8
+  data.tar.gz: 246a8b67a86852e725584de7a7d413f293ac3c31984fa889baba8d188132d17e1325b800cb0b76cc9be5ce8d7c3ccc40637a385140b387429f1084206b6c3d96

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

@@ -18,8 +18,14 @@ module Spree
       end
       
       def create
-        bling_account = SolidusBling::Account.create account_params.merge(name: "Bling")
-        redirect_to admin_accounts_path
+        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
@@ -27,7 +33,7 @@ module Spree
         @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.created_at.strftime("%d/%m/%Y %H:%M")
+        @last_update = SolidusBling::Event.where(method: "products_updated").max.try(:created_at)
       end
 
       def update
@@ -49,7 +55,12 @@ module Spree
       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], sellers_attributes: [:id, :name, :external_id])
+        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

data/app/models/solidus_bling/account.rb

@@ -1,9 +1,9 @@
 module SolidusBling
   class Account < ApplicationRecord
-    has_many :payment_methods
-    has_many :shipping_methods
-    has_many :products
-    has_many :sellers
+    has_many :payment_methods, dependent: :destroy
+    has_many :shipping_methods, dependent: :destroy
+    has_many :products, dependent: :destroy
+    has_many :sellers, dependent: :destroy
     accepts_nested_attributes_for :payment_methods, :shipping_methods, :sellers
   end
 end

data/app/models/solidus_bling/order.rb

@@ -5,7 +5,7 @@ module SolidusBling
       super(SolidusBling::Account.first)
       @order = order
     end
-    
+
     def send
       if @order.present?
         contato = SolidusBling::Contact.new(@order, @account)
@@ -34,31 +34,35 @@ module SolidusBling
         "numeroLoja": order.number,
         "data": order.completed_at.strftime("%Y-%m-%d"),
         "loja": {
-            "id": @account.external_store_id
+          "id": @account.external_store_id
         },
         "contato": {
-            "id": contato["id"]
+          "id": contato["id"]
         },
         "itens": build_array_items(order.line_items),
         "vendedor": {
-            "id": @account.sellers.first.external_id
+          "id": @account.sellers.first.external_id
         },
         "transporte": build_hash_transporte(order),
         "parcelas": build_array_parcelas(order),
         "desconto": {
-            "valor": order.promo_total&.to_f.abs || 0,
-            "unidade": "REAL"
+          "valor": order.promo_total&.to_f.abs || 0,
+          "unidade": "REAL"
         },
         "totalProdutos": order.item_total.to_f,
         "total": order.total.to_f,
         "observacoes": " Nº Pedido Loja: #{order.number}",
-        "observacoesInternas": "Pagamento: #{@parcelas}x R$ #{(order.total.to_f / @parcelas).round(2)}\nForma de envio: #{order.shipments.last.selected_shipping_rate.name}\n#{build_cupons(order.promotions)}",
+        "observacoesInternas": "Pagamento: #{@parcelas}x R$ #{(order.total.to_f / @parcelas).round(2)}\nForma de envio: #{order.shipments.last.selected_shipping_rate.name}\n#{build_cupons(order.promotions)}#{build_order_url(order)}",
         "categoria": {
-            "id": @account.incoming_category_id
+          "id": @account.incoming_category_id
         }
       }
     end
 
+    def build_order_url order
+      "Link para o pedido: #{order.store.url}/orders/#{order.number}/token/#{order.guest_token}"
+    end
+
     def build_array_items items
       items.map do |item|
         bling_product = SolidusBling::Product.find_by(sku: item.sku)
@@ -67,8 +71,8 @@ module SolidusBling
           "quantidade": item.quantity,
           "valor": item.price.to_f,
           "produto": {
-              "id": bling_product.external_id
-            }
+            "id": bling_product.external_id
+          }
         }
       end
     end
@@ -81,34 +85,40 @@ module SolidusBling
       valor_parcela = order.total.to_f / @parcelas
       1.upto(@parcelas).map do |parcela|
         {
-            "dataVencimento": (order.completed_at + parcela.months).strftime("%Y-%m-%d"),
-            "valor": valor_parcela,
-            "formaPagamento": {
-                "id": @account.payment_methods.find_by(spree_payment_method_id: order.payments.last.payment_method_id).external_id
-            }
+          "dataVencimento": (order.completed_at + parcela.months).strftime("%Y-%m-%d"),
+          "valor": valor_parcela,
+          "formaPagamento": {
+            "id": @account.payment_methods.find_by(spree_payment_method_id: order.payments.last.payment_method_id).external_id
+          }
         }
       end
     end
 
     def build_hash_transporte order
+      shipping_method = @account.shipping_methods.find_by(spree_shipping_method_id: order.shipments.last.shipping_method.id)
+      servico = shipping_method.nil? ? "" : shipping_method.alias
+      transportadora = shipping_method.nil? ? "" : shipping_method.company
       {
         "fretePorConta": 1,
         "frete": order.shipment_total.to_f,
         "quantidadeVolumes": 1,
+        "contato": {
+          "nome": transportadora,
+        },
         "etiqueta": {
-            "nome": order.ship_address.name,
-            "endereco": order.ship_address.address1,
-            "numero": order.ship_address.number,
-            "complemento": order.ship_address.address2,
-            "municipio": order.ship_address.city,
-            "uf": order.ship_address.state.abbr,
-            "bairro": order.ship_address.district,
-            "cep": order.ship_address.zipcode,
-            "nomePais": "Brasil"
+          "nome": order.ship_address.name,
+          "endereco": order.ship_address.address1,
+          "numero": order.ship_address.number,
+          "complemento": order.ship_address.address2,
+          "municipio": order.ship_address.city,
+          "uf": order.ship_address.state.abbr,
+          "bairro": order.ship_address.district,
+          "cep": order.ship_address.zipcode,
+          "nomePais": "Brasil"
         },
         "volumes": [
           {
-            "servico": @account.shipping_methods.find_by(spree_shipping_method_id: order.shipments.last.shipping_method.id).alias,
+            "servico": servico,
             "codigoRastreamento": ""
           }
         ]

data/app/models/solidus_bling/payment_method.rb

@@ -1,5 +1,7 @@
 module SolidusBling
   class PaymentMethod < ApplicationRecord
+    validates :external_id, presence: true
+
     belongs_to :account
     belongs_to :spree_payment_method, class_name: "Spree::PaymentMethod"
   end

data/app/models/solidus_bling/seller.rb

@@ -1,5 +1,8 @@
 module SolidusBling
   class Seller < ApplicationRecord
+    validates :name, presence: true
+    validates :external_id, presence: true
+
     belongs_to :account
   end
 end

data/app/models/solidus_bling/shipping_method.rb

@@ -1,5 +1,7 @@
 module SolidusBling
   class ShippingMethod < ApplicationRecord
+    validates :alias, presence: true
+
     belongs_to :account
     belongs_to :spree_shipping_method, class_name: "Spree::ShippingMethod"
   end

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

@@ -40,6 +40,7 @@
     <%= 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 %>
@@ -50,7 +51,10 @@
     <%= 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>

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

@@ -3,7 +3,9 @@
   {confirm: "Deseja baixar os produtos?" } %>
   <span>Produtos baixados: <%= @products_count %></span>
   <br>
-  <span>Ultima atualização: <%= @last_update %> </span>
+  <% 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/db/migrate/20231018141940_add_company_to_solidus_bling_shipping_methods.rb

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

data/lib/solidus_bling/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusBling
-  VERSION = '2.0.4'
+  VERSION = '2.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bling
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.6
 platform: ruby
 authors:
 - ulysses-bull
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-19 00:00:00.000000000 Z
+date: 2023-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -151,6 +151,7 @@ files:
 - 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
 - lib/generators/solidus_bling/install/install_generator.rb
 - lib/generators/solidus_bling/install/templates/initializer.rb
 - lib/solidus_bling.rb
@@ -199,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Solidus extension to integrate with the Bling