solidus_bling 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bcd2be4e908655cc3e344207e95426a1080bd7ce085c7681afc04c8e42f1669
-  data.tar.gz: d45a21cb6418615949b88cb148e12f713945bab1b69dcd8ce5339c8bae6de271
+  metadata.gz: 3888ee5c2c2115caad5550a8b4b0c4a8c357271dedac7ceac19d8f9bf518b4b0
+  data.tar.gz: e635f3c6e6dafb8a38b437611cc157e0535a0dfacebe61f60bf7bf31be0bc76b
 SHA512:
-  metadata.gz: f2e1c07f30c56963647a28896f834be013489509c69331dc2806745b20ec6c8205b754b32ff9e7721ce492fee2191f33b92d4a46e2f9ee41fd61ad76ffe7e641
-  data.tar.gz: 3a8170ad8a641d67c132c95ce36ba0a5967f779141657872edbdda5208e35f25b5677dd756a7b3601cbc18ee1f8159d8b14f32901cf672ba946f20b6122a8076
+  metadata.gz: 52f2e484e6f4ed2110b5ea29858eea98bb24de7fd6d65d0381632bcf47650c18d978afd7265026b3b02f7f528f648ee0895fec925043d5119550a0f95025c9f6
+  data.tar.gz: 3ffda6fc4dedc0ceda4dc2bb9d0e9de143fbda038562a6efb4297e195ba679125e47e3c77428c88483fe22f7240c276b6dbb7598a3d4d39915a02e15d0189baf

data/.gitignore

@@ -19,3 +19,4 @@ spec/examples.txt
 .rvmrc
 .ruby-version
 .ruby-gemset
+release.sh

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

@@ -10,8 +10,8 @@ module Spree
 
       def new
         @bling_account = SolidusBling::Account.new
-        @payment_methods = Spree::PaymentMethod.all.pluck(:name, :id)
-        @shipping_methods = Spree::ShippingMethod.all.pluck(:name, :id)
+        @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
@@ -24,8 +24,10 @@ module Spree
 
       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)
+        @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")
       end
 
       def update

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

@@ -0,0 +1,20 @@
+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/helpers/solidus_bling/bling_products_helper.rb

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

data/app/jobs/solidus_bling/update_product_job.rb

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

data/app/models/solidus_bling/contact.rb

@@ -39,7 +39,7 @@ module SolidusBling
       ensure
         json = JSON.parse(req.body)
         response_has_error?(json)
-        Spree::Bus.publish :bling_contact_created, args: {order: order, contato: json}
+        ::Spree::Bus.publish :bling_contact_created, args: {order: order, contato: json}
         return json.dig("data", "id")
       end
     end

data/app/models/solidus_bling/product.rb

@@ -4,14 +4,14 @@ module SolidusBling
 
     def self.update bling_account
       bling_api = SolidusBling::Api.new(bling_account)
-      skus = Spree::Variant.pluck(:sku)
+      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}"
+          # p "#{sku} => #{res_json}"
           next if res_json["data"] == []
           product = res_json["data"].first
           hash_products[sku] = product["id"]
@@ -23,13 +23,13 @@ module SolidusBling
           }
         rescue => e
           hash_products[sku] = res_json
-          p "#{sku} => #{res_json} => #{e}"
+          # 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
+      ::Spree::Bus.publish :bling_products_updated, products: hash_products
     end
 
   end

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

@@ -1,2 +1,9 @@
+<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>
+  <span>Ultima atualização: <%= @last_update %> </span>
+</div>
 
 <%= render "form", bling_account: @bling_account, form_url: admin_account_path(@bling_account.id) %>

data/config/locales/pt-BR.yml

@@ -0,0 +1,5 @@
+pt-BR:
+  spree:
+    admin:
+      tab:
+        bling_account: "Conta Bling"

data/config/routes.rb

@@ -3,5 +3,6 @@
 Spree::Core::Engine.routes.draw do
   namespace :admin do
     resources :accounts
+    resources :bling_products, only: [:update]
   end
 end

data/db/migrate/20230918141505_add_bling_order_id_to_spree_orders.rb

@@ -1,5 +1,5 @@
 class AddBlingOrderIdToSpreeOrders < ActiveRecord::Migration[7.0]
   def change
-    add_column :spree_orders, :bling_order_id, :string, default: nil
+    add_column :spree_orders, :bling_order_id, :string, default: nil, if_not_exists: true
   end
 end

data/lib/solidus_bling/engine.rb

@@ -19,7 +19,7 @@ module SolidusBling
           [:bling_account],
           'exclamation',
           url: :admin_accounts_path,
-          condition: -> { can?(:manage, Spree::Store) }
+          condition: -> { can?(:manage, ::Spree::Store) }
         )
       end
     end

data/lib/solidus_bling/version.rb

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

data/spec/helpers/solidus_bling/bling_products_helper_spec.rb

@@ -0,0 +1,17 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the BlingProductsHelper. For example:
+#
+# describe BlingProductsHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+module SolidusBling
+  RSpec.describe BlingProductsHelper, type: :helper do
+    pending "add some examples to (or delete) #{__FILE__}"
+  end
+end

data/spec/jobs/solidus_bling/update_product_job_spec.rb

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

data/spec/requests/solidus_bling/bling_products_spec.rb

@@ -0,0 +1,7 @@
+require 'rails_helper'
+
+RSpec.describe "BlingProducts", type: :request do
+  describe "GET /index" do
+    pending "add some examples (or delete) #{__FILE__}"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bling
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - ulysses-bull
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2023-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -109,13 +109,16 @@ files:
 - app/assets/stylesheets/spree/backend/solidus_bling.css
 - app/assets/stylesheets/spree/frontend/solidus_bling.css
 - 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/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
@@ -139,6 +142,7 @@ files:
 - bin/sandbox
 - bin/setup
 - 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
@@ -156,9 +160,11 @@ files:
 - 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
@@ -166,6 +172,7 @@ files:
 - 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
 licenses:
@@ -198,9 +205,11 @@ 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
@@ -208,4 +217,5 @@ test_files:
 - 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