solidus_me 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67eaf235ef7a480092aac742313cb9f1746a56329e9a406b307768aef24f4422
-  data.tar.gz: fd2becf059939f163cb8337a0df9ff89a623f219bd1383a28ebd679ac2453d2c
+  metadata.gz: ac3b73ea48e4461bf029a3882594562aaeffd9e1ac0617b92642f1c32bb731e5
+  data.tar.gz: 8570fb55a1623c0c13e721b7b7a5fb7085a6fb42a2411b5266549e032478966e
 SHA512:
-  metadata.gz: dc32f4f9aff29da78361eb4fedca2103c7fe96c6766cd142a9ba0cc83a4a5887404186c23a96ddbb5f2316164d9114d9e267778010624af8333b14bea74aaef8
-  data.tar.gz: 9167dc1d2b02eb20ede01003a079e40fdafeec9f554547baa0896ce734bd3ea40d0ee6f1e4160fff952090e4ec2b41255fda1c9a3a8bdaf74a4756d519542905
+  metadata.gz: d71249d412670d8d4a2af11164a9ab2180abcd8022a88b77ebd925c53557ccd54c71f8b5ff12a2b684c7df8b11d0b2f8f49fdda145bed1b48582b4974e01df3c
+  data.tar.gz: 0ac0090dd26a8002a7f2c57a19a6685779caaf0b65133f6c9893de6ac44e3b760fdd311eba90219316a4ffef6b77431a3cb2aef4e7d421ac30096942e2bbb719

data/app/models/solidus_me/melhor_envio.rb

@@ -40,7 +40,6 @@ module SolidusMe
 
       @me_account.check_token
       @me_client = MeApi::Client.new(@me_account.access_token)
-
       melhor_envio_rates = get_rates_from_melhor_envio(package)
       shipping_rates = melhor_envio_rates.map do |melhor_envio_rate|
         build_shipping_rate(melhor_envio_rate, package)
@@ -49,19 +48,90 @@ module SolidusMe
       shipping_rates
     end
 
+    def insert_package_into_cart from
+      me_client = set_me_client
+      order = package.order
+      variants = order.variants
+      line_items = order.line_items
+      address = order.ship_address
+      weight = package.weight
+      dimensions = estimate_dimensions_from_package(package)
+
+      shipping_method_name = @shipping_methods.sole.name
+      service_id = SHIPPING_METHODS.filter { _1[:name] == shipping_method_name }.sole[:external_id]
+
+      to = {
+        name: address.name,
+        phone: address.phone,
+        email: order.email,
+        document: order.tax_id,
+        address: address.address1,
+        complement: address.address2,
+        number: address.number,
+        district: address.district,
+        city: address.city,
+        postal_code: address.zipcode,
+        state_abbr: address.state.abbr
+      }
+
+      products = []
+      line_items.each do |line_item|
+        products << {
+          name: line_item.name,
+          quantity: line_item.quantity,
+          unitary_value: line_item.price
+        }
+      end
+
+      volumes = [{
+        width: dimensions[0].to_i.round(2),
+        height: dimensions[1].to_i.round(2),
+        length: dimensions[2].to_i.round(2),
+        weight: weight
+      }]
+
+      me_client.insert_package_into_cart(service_id:, from:, to:, products:, volumes:)
+    end
+
+    def payment_ticket(ticket_id)
+      me_client = set_me_client
+      me_client.payment_ticket ticket_id
+    end
+
+    def generate_ticket(ticket_id)
+      me_client = set_me_client
+      me_client.generate_ticket ticket_id
+    end
+
+    def print_ticket(ticket_id)
+      me_client = set_me_client
+      me_client.print_ticket ticket_id
+    end
+
     private
 
+    def set_me_client
+      me_account = Account.first
+      return if me_account.blank?
+
+      me_account.check_token
+      MeApi::Client.new(me_account.access_token)
+    end
+
     def get_rates_from_melhor_envio(package)
       price = package.contents.map { |content| content.price }.sum
       weight = package.weight
+      dimensions = estimate_dimensions_from_package(package)
 
       zipcode = package.order.ship_address.zipcode
       available_shipping_method_codes = @shipping_methods.pluck(:code)
-
       rates = @me_client.rates(
         from: @me_account.postal_code_from,
         to: zipcode,
         weight_kg: (weight / 1000.00),
+        width_cm: dimensions[0].to_i.round(2),
+        height_cm: dimensions[1].to_i.round(2),
+        length_cm: dimensions[2].to_i.round(2),
         contents_value_brl: price
       )
       rates.select { |rate| rate.price > 0 && available_shipping_method_codes.include?(self.class.generate_code(rate.id)) }
@@ -69,6 +139,19 @@ module SolidusMe
       []
     end
 
+    def estimate_dimensions_from_package(package)
+      volume = package.contents.sum { |item| dimensions_from_item(item).reduce(:*) }
+      cube_side = Math.cbrt(volume)
+      [cube_side, cube_side, cube_side]
+    end
+
+    def dimensions_from_item(item)
+      width = item.variant.width || 20
+      height = item.variant.height || 10
+      depth = item.variant.depth || 10
+      [width, height, depth]
+    end
+
     def build_shipping_rate(melhor_envio_rate, package)
       return unless melhor_envio_rate.max_delivery_time
       shipping_method = Spree::ShippingMethod.find_by(code: self.class.generate_code(melhor_envio_rate.id))

data/app/views/spree/admin/solidus_me/accounts/_link_auth.html.erb

@@ -1,10 +1,10 @@
 <div class="field">
   <div style="display: flex; align-items: center; margin-bottom: 6px">
     <label style="margin-right: 5px; margin-bottom: 0" for="me_url">URL de autorização</label>
-      <a target="_blank" href="https://www.melhorenvio.com.br/oauth/authorize?client_id=<%= me_account.client_id %>&redirect_uri=<%= me_account.redirect_url %>&response_type=code&state=<%= me_account.state %>&scope=shipping-calculate"> 
+      <a target="_blank" href="https://www.melhorenvio.com.br/oauth/authorize?client_id=<%= me_account.client_id %>&redirect_uri=<%= me_account.redirect_url %>&response_type=code&state=<%= me_account.state %>&scope=shipping-calculate cart-read cart-write companies-read companies-write coupons-read coupons-write notifications-read orders-read products-read products-write purchases-read shipping-calculate shipping-cancel shipping-checkout shipping-companies shipping-generate shipping-preview shipping-print shipping-share shipping-tracking ecommerce-shipping transactions-read users-read users-write">
       <svg style="width: 18px; height: 18px; color: black" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
       <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 6H5.25A2.25 2.25 0 003 8.25v10.5A2.25 2.25 0 005.25 21h10.5A2.25 2.25 0 0018 18.75V10.5m-10.5 6L21 3m0 0h-5.25M21 3v5.25"></path></svg>
     </a>
   </div>
     <input id="me_url" class="fullwidth" value="https://www.melhorenvio.com.br/oauth/authorize?client_id=<%= me_account.client_id %>&redirect_uri=<%= me_account.redirect_url %>&response_type=code&state=<%= me_account.state %>&scope=shipping-calculate">
-</div>
+</div>

data/lib/solidus_me/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusMe
-  VERSION = "3.3.0"
+  VERSION = "3.4.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: solidus_me
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Hamilton Tumenas Borges
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: me_api
@@ -81,7 +80,6 @@ homepage: https://github.com/ulysses-bull/solidus_me#readme
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -96,8 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Gem para integração com a API do Melhor Envio
 test_files: []