solidus_bling 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5e682805dbb12047c1270e17a1c65a8214e7c15b4a361968786a2308d930853
-  data.tar.gz: 17d23a121b4801c5cf9565b1162ee4c5deb017946f1d6af46990c4106c08a8b7
+  metadata.gz: 57eb623fa49a1b9f53dac0ad680791afba17c0b1964ffb68042f3c962362003f
+  data.tar.gz: e0063409850eccd59f8a7945b0cdc3cf3cf12a9936d65cd08af5bad5f5272867
 SHA512:
-  metadata.gz: f5a1079cdf8a0858edba5e0d1de786a3b6cb390623a7f568ec482db319f520eaf0e8a0452661c311a5c24cd0de9ac8470c2ded2258d04d2d0b3e7e5358c8d105
-  data.tar.gz: f7b8d0c0bbbf2e89028b3aa84407036e55b095cfdb40743696c55ccfc00302f393e096e7608e39ec9e81562d1036a43dd5af1fd0e6a4e98304885f736219fcfc
+  metadata.gz: 01ab7448075d61c24cd7b7bd95bc964bc9967616e05248c1db21b7b4f1835bc8340b5152dfdadb2eee9adead2e8923165851c5d23582fe9873f3ac5921f9425b
+  data.tar.gz: 36fb291c3658ebbe20a303c7a75aea9c58e18a3f37401bbc2131291e3e4fff0150dabc73d677751be7dd52987931196e8f060ccb5a66a03fcb3312fa0475ee4f

data/app/jobs/erp_contact_job.rb

@@ -1,10 +1,12 @@
 class ErpContactJob < ApplicationJob
   queue_as :default
 
-  def perform order:, contact:, event_name:, method_name:
+  def perform event:, method_name:
     erp_event = ErpEvent.new
+    contact = event[:args][:contato]
+    order = event[:args][:order]
     erp_event.internal_id = order.id
-    erp_event.name = event_name
+    erp_event.name = "event.omnes_event_name"
     erp_event.method = method_name
     if contact.include? "error"
       erp_event.status = 'error'

data/app/jobs/erp_order_job.rb

@@ -1,10 +1,10 @@
 class ErpOrderJob < ApplicationJob
   queue_as :default
 
-  def perform order:, event_name:, method_name:
+  def perform event:, method_name:
     erp_event = ErpEvent.new
+    order = event[:order]
     erp_event.internal_id = order.id
-    erp_event.name = event_name
     erp_event.method = method_name
     begin
       Bling::Pedido.new(order).send

data/app/jobs/erp_product_job.rb

@@ -1,9 +1,9 @@
 class ErpProductJob < ApplicationJob
   queue_as :default
 
-  def perform products:, event_name:, method_name:
+  def perform event:, method_name:
     erp_event = ErpEvent.new
-    erp_event.name = event_name
+    products = event[:products]
     erp_event.method = method_name
     erp_event.body = products.to_json
     erp_event.save!

data/app/models/bling/api.rb

@@ -20,6 +20,7 @@ module Bling
       body = "grant_type=refresh_token&refresh_token=#{@account.refresh_token}"
       res = ::Typhoeus.post("#{@account.api_base_url}/oauth/token", headers: headers, body: body)
       body = JSON.parse(res.body)
+      response_has_error? body
       expire_datetime = res.headers["date"].to_datetime.utc + body["expires_in"].seconds
       @account.update(
         access_token: body["access_token"],

data/app/subscribers/bling/subscriber.rb

@@ -14,26 +14,19 @@ module Bling
     with: :contato_created,
     id: :contato_created
 
-    def send_order_to_bling event
-      order = event.payload[:order]
-      subscriber_name = event.omnes_event_name
+    def send_order_to_bling event, debug_info = {}
       method = __method__.to_s
-      ErpOrderJob.perform_later(order: order, event_name: subscriber_name, method_name: method)
+      ErpOrderJob.perform_later(event: event.payload, method_name: method)
     end
 
-    def contato_created event
-      contato = event.payload[:args][:contato]
-      order = event.payload[:args][:order]
-      subscriber_name = event.omnes_event_name
+    def contato_created event, debug_info = {}
       method = __method__.to_s
-      ErpContactJob.perform_later(order: order, contact: contato, event_name: subscriber_name, method_name: method)
+      ErpContactJob.perform_later(event: event.payload, method_name: method)
     end
 
-    def products_updated event
-      products = event.payload[:products]
+    def products_updated event, debug_info = {}
       method = __method__.to_s
-      subscriber_name = event.omnes_event_name
-      ErpProductJob.perform_later(products: products, event_name: subscriber_name, method_name: method)
+      ErpProductJob.perform_later(event: event.payload, method_name: method)
     end
   end
 end

data/db/migrate/20230906141728_add_erp_id_to_spree_orders.rb

@@ -1,6 +1,5 @@
 class AddErpIdToSpreeOrders < ActiveRecord::Migration[7.0]
   def change
     add_column :spree_orders, :erp_order_id, :string, default: nil
-    add_column :spree_orders, :cpf_cnpj, :string
   end
 end

data/lib/solidus_bling/version.rb

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

data/lib/solidus_bling.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'solidus_brazilian_adaptations'
 require 'typhoeus'
 require 'solidus_bling/configuration'
 require 'solidus_bling/version'

data/solidus_bling.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   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'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bling
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - ulysses-bull
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2023-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -58,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: solidus_brazilian_adaptations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +134,6 @@ files:
 - db/migrate/20230906141728_add_erp_id_to_spree_orders.rb
 - db/migrate/20230906142108_create_erp_products.rb
 - db/migrate/20230906142806_create_erp_events.rb
-- db/migrate/20230908145050_add_number_district_to_addresses.rb
 - lib/generators/solidus_bling/install/install_generator.rb
 - lib/generators/solidus_bling/install/templates/initializer.rb
 - lib/solidus_bling.rb

data/db/migrate/20230908145050_add_number_district_to_addresses.rb

@@ -1,6 +0,0 @@
-class AddNumberDistrictToAddresses < ActiveRecord::Migration[7.0]
-  def change
-    add_column :spree_addresses, :number, :string
-    add_column :spree_addresses, :district, :string
-  end
-end