spree_zaez_cielo 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 017cbe5e938dea65db1858b8241304a43badbafe
-  data.tar.gz: f5dc6a5e902ddcffdba343d0a2b8fac4d5c564e4
+  metadata.gz: 33939f91d3e3e96cd2005fced635dc2203866743
+  data.tar.gz: 87e324acb1727d18705a7786075eb37630c077c7
 SHA512:
-  metadata.gz: 8053ec101393f5caa6afea11c66b3cf51546be4c046b0be2b7295a935a3d0caf2e60bef9ea92e234fce5a62fe98bb15524be68d6b2f86830dfc17a28034db40b
-  data.tar.gz: 0aac3e20e5e689dced9d0a631248041c2163cd6ec0d8ce7e365b82c47f130cbe69b7e6d4ea7b3f3ad3b33275aa7b6d3aacc108c1458fd4f1fd1b5f292fc9f789
+  metadata.gz: e7abd8efdde3f24e2c8884facdaee45dc6cba8f79234457f1f67e7af95d57893ee6b5f9858003ba5a89361be0211df938d107af5df46c9708dd910e2deda7620
+  data.tar.gz: c803b20c01a69019e2c3b4c8c57cfe98eea3fa33d930c97af33773321f5ce3faad333a217ec6d9f605e37364d48e0eabc6c37036685f7b95b51ce1c4138306e5

data/app/controllers/spree/api/orders_controller_decorator.rb

@@ -21,7 +21,7 @@ module Spree
         # set the prefix if exists
         @prefix = params[:prefix].present? ? params[:prefix] : nil
 
-        @portions = Spree::CieloConfig.calculate_portions @order.total, @cc_type
+        @portions = Spree::CieloConfig.calculate_portions @order, @cc_type
         @portions.each do |item|
           item[:total] = Spree::Money.new(item[:total], {currency: @order.currency}).to_html
           item[:value] = Spree::Money.new(item[:value], {currency: @order.currency}).to_html

data/app/models/spree/payment_method/cielo_credit.rb

@@ -16,7 +16,7 @@ module Spree
         return ActiveMerchant::Billing::Response.new(false, Spree.t('cielo.messages.invalid_portions'), {}, {})
       end
 
-      total_value = update_payment_amount amount, source, gateway_options
+      total_value = update_payment_amount amount, gateway_options
       total_value.delete!('.')
       default_params = {
           parcelas: gateway_options[:portions],
@@ -67,7 +67,7 @@ module Spree
         return ActiveMerchant::Billing::Response.new(false, Spree.t('cielo.messages.invalid_portions'), {}, {})
       end
 
-      total_value = update_payment_amount amount, source, gateway_options
+      total_value = update_payment_amount amount, gateway_options
       total_value.delete!('.')
       default_params = {
           parcelas: gateway_options[:portions],
@@ -213,17 +213,18 @@ module Spree
     # @author Isabella Santos
     #
     # @param amount [Integer]
-    # @param source [Spree::CreditCard]
     # @param gateway_options [Hash]
     #
     # @return [Integer]
     #
-    def update_payment_amount(amount, source, gateway_options)
+    def update_payment_amount(amount, gateway_options)
       if gateway_options[:portions] > 1
-        portion_value = Spree::CieloConfig.calculate_portion_value amount, gateway_options[:portions]
+        order_number, payment_number = gateway_options[:order_id].split('-')
+        order = Spree::Order.friendly.find order_number
+        portion_value = Spree::CieloConfig.calculate_portion_value order, gateway_options[:portions]
         total_value = sprintf('%0.2f', portion_value * gateway_options[:portions])
 
-        payment = Spree::Payment.find_by number: gateway_options[:order_id].split('-')[1]
+        payment = Spree::Payment.friendly.find payment_number
         payment.update_attributes(amount: total_value)
 
         total_value

data/app/views/spree/api/orders/portions.html.erb

@@ -8,7 +8,9 @@
     <% end %>
     <%= tag(:br) %>
 <% end %>
-<% if @show_tax_value == true %>
-    <%= tag(:br) %>
-    <%= content_tag :span, Spree.t(:cielo_tax_message, tax: @tax), style: 'font-size: smaller;' %>
-<% end %>
+<div data-hook="cielo_tax_info">
+  <% if @show_tax_value == true %>
+      <%= tag(:br) %>
+      <%= content_tag :span, Spree.t(:cielo_tax_message, tax: @tax), style: 'font-size: smaller;' %>
+  <% end %>
+</div>

data/lib/spree/cielo_configuration.rb

@@ -14,14 +14,13 @@ class Spree::CieloConfiguration < Spree::Preferences::Configuration
   # Calculates the portions of credit card type
   # based on Cielo configuration
   #
-  # @param amount [Float]
-  #   amount of the order
+  # @param order [Spree::Order]
   # @param cc_type [String]
-  #   name of the credit card
   #
   # @return [Array]
   #
-  def calculate_portions(amount, cc_type)
+  def calculate_portions(order, cc_type)
+    amount = order.total.to_f
     ret = []
     if preferred_credit_cards.has_key? cc_type
       portions_number = preferred_credit_cards[cc_type]
@@ -51,14 +50,13 @@ class Spree::CieloConfiguration < Spree::Preferences::Configuration
   # Calculate the value of the portion based on Cielo configuration
   # (verify if the portion has tax)
   #
-  # @param amount [Float]
-  #   total amount of the order
+  # @param order [Spree::Order]
   # @param portion [Integer]
-  #   value of the portion
   #
   # @return [Float]
   #
-  def calculate_portion_value(amount, portion)
+  def calculate_portion_value(order, portion)
+    amount = order.total.to_f
     amount = amount / 100 if amount.is_a? Integer
     tax = preferred_tax_value.to_f
 

data/spec/lib/spree/cielo_configuration_spec.rb

@@ -20,24 +20,27 @@ describe Spree::CieloConfiguration do
 
   context 'calculate a single portion' do
     it 'should calculate without tax' do
+      order = create(:order, total: 100.0)
       config.portion_without_tax = 10
-      portion_value = config.calculate_portion_value 100.0, 4
+      portion_value = config.calculate_portion_value order, 4
       expect(portion_value).to eq 25.0
     end
 
     it 'should calculate with tax' do
+      order = create(:order, total: 100.0)
       config.portion_without_tax = 1
       config.tax_value = '5.00'
-      portion_value = config.calculate_portion_value 100.0, 4
+      portion_value = config.calculate_portion_value order, 4
       expect(portion_value).to eq 30.387656250000006
     end
   end
 
   context 'calculating some portions' do
     it 'should calculate portions without tax' do
+      order = create(:order, total: 100.0)
       config.portion_without_tax = 10
       config.credit_cards = {'visa' => 5}
-      portions = config.calculate_portions 100.0, 'visa'
+      portions = config.calculate_portions order, 'visa'
 
       expect(portions[0]).to eq({portion: 1, value: 100.0, total: 100.0, tax_message: :cielo_without_tax})
       expect(portions[1]).to eq({portion: 2, value: 50.0, total: 100.0, tax_message: :cielo_without_tax})
@@ -47,20 +50,22 @@ describe Spree::CieloConfiguration do
     end
 
     it 'should return the number of portions respecting the minimum value' do
+      order = create(:order, total: 50.0)
       config.credit_cards = {'master' => 10}
       config.minimum_value = 20
       config.portion_without_tax = 12
-      portions = config.calculate_portions 50.0, 'master'
+      portions = config.calculate_portions order, 'master'
 
       expect(portions.size).to eq 2
     end
 
     it 'should calculate portions with tax' do
+      order = create(:order, total: 100.0)
       config.credit_cards = {'master' => 6}
       config.minimum_value = 10
       config.portion_without_tax = 1
       config.tax_value = '1'
-      portions = config.calculate_portions 100.0, 'master'
+      portions = config.calculate_portions order, 'master'
 
       expect(portions[0]).to eq({portion: 1, value: 100.0, total: 100.0, tax_message: :cielo_without_tax})
       expect(portions[1]).to eq({portion: 2, value: 51.005, total: 102.01, tax_message: :cielo_with_tax})

data/spec/models/spree/payment_method/cielo_credit_spec.rb

@@ -4,8 +4,9 @@ describe Spree::PaymentMethod::CieloCredit do
 
   let(:cielo) { FactoryGirl.build(:cielo_credit_payment_method) }
   let!(:payment) { create(:cielo_credit_payment, source: credit_card) }
+  let(:order) { create(:order) }
   let(:credit_card) { FactoryGirl.build(:credit_card_cielo) }
-  let(:gateway_options) { {order_id: "test-#{payment.number}", portions: 2} }
+  let(:gateway_options) { {order_id: "#{order.number}-#{payment.number}", portions: 2} }
 
   before do
     payment

data/spree_zaez_cielo.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_zaez_cielo'
-  s.version     = '3.0.6'
+  s.version     = '3.0.7'
   s.summary     = 'Adds Cielo as a Payment Method to Spree Commerce'
   s.description = s.summary
   s.required_ruby_version = '>= 2.0.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_zaez_cielo
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Zaez Team