camaleon_ecommerce 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffe51c8728a07203d61723294fae8e931f98bb83
-  data.tar.gz: 0dca114bd0e607778e360ec6c8875b8320e6b6bb
+  metadata.gz: 259fb7c0d7425357cf85f22b4dd36c09f0f793a1
+  data.tar.gz: bca5fac0b47ff2f37795d54e7db45474bc6be598
 SHA512:
-  metadata.gz: 2ebe61b791a3bd949fd84bac6a0436be89fa9a3dbabcb365f8070c9178f993313f352aa57ff1ef4e038c6e87cce6f261089f2beb569640abfa0893e724bd3491
-  data.tar.gz: c452b792eb61ae54fdf1a19b76f2a271bd263f2f5f880e6ec3be23e1a1f5e071659b99b181e4690e604bf759ca2b681f85fe6bc31bc95eb9e5d5fe23d9d30565
+  metadata.gz: faa588f0e928cac0e0432e3762ca57444b4cde51193eef635a882cd353828fb6cd325ef8825715ed21ebb79711222a33958b573f91f1a1ab4c20302c05b84c9e
+  data.tar.gz: 64fb1190c45c2a0a1fc0207d24864914e57505f8892526006bb812d8488107f2cab49e542f3e2d884058ab78078b6e4dfb20b2931d1655d5c15ea8c849ac7657

data/app/controllers/plugins/ecommerce/front/checkout_controller.rb

@@ -32,7 +32,7 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
       errors = ecommerce_verify_cart_errors(@cart)
       if errors.present?
         flash[:cama_ecommerce][:error] = errors.join('<br>')
-        redirect_to :back
+        redirect_to request.referer
       else
         hooks_run('plugin_ecommerce_before_complete_free_order', @cart)
         @cart.set_meta('free_order', true)
@@ -42,7 +42,7 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
       end
     else
       flash[:cama_ecommerce][:error] = "Invalid complete payment"
-      redirect_to :back
+      redirect_to request.referer
     end
   end
 
@@ -74,7 +74,7 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
 
     unless product.can_added?(qty, params[:variation_id])
       flash[:cama_ecommerce][:error] =  t('plugins.ecommerce.messages.not_enough_product_qty', product: product.the_variation_title(params[:variation_id]), qty: product.the_qty(params[:variation_id]), default: 'There is not enough products "%{product}" (Available %{qty})')
-      return params[:format] == 'json' ? render(json: flash.discard(:cama_ecommerce).to_hash) : (redirect_to :back)
+      return params[:format] == 'json' ? render(json: flash.discard(:cama_ecommerce).to_hash) : (redirect_to request.referer)
     end
     @cart.add_product(product, qty, params[:variation_id])
     flash[:cama_ecommerce][:notice] = t('plugins.ecommerce.messages.added_product_in_cart', default: 'Product added into cart')
@@ -121,7 +121,7 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
       if result[:payment_error]
         flash[:payment_error] = true
       end
-      redirect_to :back
+      redirect_to request.referer
     else
       commerce_mark_cart_received(@cart)
       redirect_to plugins_ecommerce_orders_url
@@ -153,7 +153,7 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
     if res[:error].present?
       flash[:cama_ecommerce][:error] = res[:error]
       flash[:payment_error] = true
-      redirect_to :back
+      redirect_to request.referer
     else
       commerce_mark_cart_received(@cart)
       redirect_to plugins_ecommerce_orders_url

data/app/helpers/plugins/ecommerce/ecommerce_functions_helper.rb

@@ -80,14 +80,19 @@ module Plugins::Ecommerce::EcommerceFunctionsHelper
     hooks_run('ecommerce_calculate_exchange', args) # permit to use custom exchange app by setting the value in :exchange attribute
     return (args[:exchange] * amount).round(2) if args[:exchange].present?
 
-    # request to google's finance converter site
-    res = open("https://www.google.com/finance/converter?a=1&from=#{args[:from]}&to=#{args[:to]}").read
-    res = res.scan(/\<span class=bld\>(.+?)\<\/span\>/).first.first.split(' ') # => ["69.3000", "BOB"]
-    exchange = res.first.to_f.round(4)
+    exchange = e_finance_exchange_converter(args)
     cama_ecommerce_post_type.set_option(e_current_visitor_currency, {date: Date.today.to_s, exchange: exchange, base: e_system_currency}, 'currencies')
     (exchange * amount).round(2)
   end
 
+  # helper to calculate exchanges
+  def e_finance_exchange_converter(args)
+    # request to google's finance converter site
+    res = open("https://finance.google.com/finance/converter?a=1&from=#{args[:from]}&to=#{args[:to]}").read
+    res = res.scan(/\<span class=bld\>(.+?)\<\/span\>/).first.first.split(' ') # => ["69.3000", "BOB"]
+    res.first.to_f.round(4)
+  end
+
   # return all currencies to use as a base currency
   def e_get_all_currencies
     @_cache_e_get_all_currencies ||= lambda{

data/db/migrate/20160502221327_add_cama_ecommerce_structure_plugin.rb

@@ -1,4 +1,4 @@
-class AddCamaEcommerceStructurePlugin < ActiveRecord::Migration
+class AddCamaEcommerceStructurePlugin < CamaManager.migration_class
   def change
     unless table_exists? 'plugins_order_details'
       create_table :plugins_order_details do |t|

data/db/migrate/20160504162311_move_featured_attribute_of_products.rb

@@ -1,4 +1,4 @@
-class MoveFeaturedAttributeOfProducts < ActiveRecord::Migration
+class MoveFeaturedAttributeOfProducts < CamaManager.migration_class
   def change
     Cama::Site.all.each do |site|
       ptype = site.post_types.where(slug: 'commerce').first

data/db/migrate/20160527184747_add_new_cart_structure.rb

@@ -1,4 +1,4 @@
-class AddNewCartStructure < ActiveRecord::Migration
+class AddNewCartStructure < CamaManager.migration_class
   def change
     create_table :plugins_ecommerce_orders do |t|
       t.string :name, :slug, :kind, :coupon, :the_coupon_amount

data/db/migrate/20160620200501_add_product_attributes_structure.rb

@@ -1,4 +1,4 @@
-class AddProductAttributesStructure < ActiveRecord::Migration
+class AddProductAttributesStructure < CamaManager.migration_class
   def change
     create_table :plugins_ecommerce_attributes do |t|
       t.string :key, :label

data/db/migrate/20160825174848_set_cama_post_decorator_class.rb

@@ -1,4 +1,4 @@
-class SetCamaPostDecoratorClass < ActiveRecord::Migration
+class SetCamaPostDecoratorClass < CamaManager.migration_class
   def change
     CamaleonCms::Site.reset_column_information
     CamaleonCms::PostType.reset_column_information

data/db/migrate/20160825232739_migrate_order_data.rb

@@ -1,4 +1,4 @@
-class MigrateOrderData < ActiveRecord::Migration
+class MigrateOrderData < CamaManager.migration_class
   def change
     if table_exists?('plugins_order_details') && Plugins::Ecommerce::LegacyOrder.count > 0
       Plugins::Ecommerce::LegacyOrder.reset_column_information

data/db/migrate/20161202182552_add_cookie_key_to_cart.rb

@@ -1,4 +1,4 @@
-class AddCookieKeyToCart < ActiveRecord::Migration
+class AddCookieKeyToCart < CamaManager.migration_class
   def change
     add_column :plugins_ecommerce_orders, :visitor_key, :string
   end

data/db/migrate/20161213222142_add_invoice_number.rb

@@ -1,4 +1,4 @@
-class AddInvoiceNumber < ActiveRecord::Migration
+class AddInvoiceNumber < CamaManager.migration_class
   def change
     add_column :plugins_ecommerce_orders, :invoice_number, :string, default: ''
     add_column :plugins_ecommerce_orders, :invoice_path, :string, default: ''

data/db/migrate/20161214224919_remove_ecommerce_stock_field.rb

@@ -1,4 +1,4 @@
-class RemoveEcommerceStockField < ActiveRecord::Migration
+class RemoveEcommerceStockField < CamaManager.migration_class
   def change
     Cama::PostType.where(slug: 'commerce').each do |pt|
       pt.get_field_object('ecommerce_stock').try(:destroy)

data/lib/ecommerce/version.rb

@@ -1,3 +1,3 @@
 module Ecommerce
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_ecommerce
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: camaleon_cms