camaleon_ecommerce 1.2 → 1.2.1

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

@@ -1,19 +1,20 @@
 module Plugins::Ecommerce::EcommerceHelper
   include Plugins::Ecommerce::EcommerceEmailHelper
-
-  def ecommerce_admin_list_post(d)
-  end
-
   def ecommerce_admin_product_form(args)
     if args[:post_type].slug == 'commerce'
       append_asset_libraries({ecommerce: {css: [], js: [plugin_asset_path('admin_product')]}})
-      args[:html] = render partial: plugin_view('admin/products/variations'), locals:{post_type: args[:post_type], product: args[:post] }
+      args[:html] << render(partial: plugin_view('admin/products/variations'), locals:{post_type: args[:post_type], product: args[:post] })
     end
   end
 
+  # return ecommerce posttype
+  def cama_ecommerce_post_type
+    @_cache_ecommerce_post_type ||= current_site.post_types.where(slug: 'commerce').first.try(:decorate)
+  end
+
   def ecommerce_front_before_load
-    @ecommerce_post_type = current_site.post_types.where(slug: 'commerce').first.decorate
-    @ecommerce_breadcrumb = [].push(["Home", cama_root_url])
+    e_current_visitor_currency(params[:cama_change_currency]) if params[:cama_change_currency].present?
+    @ecommerce_breadcrumb = [].push([t('plugins.ecommerce.front.breadcrumb.home', default: 'Home'), cama_root_url])
   end
 
   def ecommerce_admin_before_load
@@ -21,7 +22,7 @@ module Plugins::Ecommerce::EcommerceHelper
     pt = current_site.post_types.hidden_menu.where(slug: "commerce").first
     if pt.present?
       items_i = []
-      items_i << {icon: "list", title: t('plugin.ecommerce.all_products'), url: cama_admin_post_type_posts_path(pt.id)} if can? :posts, pt
+      items_i << {icon: "list", title: t('plugins.ecommerce.all_products'), url: cama_admin_post_type_posts_path(pt.id)} if can? :posts, pt
       items_i << {icon: "plus", title: t('camaleon_cms.admin.post_type.add_new', default: 'Add new'), url: new_cama_admin_post_type_post_path(pt.id)} if can? :create_post, pt
       if pt.manage_categories?
         items_i << {icon: "folder-open", title: t('camaleon_cms.admin.post_type.categories', default: 'Categories'), url: cama_admin_post_type_categories_path(pt.id)} if can? :categories, pt
@@ -30,16 +31,16 @@ module Plugins::Ecommerce::EcommerceHelper
         items_i << {icon: "tags", title: t('camaleon_cms.admin.post_type.tags', default: 'Tags'), url: cama_admin_post_type_post_tags_path(pt.id)} if can? :post_tags, pt
       end
       if can? :posts, pt
-        items_i << {icon: "reorder", title: "<span>#{t('plugin.ecommerce.orders', default: 'Orders')} <small class='label label-primary'>#{current_site.orders.size}</small></span>", url: admin_plugins_ecommerce_orders_path}
-        items_i << {icon: "money", title: t('plugin.ecommerce.tax_rates', default: 'Tax rates'), url: admin_plugins_ecommerce_tax_rates_path}
-        items_i << {icon: "taxi", title: t('plugin.ecommerce.shipping_methods', default: 'Shipping Methods'), url: admin_plugins_ecommerce_shipping_methods_path}
-        items_i << {icon: "credit-card", title: t('plugin.ecommerce.payment_methods', default: 'Payment Methods'), url: admin_plugins_ecommerce_payment_methods_path}
-        items_i << {icon: "tag", title: t('plugin.ecommerce.coupons', default: 'Coupons'), url: admin_plugins_ecommerce_coupons_path}
+        items_i << {icon: "reorder", title: "<span>#{t('plugins.ecommerce.orders', default: 'Orders')} <small class='label label-primary'>#{current_site.orders.size}</small></span>", url: admin_plugins_ecommerce_orders_path}
+        items_i << {icon: "money", title: t('plugins.ecommerce.tax_rates', default: 'Tax rates'), url: admin_plugins_ecommerce_tax_rates_path}
+        items_i << {icon: "taxi", title: t('plugins.ecommerce.shipping_methods', default: 'Shipping Methods'), url: admin_plugins_ecommerce_shipping_methods_path}
+        items_i << {icon: "credit-card", title: t('plugins.ecommerce.payment_methods', default: 'Payment Methods'), url: admin_plugins_ecommerce_payment_methods_path}
+        items_i << {icon: "tag", title: t('plugins.ecommerce.coupons', default: 'Coupons'), url: admin_plugins_ecommerce_coupons_path}
         items_i << {icon: "cogs", title: t('camaleon_cms.admin.button.settings', default: 'Settings'), url: admin_plugins_ecommerce_settings_path}
-        items_i << {icon: "cubes", title: t('plugin.ecommerce.product_attributes', default: 'Product Attributes'), url: admin_plugins_ecommerce_product_attributes_path}
+        items_i << {icon: "cubes", title: t('plugins.ecommerce.product_attributes', default: 'Product Attributes'), url: admin_plugins_ecommerce_product_attributes_path}
       end
 
-      admin_menu_insert_menu_after("content", "e-commerce", {icon: "shopping-cart", title: t('plugin.ecommerce.e_commerce', default: 'E-commerce'), url: "", items: items_i}) if items_i.present?
+      admin_menu_insert_menu_after("content", "e-commerce", {icon: "shopping-cart", title: t('plugins.ecommerce.e_commerce', default: 'E-commerce'), url: "", items: items_i}) if items_i.present?
     end
   end
 
@@ -65,13 +66,18 @@ module Plugins::Ecommerce::EcommerceHelper
     current_site.post_types.hidden_menu.where(slug: "commerce").first.destroy
   end
 
-  # callback after create/update
-  def ecommerce_admin_product_created(args)
+  # callback after create/update products
+  def ecommerce_admin_product_saved(args)
     if args[:post_type].slug == 'commerce'
       params[:product_variation] ||= {}
-      args[:post].product_variations.where.not(id: params[:product_variation].keys).delete_all
+
+      # verify no deletable variances
+      no_deletable_variances = false
+      args[:post].product_variations.where.not(id: params[:product_variation].keys).each{|prod| no_deletable_variances = true unless prod.destroy }
+      flash[:warning] += cama_t('plugins.ecommerce.variations.not_deletable_product_variations') if no_deletable_variances
+
       params[:product_variation].each do |p_key, p_var|
-        data = {amount: p_var[:price], photo: p_var[:photo], sku: p_var[:sku], weight: p_var[:weight], qty: p_var[:qty], attribute_ids: p_var[:attributes].map{|at| at[:value] }.join(',')}
+        data = {amount: p_var[:price], photo: p_var[:photo], sku: p_var[:sku], weight: p_var[:weight], qty: p_var[:qty], attribute_ids: (p_var[:attributes] || []).map{|at| at[:value] }.join(',')}
         if p_key.include?('new_') # new variation
           args[:post].product_variations.create(data)
         else
@@ -81,49 +87,46 @@ module Plugins::Ecommerce::EcommerceHelper
     end
   end
 
-  def get_commerce_post_type
-    @ecommerce = current_site.post_types.hidden_menu.where(slug: "commerce").first
-    unless @ecommerce.present?
-      @ecommerce = current_site.post_types.hidden_menu.new(slug: "commerce", name: "Product")
-      if @ecommerce.save
-        @ecommerce.set_options({
-          has_category: true,
-          has_tags: true,
-          not_deleted: true,
-          has_summary: true,
-          has_content: true,
-          has_comments: true,
-          has_picture: true,
-          has_template: false,
-          has_featured: true,
-          cama_post_decorator_class: 'Plugins::Ecommerce::ProductDecorator'
-        })
-        @ecommerce.categories.create({name: 'Uncategorized', slug: 'Uncategorized'.parameterize})
-      end
-      @ecommerce.set_options({posts_feature_image_label: 'plugin.ecommerce.product.image_label',
-                              posts_feature_image_label_default: 'Product Image'})
-    end
-  end
-
   def ecommerce_add_assets_in_front
     append_asset_libraries({ecommerce_front: {css: [plugin_gem_asset('front')], js: [plugin_gem_asset('cart')]}})
   end
 
   private
   def generate_custom_field_products
-    get_commerce_post_type
-    unless @ecommerce.get_field_groups.where(slug: "plugin_ecommerce_product_data").present?
-      @ecommerce.get_field_groups.destroy_all
-      group = @ecommerce.add_custom_field_group({name: 'Products Details', slug: 'plugin_ecommerce_product_data'})
-      group.add_manual_field({"name" => "t('plugin.ecommerce.product.sku', default: 'Sku')", "slug" => "ecommerce_sku"}, {field_key: "text_box", required: true, label_eval: true})
-      group.add_manual_field({"name" => "t('plugin.ecommerce.product.attrs', default: 'Attributes')", "slug" => "ecommerce_attrs", description: "t('plugin.ecommerce.product.attrs_descr', default: 'Please enter your product attributes separated by commas, like: Color ==> Red, Blue, Green')"}, {field_key: "field_attrs", required: false, multiple: true, false: true, translate: true, label_eval: true})
-      group.add_manual_field({"name" => "t('plugin.ecommerce.product.photos', default: 'Photos')", "slug" => "ecommerce_photos"}, {field_key: "image", required: false, multiple: true, label_eval: true})
-      group.add_manual_field({"name" => "t('plugin.ecommerce.product.price', default: 'Price')", "slug" => "ecommerce_price", "description" => "t('plugin.ecommerce.product.current_unit', default: 'Current unit: %{unit}', unit: current_site.current_unit.to_s)"}, {field_key: "numeric", required: true, label_eval: true})
-      group.add_manual_field({"name" => "t('plugin.ecommerce.product.tax', default: 'Tax')", "slug" => "ecommerce_tax"}, {field_key: "select_eval", required: false, command: "options_from_collection_for_select(current_site.tax_rates.all, \"id\", \"the_name\")", label_eval: true})
-      group.add_manual_field({"name" => "t('plugin.ecommerce.product.weight', default: 'Weight')", "slug" => "ecommerce_weight", "description" => "t('plugin.ecommerce.product.current_weight', default: 'Current weight: %{weight}', weight: current_site.current_weight.to_s)"}, {field_key: "text_box", required: true, label_eval: true})
-      group.add_manual_field({"name" => "t('plugin.ecommerce.product.stock', default: 'Stock')", "slug" => "ecommerce_stock"}, {field_key: "checkbox", default: true, label_eval: true})
-      group.add_manual_field({"name" => "t('plugin.ecommerce.product.qty', default: 'Quantity')", "slug" => "ecommerce_qty"}, {field_key: "numeric", required: true, label_eval: true})
-      group.add_manual_field({"name" => "t('plugin.ecommerce.product.files', default: 'Product files')", "slug" => "ecommerce_files"}, {field_key: "private_file", multiple: true, required: false, label_eval: true})
+    ecommerce = current_site.post_types.hidden_menu.where(slug: "commerce").first
+    unless ecommerce.present?
+      ecommerce = current_site.post_types.hidden_menu.new(slug: "commerce", name: "Product")
+      if ecommerce.save
+        ecommerce.set_options({
+                                 has_category: true,
+                                 has_tags: true,
+                                 not_deleted: true,
+                                 has_summary: true,
+                                 has_content: true,
+                                 has_comments: true,
+                                 has_picture: true,
+                                 has_template: false,
+                                 has_featured: true,
+                                 cama_post_decorator_class: 'Plugins::Ecommerce::ProductDecorator'
+                               })
+        ecommerce.categories.create({name: 'Uncategorized', slug: 'Uncategorized'.parameterize})
+      end
+      ecommerce.set_options({posts_feature_image_label: 'plugins.ecommerce.product.image_label',
+                              posts_feature_image_label_default: 'Product Image'})
+    end
+
+    unless ecommerce.get_field_groups.where(slug: "plugin_ecommerce_product_data").present?
+      ecommerce.get_field_groups.destroy_all
+      group = ecommerce.add_custom_field_group({name: 'Products Details', slug: 'plugin_ecommerce_product_data'})
+      group.add_manual_field({"name" => "t('plugins.ecommerce.product.sku', default: 'Sku')", "slug" => "ecommerce_sku"}, {field_key: "text_box", required: true, label_eval: true})
+      group.add_manual_field({"name" => "t('plugins.ecommerce.product.attrs', default: 'Attributes')", "slug" => "ecommerce_attrs", description: "t('plugins.ecommerce.product.attrs_descr', default: 'Please enter your product attributes separated by commas, like: Color ==> Red, Blue, Green')"}, {field_key: "field_attrs", required: false, multiple: true, false: true, translate: true, label_eval: true})
+      group.add_manual_field({"name" => "t('plugins.ecommerce.product.photos', default: 'Photos')", "slug" => "ecommerce_photos"}, {field_key: "image", required: false, multiple: true, label_eval: true})
+      group.add_manual_field({"name" => "t('plugins.ecommerce.product.price', default: 'Price')", "slug" => "ecommerce_price", "description" => "t('plugins.ecommerce.product.current_unit', default: 'Current unit: %{unit}', unit: current_site.current_unit.to_s)"}, {field_key: "numeric", required: true, label_eval: true})
+      group.add_manual_field({"name" => "t('plugins.ecommerce.product.tax', default: 'Tax')", "slug" => "ecommerce_tax"}, {field_key: "select_eval", required: false, command: "options_from_collection_for_select(current_site.tax_rates.all, \"id\", \"the_name\")", label_eval: true})
+      group.add_manual_field({"name" => "t('plugins.ecommerce.product.weight', default: 'Weight')", "slug" => "ecommerce_weight", "description" => "t('plugins.ecommerce.product.current_weight', default: 'Current weight: %{weight}', weight: current_site.current_weight.to_s)"}, {field_key: "text_box", required: true, label_eval: true})
+      group.add_manual_field({"name" => "t('plugins.ecommerce.product.stock', default: 'Stock')", "slug" => "ecommerce_stock"}, {field_key: "checkbox", default: true, label_eval: true})
+      group.add_manual_field({"name" => "t('plugins.ecommerce.product.qty', default: 'Quantity')", "slug" => "ecommerce_qty"}, {field_key: "numeric", required: true, label_eval: true})
+      group.add_manual_field({"name" => "t('plugins.ecommerce.product.files', default: 'Product files')", "slug" => "ecommerce_files"}, {field_key: "private_file", multiple: true, required: false, label_eval: true})
     end
   end
 end

data/app/models/plugins/ecommerce/attribute.rb

@@ -6,4 +6,7 @@ class Plugins::Ecommerce::Attribute < ActiveRecord::Base
   scope :only_group, ->{ where(parent_id: nil) }
   scope :only_value, ->{ where.not(parent_id: nil) }
   default_scope ->{ order(position: :ASC) }
+  def translated_values
+    values.select(:id, :label, :key).map{|item| item.label = item.label.to_s.translate; item }
+  end
 end

data/app/models/plugins/ecommerce/cart.rb

@@ -12,6 +12,16 @@ class Plugins::Ecommerce::Cart < ActiveRecord::Base
 
   after_create :generate_slug
 
+  # status: bank_pending => pending of verification for bank transfer orders
+  #         paid => paid by some method
+  #         canceled => canceled order
+  #         shipped => shipped status
+  #         accepted => received status
+
+  def payment_method
+    @_cama_cache_payment_method ||= Plugins::Ecommerce::PaymentMethod.find_by_id(get_meta('payment_method_id', self.payment_method_id))
+  end
+
   def add_product(product, qty = 1, variation_id = nil)
     pi = product_items.where(product_id: product.id, variation_id: variation_id).first
     if pi.present?
@@ -61,9 +71,7 @@ class Plugins::Ecommerce::Cart < ActiveRecord::Base
         res[:error] = 'required_minimum_price'
       else
         case opts[:discount_type]
-          when 'free'
-            res[:discount] = price || sub_total
-          when 'free_ship'
+          when 'free_ship', 'free'
             res[:discount] = total_shipping
           when 'percent'
             res[:discount] = sub_total * opts[:amount].to_f / 100
@@ -126,10 +134,15 @@ class Plugins::Ecommerce::Cart < ActiveRecord::Base
     shipping_method.present? ? shipping_method.get_price_from_weight(weight_total) : 0
   end
 
-  # set user in filter
+  # set user in filter (filter carts by user_id or cookie_id)
+  # cookie_id is used for public users who are buying without login
   def self.set_user(user)
-    user_id = defined?(user.id) ? user.id : user.to_i
-    self.where(user_id: user_id)
+    defined?(user.id) ? self.where(user_id: user.id) : self.where(visitor_key: user)
+  end
+
+  # move current cart from public user into existent user
+  def change_user(user)
+    update_columns(user_id: user.id, visitor_key: nil)
   end
 
   # check if the price of the cart is 0, including prices for products, discounts, shipping
@@ -166,7 +179,7 @@ class Plugins::Ecommerce::Cart < ActiveRecord::Base
       cache_the_shipping: c.the_total_shipping,
     )
   end
-  
+
   def mark_paid(status = 'paid')
     self.update_columns(
       status: status,
@@ -174,6 +187,17 @@ class Plugins::Ecommerce::Cart < ActiveRecord::Base
     )
   end
 
+  # return the gateway for paypal transactions
+  def paypal_gateway
+    ActiveMerchant::Billing::Base.mode = payment_method.options[:paypal_sandbox].to_s.to_bool ? :test : :production
+    paypal_options = {
+      login: payment_method.options[:paypal_login],
+      password: payment_method.options[:paypal_password],
+      signature: payment_method.options[:paypal_signature]
+    }
+    ActiveMerchant::Billing::PaypalExpressGateway.new(paypal_options)
+  end
+
 
   private
   def generate_slug

data/app/models/plugins/ecommerce/legacy_order.rb

@@ -1,17 +1,8 @@
+## not used anymore (DEPRECATED)
 class Plugins::Ecommerce::LegacyOrder < CamaleonCms::TermTaxonomy
   default_scope { where(taxonomy: :ecommerce_order) }
   has_one :details, class_name: "Plugins::Ecommerce::OrderDetail", foreign_key: :order_id, dependent: :destroy
   has_many :products, foreign_key: :objectid, through: :term_relationships, :source => :objects
-  belongs_to :customer, class_name: "CamaleonCms::User", foreign_key: :user_id
-
-  def add_product(object)
-    post_id = defined?(object.id) ? object.id : object.to_i
-    term_relationships.where(objectid: post_id).first_or_create if post_id > 0
-  end
-  def remove_product(object)
-    post_id = defined?(object.id) ? object.id : object.to_i
-    term_relationships.where(objectid: post_id).destroy_all if post_id > 0
-  end
 
   def payment_method
     Plugins::Ecommerce::PaymentMethod.find_by_id get_meta("payment")[:payment_id]
@@ -25,24 +16,4 @@ class Plugins::Ecommerce::LegacyOrder < CamaleonCms::TermTaxonomy
   def shipping_method
     Plugins::Ecommerce::ShippingMethod.find_by_id get_meta("payment", {})[:shipping_method]
   end
-
-  def canceled?
-    status == 'canceled'
-  end
-  def unpaid?
-    status == 'unpaid'
-  end
-
-  def paid?
-    payment.present?
-  end
-
-
-  # set user in filter
-  def self.set_user(user)
-    user_id = defined?(user.id) ? user.id : user.to_i
-    self.where(user_id: user_id)
-  end
-
-
 end

data/app/models/plugins/ecommerce/order.rb

@@ -2,16 +2,14 @@ class Plugins::Ecommerce::Order < Plugins::Ecommerce::Cart
   self.table_name = 'plugins_ecommerce_orders'
   has_many :metas, ->{ where(object_class: 'Plugins::Ecommerce::Cart')}, :class_name => "CamaleonCms::Meta", foreign_key: :objectid, dependent: :delete_all
   default_scope { where(kind: 'order') }
-  # status: bank_pending => pending of verification for bank transfer orders
+  # status:
+  #         bank_pending => pending of verification for bank transfer orders
+  #         on_delivery => pending to mark as paid after after delivery
   #         paid => paid by some method
   #         canceled => canceled order
   #         shipped => shipped status
   #         accepted => received status
 
-  def payment_method
-    Plugins::Ecommerce::PaymentMethod.find_by_id(get_meta('payment_method_id', self.payment_method_id))
-  end
-
   def paid?
     status == 'paid'
   end
@@ -49,10 +47,18 @@ class Plugins::Ecommerce::Order < Plugins::Ecommerce::Cart
     status == 'bank_pending'
   end
 
+  def on_delivery_pending?
+    status == 'on_delivery'
+  end
+
   def bank_confirmed!
     update_columns({status: 'paid', updated_at: Time.current})
   end
 
+  def on_delivery_confirmed!
+    update_columns({status: 'paid', updated_at: Time.current})
+  end
+
   def payment_data
     get_meta('payment_data', {})
   end

data/app/models/plugins/ecommerce/order_detail.rb

@@ -1,3 +1,4 @@
+## not used anymore (DEPRECATED)
 class Plugins::Ecommerce::OrderDetail < ActiveRecord::Base
   self.table_name = "plugins_order_details"
   belongs_to :order, class_name: "Plugins::Ecommerce::Order", foreign_key: :order_id

data/app/models/plugins/ecommerce/payment_method.rb

@@ -6,13 +6,17 @@ class Plugins::Ecommerce::PaymentMethod < CamaleonCms::TermTaxonomy
 
   def method_text
     if options[:type] == 'paypal'
-      I18n.t 'plugin.ecommerce.method_paypal'
+      I18n.t 'plugins.ecommerce.by_paypal', default: 'Paypal'
     elsif options[:type] == 'credit_card'
-      I18n.t 'plugin.ecommerce.method_credit_card'
-    elsif options[:type] == 'bank_transfer'
-      I18n.t 'plugin.ecommerce.method_bank_transfer'
+      I18n.t 'plugins.ecommerce.method_credit_card'
     elsif options[:type] == 'authorize_net'
-      I18n.t 'plugin.ecommerce.method_authorize_net'
+      I18n.t 'plugins.ecommerce.by_authorize_net', default: 'By credit card (Authorize.net)'
+    elsif options[:type] == 'on_delivery'
+      I18n.t 'plugins.ecommerce.by_on_delivery'
+    elsif options[:type] == 'stripe'
+      I18n.t 'plugins.ecommerce.by_stripe', default: 'By Stripe'
+    elsif options[:type] == 'bank_transfer'
+      I18n.t 'plugins.ecommerce.by_bank_transfer', default: 'Payment on Delivery'
     else
       'None'
     end

data/app/models/plugins/ecommerce/product_variation.rb

@@ -1,9 +1,15 @@
 class Plugins::Ecommerce::ProductVariation < ActiveRecord::Base
   self.table_name='plugins_ecommerce_product_variations'
   belongs_to :product, class_name: "CamaleonCms::Post"
+  before_destroy :verify_related_orders
 
   # return all attribute values assigned to this product
   def attribute_values
     Plugins::Ecommerce::Attribute.only_value.where(id: self.attribute_ids.to_s.split(','))
   end
+
+  private
+  def verify_related_orders
+    errors.add(:base, t('plugins.ecommerce.message.not_deletable_product_variations')) if Plugins::Ecommerce::ProductItem.where(variation_id: id).any?
+  end
 end

data/app/services/plugins/ecommerce/cart_service.rb

@@ -7,7 +7,7 @@ class Plugins::Ecommerce::CartService
   attr_reader :site, :cart
 
   def pay_with_authorize_net(options={})
-    payment_method = options[:payment_method] || site_service.payment_method('authorize_net')
+    payment_method = options[:payment_method] || site.payment_method('authorize_net')
     billing_address = cart.get_meta("billing_address")
     details = cart.get_meta("details")
     amount = Plugins::Ecommerce::UtilService.ecommerce_money_to_cents(cart.total_amount)
@@ -61,15 +61,8 @@ class Plugins::Ecommerce::CartService
   end
 
   def pay_with_paypal(options={})
-    payment_method = options[:payment_method] || site_service.payment_method('paypal')
     billing_address = cart.get_meta("billing_address")
-    ActiveMerchant::Billing::Base.mode = payment_method.options[:paypal_sandbox].to_s.to_bool ? :test : :production
-    paypal_options = {
-      login: payment_method.options[:paypal_login],
-      password: payment_method.options[:paypal_password],
-      signature: payment_method.options[:paypal_signature]
-    }
-    gateway = ActiveMerchant::Billing::PaypalExpressGateway.new(paypal_options)
+    gateway = cart.paypal_gateway
     amount_in_cents = Plugins::Ecommerce::UtilService.ecommerce_money_to_cents(cart.total_amount)
     gateway_request = {
       brand_name: site.name,
@@ -106,7 +99,7 @@ class Plugins::Ecommerce::CartService
 
   def pay_with_stripe(options)
     require 'stripe'
-    payment_method = options[:payment_method] || site_service.payment_method('stripe')
+    payment_method = options[:payment_method] || site.payment_method('stripe')
     Stripe.api_key = payment_method.options[:stripe_id]
     customer = Stripe::Customer.create(
       email: options[:email], source: options[:stripe_token])
@@ -116,7 +109,7 @@ class Plugins::Ecommerce::CartService
         customer: customer.id,
         amount: amount_in_cents,
         description: "Payment Products: #{cart.products_title}",
-        currency: site_service.currency,
+        currency: site.currency_code,
       )
       payment_data = {
         email: options[:email],
@@ -140,10 +133,4 @@ class Plugins::Ecommerce::CartService
       cart.convert_to_order
     end
   end
-
-  private
-
-  def site_service
-    @site_service ||= Plugins::Ecommerce::SiteService.new(site)
-  end
 end

data/app/views/camaleon_cms/html_mailer/order_canceled.html.erb

@@ -1,2 +1,2 @@
-<p><%= t('plugin.ecommerce.mail.dear', default: 'Dear %{name}: ', name: @extra_data[:order].user.fullname) %></p>
-<p><%= t('plugin.ecommerce.mail.order_canceled.message', default: 'Your order %{order} has been canceled: %{message}', order: @extra_data[:order].slug, message: @extra_data[:message]) %></p>
+<p><%= t('plugins.ecommerce.mail.dear', default: 'Dear %{name}: ', name: @extra_data[:order].user.fullname) %></p>
+<p><%= t('plugins.ecommerce.mail.order_canceled.message', default: 'Your order %{order} has been canceled: %{message}', order: @extra_data[:order].slug, message: @extra_data[:message]) %></p>

data/app/views/camaleon_cms/html_mailer/order_confirmed.html.erb

@@ -1,2 +1,2 @@
-<p><%= t('plugin.ecommerce.mail.dear', default: 'Dear %{name}: ', name: @extra_data[:fullname]) %></p>
-<p><%= t('plugin.ecommerce.mail.order_confirmed.message', default: 'We have confirmed your payment by bank transfer for the order #%{order}.\n\n Thanks for your preference.', order: @extra_data[:order_slug]).gsub(/\n/, '<br>').gsub('\n', '<br>') %></p>
+<p><%= t('plugins.ecommerce.mail.dear', default: 'Dear %{name}: ', name: @extra_data[:fullname]) %></p>
+<p><%= t('plugins.ecommerce.mail.order_confirmed.message', default: 'We have confirmed your payment by bank transfer for the order #%{order}.\n\n Thanks for your preference.', order: @extra_data[:order_slug]).gsub(/\n/, '<br>').gsub('\n', '<br>') %></p>

data/app/views/camaleon_cms/html_mailer/order_received.html.erb

@@ -1,3 +1,5 @@
-<p><%= t('plugin.ecommerce.mail.order_received.welcome') %><%= @extra_data[:fullname] %></p>
-<p><%= t('plugin.ecommerce.mail.order_received.thanks') %></p>
-<p><%= t('plugin.ecommerce.mail.order_received.reference') %> <a href="<%= @extra_data[:order_url] %>"><%= @extra_data[:order_slug] %></a>
+<p><%= t('plugins.ecommerce.mail.order_received.welcome') %> <%= @extra_data[:fullname] %></p>
+<p><%= t('plugins.ecommerce.mail.order_received.thanks') %></p>
+<%= raw @extra_data[:order_details_html] %>
+<p><%= t('plugins.ecommerce.mail.order_received.reference') %> <a href="<%= @extra_data[:order_url] %>"><%= @extra_data[:order_slug] %></a>
+