solidus_bling 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81e47bc81b103b82f681395e85e63674a0950316711770d0bbe6ca6f854eef01
-  data.tar.gz: 3983f4e929e14af2409202589016c7bb330376a2e38e0d1a33e02fcfa5620583
+  metadata.gz: cb30252c0e9c0cc28db34354c406558e6bd5c0287814985022f831d1e843a763
+  data.tar.gz: 4dffc04c53547441ea2100979aaba16a212a5dca7abbeae89939e99bd591bbd4
 SHA512:
-  metadata.gz: 885bd2077efb3f7dc2d0b0cad3ba18e92f136c82608da254e35de9b6867ce235a587d11dfdee02d88ff086fff0e96ab19f5acf58c587ce6579b432fde861eb0b
-  data.tar.gz: 754480ad38bc954d93577623a3aaee813dead59ee10aede1afed9a5aa48c425b675f62d03a04eb934459eb5e62cb238cb78cd71ea548c88b9c2854318f023a96
+  metadata.gz: 54da612e78e3aaffadf4fd10a128cc1618cf07239a7f98a40709cc5643c7f33a2f59d432e36305874d91a4f79519f54862f836851f0eeae182d0334e117fe160
+  data.tar.gz: e9c62701428a91238bd1d9789d00e6190f6fe42385d63c8fd7fd8e1653b1a6948431c7d6e380322ca3f1f387d8645293830b9748dfbbbcc776df04ebc27fcd22

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,8 @@ 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)
       end
 
       def update

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

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

@@ -0,0 +1,13 @@
+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/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/order.rb

@@ -108,7 +108,7 @@ module SolidusBling
         },
         "volumes": [
           {
-            "servico": order.shipments.last.selected_shipping_rate.name,
+            "servico": @account.shipping_methods.find_by(spree_shipping_method_id: order.shipments.last.shipping_method.id).alias,
             "codigoRastreamento": ""
           }
         ]

data/app/models/solidus_bling/payment_method.rb

@@ -1,5 +1,6 @@
 module SolidusBling
   class PaymentMethod < ApplicationRecord
     belongs_to :account
+    belongs_to :spree_payment_method, class_name: "Spree::PaymentMethod"
   end
 end

data/app/models/solidus_bling/product.rb

@@ -4,7 +4,7 @@ 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 
@@ -29,7 +29,7 @@ module SolidusBling
         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/models/solidus_bling/shipping_method.rb

@@ -1,5 +1,6 @@
 module SolidusBling
   class ShippingMethod < ApplicationRecord
     belongs_to :account
+    belongs_to :spree_shipping_method, class_name: "Spree::ShippingMethod"
   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/generators/solidus_bling/install/install_generator.rb

@@ -36,6 +36,10 @@ module SolidusBling
           puts 'Skipping bin/rails db:migrate, don\'t forget to run it!' # rubocop:disable Rails/Output
         end
       end
+
+      def install_dependencies
+        puts "\nTo complete the installation, please run:\nbin/rails generate solidus_brazilian_adaptations:install"
+      end
     end
   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
@@ -29,10 +29,12 @@ module SolidusBling
       g.test_framework :rspec
     end
 
-    config.to_prepare do
-      Spree::Bus.register(:bling_products_updated)
-      Spree::Bus.register(:bling_contact_created)
-      SolidusBling::Subscriber.new.subscribe_to(Spree::Bus)
+    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
 
   end

data/lib/solidus_bling/version.rb

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

data/solidus_bling.gemspec

@@ -35,9 +35,4 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'solidus_dev_support', '~> 2.7'
 
-  spec.post_install_message = <<-MESSAGE
-    To complete the installation, please run:
-    bin/rails g solidus_brazilian_adaptations:install
-  MESSAGE
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bling
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - ulysses-bull
@@ -109,6 +109,8 @@ 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/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/jobs/solidus_bling/application_job.rb
 - app/jobs/solidus_bling/contact_job.rb
@@ -172,9 +174,7 @@ 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: |2
-      To complete the installation, please run:
-      bin/rails g solidus_brazilian_adaptations:install
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib