solidus_me 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08b92393f89a8c0168ce3b490511a57c24f853dc30939b01b8a3ad97327ea6dc'
-  data.tar.gz: 14573225cef0c766503628bebe3a3e401871e99753eec8a29264cd260de7d0cd
+  metadata.gz: a89d704cbb3a8a4e5608af1df273b2648995285572c086093e98b7054cb9e9ce
+  data.tar.gz: f98e49c3cde1bcf4f85bd9d2469afd96ab6c01f0b0eb736a890f6ad343e517c5
 SHA512:
-  metadata.gz: 5e8e1d41bf706515f0a64ab27384d110f314d8850e17d1faacd8d1a3f4ee65a5fbd8e78d0c2c3055734be650b93e2f7faa02d157a7a503bcef1628fb33889faa
-  data.tar.gz: 74822208f6c3714f1b336fffb3538458254df1ae434371e561787b0ee32844324b9c86d76e504d258c55e39d630ee8b19c5e66405af5d338b6f1124bc856fd9b
+  metadata.gz: 14c383bea7b2378d33a728c3282038c3bae7088da2433d8f23a613970bd61ad48c7a486428270c0dbff8ae6aa3668813a61d74fd50b86be6dd5df56da99a1917
+  data.tar.gz: 8a10c4ef91bf67556fb337008db1dec890eee8a9090bcf7aed963096881e7d03d83f19ac32bc2f107c0be9aff361317cd4e80d089a2d8acd296f197d1055318a

data/README.md

@@ -3,7 +3,7 @@
 [![CircleCI](https://circleci.com/gh/solidusio-contrib/solidus_me.svg?style=shield)](https://circleci.com/gh/solidusio-contrib/solidus_me)
 [![codecov](https://codecov.io/gh/solidusio-contrib/solidus_me/branch/master/graph/badge.svg)](https://codecov.io/gh/solidusio-contrib/solidus_me)
 
-<!-- Explain what your extension does. -->
+Gem para cotar empresas e valores de entrega junto à Api do Melhor Envio.
 
 ## Installation
 
@@ -18,10 +18,35 @@ Bundle your dependencies and run the installation generator:
 ```shell
 bin/rails generate solidus_me:install
 ```
+Adicionar no arquivo `/config/initilizers/spree.rb` 
+
+```ruby
+Spree.config do |config|
+---
+config.stock.estimator_class = "SolidusMe::ShippingEstimator"
+---
+end
+```
+
+No painel do admin será adiconado o item do `Melhor Envio` no menu lateral. Nesta página deverão ser preenchidos os seguintes campos para autenticação do aplicativo:
+
+```text
+CEP de origem:
+Client ID:
+Client Secret:
+```
+Após salvar, o link completo para autenticação do aplicativo ficará disponível abaixo. Uma vez autorizado, são gerados os `refresh_token` e `access_token`, e o sistema estará pronto para cotação dos fretes junto ao Melhor Envio.
+
+Por padrão, os serviços de entrega são os `SEDEX`, `PAC` e `MiniEnvios` dos CORREIOS. Porém, os serviços podem ser customizados de acordo com a necessidade. Basta adicioná-los aos `preferences` da `Spree::Store`:
+
+```ruby
+# Por exemplo
+Spree::Store.first.update(preferences: { melhor_envio: { services: ["SEDEX", "PAC", "Mini Envios", ".Com", ".Package"] } })
+```
 
 ## Usage
 
-<!-- Explain how to use your extension once it's been installed. -->
+
 
 ## Development
 

data/app/controller/spree/admin/melhor_envio_controller.rb

@@ -7,10 +7,7 @@ module Spree
       end
 
       def update
-        @me_preferences[:postal_code_from] = params[:postal_code_from]
-        @me_preferences[:client_id] = params[:client_id]
-        @me_preferences[:client_secret] = params[:client_secret]
-        @me_preferences[:refresh_token] = params[:refresh_token]
+        @me_preferences = preferences_params
         Spree::Store.first.update(preferences: { melhor_envio: @me_preferences })
         redirect_to admin_melhor_envio_index_path
       end
@@ -21,7 +18,7 @@ module Spree
           client_id: @me_preferences[:client_id],
           client_secret: @me_preferences[:client_secret],
           code: code,
-          redirect_url: admin_melhor_envio_authorize_url
+          redirect_url: @me_preferences[:redirect_url]
         ).json
         @me_preferences[:access_token] = authorize_json["access_token"]
         @me_preferences[:refresh_token] = authorize_json["refresh_token"]
@@ -36,6 +33,11 @@ module Spree
         @me_preferences = Spree::Store.first.preferences[:melhor_envio]
       end
 
+      def preferences_params
+        hash_preferences = params.permit(:postal_code_from, :services, :client_id, :client_secret, :redirect_url, :state, :access_token, :refresh_token, :token_expires_in)
+        hash_preferences[:services] = hash_preferences[:services].split(" ")
+        hash_preferences
+      end
     end
   end
 end

data/app/models/solidus_me/shipping_estimator.rb

@@ -43,7 +43,7 @@ module SolidusMe
             price: 15.00,
             service_name: "",
             carrier_name: "Frete padrão",
-            delivery_range: { min: 5, max: 5 }
+            delivery_range: { "min" => 5, "max" => 5 }
           })
         ]
       end

data/app/overrides/store_preferences.rb

@@ -11,6 +11,8 @@ module StorePreferences
       services: ["SEDEX", "PAC", "Mini Envios"],
       client_id: nil,
       client_secret: nil,
+      redirect_url: nil,
+      state: nil,
       access_token: nil,
       refresh_token: nil,
       token_expires_in: DateTime.now.to_s

data/app/views/spree/admin/melhor_envio/index.html.erb

@@ -7,8 +7,9 @@
   </div>
 
   <div style="margin-top: 10px;">
+    <%= form.hidden_field :services, value: @me_preferences[:services] %>
     <span>Serviços Disponíveis: <%= @me_preferences[:services]&.join(", ") %></span>
-  </div>
+  </div> 
 
   <div style="margin-top: 10px;">
     <%= form.label :client_id, "Client ID: " %>
@@ -20,6 +21,16 @@
     <%= form.text_field :client_secret, value: @me_preferences[:client_secret] %>
   </div>
 
+  <div style="margin-top: 10px;">
+    <%= form.label :redirect_url, "Redirect URL: " %>
+    <%= form.text_field :redirect_url, value: @me_preferences[:redirect_url] %>
+  </div>
+
+  <div style="margin-top: 10px;">
+    <%= form.label :state, "State: " %>
+    <%= form.text_field :state, value: @me_preferences[:state] %>
+  </div>
+
   <div style="margin-top: 10px;">
     <%= form.label :access_token, "Access Token: " %>
     <%= form.text_field :access_token, value: @me_preferences[:access_token] %>
@@ -31,6 +42,7 @@
   </div>
 
   <div style="margin-top: 10px;">
+    <%= form.hidden_field :token_expires_in, value: @me_preferences[:token_expires_in] %>
     <span>Expiração do token: <%= @me_preferences[:token_expires_in] %></span>
   </div>
 
@@ -38,8 +50,8 @@
 <% end %>
 
 <div>
-  <input value="https://www.melhorenvio.com.br/oauth/authorize?client_id=<%= @me_preferences[:client_id] %>&redirect_uri=<%= admin_melhor_envio_authorize_url %>&response_type=code&state=melhor_envio&scope=shipping-calculate">
-  <a target="_blank" class="" href="https://www.melhorenvio.com.br/oauth/authorize?client_id=<%= @me_preferences[:client_id] %>&redirect_uri=<%= admin_melhor_envio_authorize_url %>&response_type=code&state=melhor_envio&scope=shipping-calculate"> 
+  <input value="https://www.melhorenvio.com.br/oauth/authorize?client_id=<%= @me_preferences[:client_id] %>&redirect_uri=<%= @me_preferences[:redirect_url] %>&response_type=code&state=<%= @me_preferences[:state] %>&scope=shipping-calculate">
+  <a target="_blank" class="" href="https://www.melhorenvio.com.br/oauth/authorize?client_id=<%= @me_preferences[:client_id] %>&redirect_uri=<%= @me_preferences[:redirect_url] %>&response_type=code&state=<%= @me_preferences[:state] %>&scope=shipping-calculate"> 
       <svg style="width: 24px; height: 24px;" 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>

data/lib/solidus_me/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusMe
-  VERSION = '1.0.0'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_me
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Hamilton Tumenas Borges
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-06 00:00:00.000000000 Z
+date: 2023-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -106,7 +106,6 @@ files:
 - config/locales/pt-BR.yml
 - config/routes.rb
 - db/migrate/20231103133348_add_preferences_to_spree_store.rb
-- db/migrate/20231103175330_add_delivery_time_to_spree_shipping_rate.rb
 - lib/generators/solidus_me/install/install_generator.rb
 - lib/generators/solidus_me/install/templates/initializer.rb
 - lib/solidus_me.rb

data/db/migrate/20231103175330_add_delivery_time_to_spree_shipping_rate.rb

@@ -1,6 +0,0 @@
-class AddDeliveryTimeToSpreeShippingRate < ActiveRecord::Migration[7.0]
-  def change
-    add_column :spree_shipping_rates, :min_delivery_time, :integer, if_not_exists: true
-    add_column :spree_shipping_rates, :max_delivery_time, :integer, if_not_exists: true
-  end
-end