solidus_bling 3.3.6 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 247f2caa631753a645f8e6a723838986a2e2068a28cb81ab73f65d05b7ce8664
-  data.tar.gz: 50f45c4271fc7d5b8490df6299fc3f9cc36bc1466420d6962c03bb13bbd7ae6b
+  metadata.gz: 79fe67e27c629bd466518506f8e9e115ad5b2f59c3e719f52d96913df4c269ad
+  data.tar.gz: 8071666721cfbe0ad08a837934c19b7cfbcff6374d7fdc3512d87ba37f2d96b4
 SHA512:
-  metadata.gz: cc852d80cc886306856920c9f394e15712400a52cd77193925bbf6c1e507362f2a6c728b34b98605ae04e24601a7a15e3aacd8d4c69785b53155c956a9d86798
-  data.tar.gz: e341310b153260dc2b971cc103c628b6897544e37e378f19415c8b54a1fafc94bc0d723b58b1f64bf44b77df13f2f3a6e0bbb1f1fcbfc41b01b11303e1a88fdd
+  metadata.gz: e016162873a364862bff55d5734050929b8e5364078117031b155727151f7d8c41d5f2cd684ccbfb6f2a1ff8a428044579277ab876314e3da8c8d5990a9cc5a7
+  data.tar.gz: e5ae337ef3dd76787e3ce8207896db660a40a1d83a8acb2cef6450a869e8324ab4aac5b1ea60f63a2eee3f6d387a23ec84e0b8ee731f83aaae286e028f9e261b

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

@@ -9,7 +9,7 @@ module Spree
             flash[:error] = "Pedido já enviado"
             redirect_to edit_admin_order_customer_path(order)
           else
-            ::SolidusBling::OrderJob.perform_later(event: { order: order })
+            ::SolidusBling::SendOrderJob.perform_later(event: { order: order })
             flash[:success] = "O pedido está sendo enviado"
             redirect_to edit_admin_order_customer_path(order)
           end

data/app/jobs/solidus_bling/order_job.rb

@@ -4,15 +4,8 @@ module SolidusBling
 
     def perform(event:)
       order = event[:order]
-      bling_event = SolidusBling::Event.new(internal_id: order.id, body: order.to_json)
-      begin
-        SolidusBling::Order.new(order).send
-        bling_event.status = "success"
-      rescue => e
-        bling_event.status = "error"
-        bling_event.message = e.to_json
-      ensure
-        bling_event.save!
+      unless SolidusBling::Order.needs_approval?(order)
+        SolidusBling::SendOrderJob.perform_later(order)
       end
     end
   end

data/app/jobs/solidus_bling/send_order_job.rb

@@ -0,0 +1,18 @@
+module SolidusBling
+  class SendOrderJob < ApplicationJob
+    queue_as :default
+
+    def perform(order)
+      bling_event = SolidusBling::Event.new(internal_id: order.id, body: order.to_json)
+      begin
+        SolidusBling::Order.new(order).send
+        bling_event.status = "success"
+      rescue => e
+        bling_event.status = "error"
+        bling_event.message = e.to_json
+      ensure
+        bling_event.save!
+      end
+    end
+  end
+end

data/app/models/solidus_bling/order.rb

@@ -178,5 +178,15 @@ module SolidusBling
     def build_order_url
       "Link para o pedido: #{@order.store.url}/pedidos/#{@order.number}"
     end
+
+    def self.needs_approval?(order)
+      payment_method = order.payments.valid.last.payment_method
+      importation_rules = SolidusBling.config.importation_rules
+      if importation_rules
+        order.total >= importation_rules[:amount] && importation_rules[:payment_methods].include?(payment_method.type)
+      else
+        false
+      end
+    end
   end
 end

data/app/subscribers/solidus_bling/subscriber.rb

@@ -5,7 +5,7 @@ module SolidusBling
     handle :order_finalized,
       with: :send_order_to_bling
 
-    def send_order_to_bling event, debug_info = {}
+    def send_order_to_bling(event, debug_info = {})
       SolidusBling::OrderJob.perform_later(event: event.payload)
     end
   end

data/lib/generators/solidus_bling/install/templates/initializer.rb

@@ -1,2 +1,6 @@
 SolidusBling.configure do |config|
+  config.importation_rules = {
+    payment_methods: [],
+    amount: 0
+  }
 end

data/lib/solidus_bling/configuration.rb

@@ -1,10 +1,6 @@
-# frozen_string_literal: true
-
 module SolidusBling
   class Configuration
-    # Define here the settings for this extension, e.g.:
-    #
-    # attr_accessor :my_setting
+    attr_accessor :importation_rules
   end
 
   class << self

data/lib/solidus_bling/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bling
 version: !ruby/object:Gem::Version
-  version: 3.3.6
+  version: 3.4.1
 platform: ruby
 authors:
 - Todas Essas Coisas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-10 00:00:00.000000000 Z
+date: 2024-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -111,6 +111,7 @@ files:
 - 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/send_order_job.rb
 - app/jobs/solidus_bling/upsert_sellers_job.rb
 - app/models/solidus_bling/account.rb
 - app/models/solidus_bling/event.rb
@@ -183,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Solidus extension to integrate with the Bling