solidus_bling 2.0.3 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3888ee5c2c2115caad5550a8b4b0c4a8c357271dedac7ceac19d8f9bf518b4b0
-  data.tar.gz: e635f3c6e6dafb8a38b437611cc157e0535a0dfacebe61f60bf7bf31be0bc76b
+  metadata.gz: 7a1eeddb2480fc6c8c413632d68a9474a8861221a2696d686b855e815cabca27
+  data.tar.gz: 6a9654d237829e34477e9a975c80f66a60dad7756f894f4d9c316b0a416e50ca
 SHA512:
-  metadata.gz: 52f2e484e6f4ed2110b5ea29858eea98bb24de7fd6d65d0381632bcf47650c18d978afd7265026b3b02f7f528f648ee0895fec925043d5119550a0f95025c9f6
-  data.tar.gz: 3ffda6fc4dedc0ceda4dc2bb9d0e9de143fbda038562a6efb4297e195ba679125e47e3c77428c88483fe22f7240c276b6dbb7598a3d4d39915a02e15d0189baf
+  metadata.gz: 4dc19ff8328d031b59baa44c5cb42fbf9ff9e004f8e751ffe4eb7044a7fac234d0315df516fd519492d6a24f100714ec8e97c76d9f88503a0e356f29c8189ed7
+  data.tar.gz: f82406fc7f2de27d9476ead0d9a4a48873509cfa8aa95312b30c1242503de200421fd2f82385f0f2d2366fcc845193e5a19e328910a4ece17d7d5a2d3d10fca0

data/app/controllers/spree/admin/accounts_controller.rb

@@ -18,8 +18,14 @@ module Spree
       end
       
       def create
-        bling_account = SolidusBling::Account.create account_params.merge(name: "Bling")
-        redirect_to admin_accounts_path
+        bling_account = SolidusBling::Account.new account_params.merge(name: "Bling")
+        if bling_account.save
+          flash[:success] = "Conta criada com sucesso"
+          redirect_to admin_accounts_path
+        else
+          flash[:error] = bling_account.errors.full_messages.join("\n")
+          redirect_to new_admin_account_path
+        end
       end
 
       def edit
@@ -27,7 +33,7 @@ module Spree
         @payment_methods = ::Spree::PaymentMethod.all.pluck(:name, :id)
         @shipping_methods = ::Spree::ShippingMethod.all.pluck(:name, :id)
         @products_count = @bling_account.products.count
-        @last_update = SolidusBling::Event.where(method: "products_updated").max.created_at.strftime("%d/%m/%Y %H:%M")
+        @last_update = SolidusBling::Event.where(method: "products_updated").max.try(:created_at)
       end
 
       def update

data/app/models/solidus_bling/account.rb

@@ -1,9 +1,9 @@
 module SolidusBling
   class Account < ApplicationRecord
-    has_many :payment_methods
-    has_many :shipping_methods
-    has_many :products
-    has_many :sellers
+    has_many :payment_methods, dependent: :destroy
+    has_many :shipping_methods, dependent: :destroy
+    has_many :products, dependent: :destroy
+    has_many :sellers, dependent: :destroy
     accepts_nested_attributes_for :payment_methods, :shipping_methods, :sellers
   end
 end

data/app/models/solidus_bling/payment_method.rb

@@ -1,5 +1,7 @@
 module SolidusBling
   class PaymentMethod < ApplicationRecord
+    validates :external_id, presence: true
+
     belongs_to :account
     belongs_to :spree_payment_method, class_name: "Spree::PaymentMethod"
   end

data/app/models/solidus_bling/seller.rb

@@ -1,5 +1,8 @@
 module SolidusBling
   class Seller < ApplicationRecord
+    validates :name, presence: true
+    validates :external_id, presence: true
+
     belongs_to :account
   end
 end

data/app/models/solidus_bling/shipping_method.rb

@@ -1,5 +1,7 @@
 module SolidusBling
   class ShippingMethod < ApplicationRecord
+    validates :alias, presence: true
+
     belongs_to :account
     belongs_to :spree_shipping_method, class_name: "Spree::ShippingMethod"
   end

data/app/views/spree/admin/accounts/_form.html.erb

@@ -1,4 +1,5 @@
 <%= form_with model: bling_account, url: form_url do |form| %>
+  <h6>Dados da conta</h6>
   <div>
     <%= form.label :app_name, "Nome do Aplicativo: " %>
     <%= form.text_field :app_name %>
@@ -34,25 +35,28 @@
     <%= form.text_field :incoming_category_id %>
   </div>
 
-  <div>
-    <% bling_account.payment_methods.each do |payment_method| %>
-      <%= form.fields_for :payment_methods do |payment_form| %>
+  <div style="margin: 10px 0">
+    <h6>Métodos de Pagamento</h6>
+    <%= form.fields_for :payment_methods do |payment_form| %>
+      <div>
         <%= payment_form.select :spree_payment_method_id, @payment_methods %>
         <%= payment_form.text_field :external_id %>
-      <% end %>
+      </div>
     <% end %>
   </div>
 
-  <div>
-    <% bling_account.shipping_methods.each do |shipping_method| %>
-      <%= form.fields_for :shipping_methods do |shipping_form| %>
+  <div style="margin: 10px 0">
+    <h6>Métodos de Envio</h6>
+    <%= form.fields_for :shipping_methods do |shipping_form| %>
+      <div>
         <%= shipping_form.select :spree_shipping_method_id, @shipping_methods %>
         <%= shipping_form.text_field :alias %>
-      <% end %>
+      </div>
     <% end %>
   </div>
 
-  <div>
+  <div style="margin: 10px 0">
+    <h6>Vendedores</h6>
     <% bling_account.sellers.each do |seller| %>
       <%= form.fields_for :sellers do |seller_form| %>
         <%= seller_form.label :name, "Nome do Vendedor: " %>

data/app/views/spree/admin/accounts/edit.html.erb

@@ -3,7 +3,9 @@
   {confirm: "Deseja baixar os produtos?" } %>
   <span>Produtos baixados: <%= @products_count %></span>
   <br>
-  <span>Ultima atualização: <%= @last_update %> </span>
+  <% if @last_update.present? %>
+    <span>Ultima atualização: <%= @last_update.strftime("%d/%m/%Y %H:%M") %> </span>
+  <% end %>
 </div>
 
 <%= render "form", bling_account: @bling_account, form_url: admin_account_path(@bling_account.id) %>

data/lib/solidus_bling/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bling
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.5
 platform: ruby
 authors:
 - ulysses-bull
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Solidus extension to integrate with the Bling