camaleon_ecommerce 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5cc87402a61c087120824e13a203ac5316c3263
-  data.tar.gz: 628b52f2b7913355b97bf5434a60e8f773a1c900
+  metadata.gz: 0d5a7d45b38213978fbc5fc1e46a33b28f513808
+  data.tar.gz: 9681269b718331bbf6ea48b03b05fb7c8bd7a51f
 SHA512:
-  metadata.gz: a1dd90758e4e8acd43257a017c39bf0a8fa9c11e2584b71c416985ba047eae410a8fb917f541c8c1ac282364ae6f7a7f8a5b57f476d3f27c76efcead07d64aa2
-  data.tar.gz: 7be6a2554e77b857cbd75f037eeac76569244442f6961b6abaf316b49dc4c40c3b3e3fc025be556df412d1195008b9c5af3d6267660f3e8eae5a485ea78531ed
+  metadata.gz: dc9c967dce8e3cf4ba124087a9357e248fd0bed5fde41fa6eb3b6d71f503d5d5547f75f0ddd5ccf573bd291db489022c8f0ddd6221dfe2dbc29ecaab2b395a96
+  data.tar.gz: 84b1cb427d77a4db5c49a5665174ae3900e67e3bc380e98a6bdc61e223723230547e27cf90878a00ea2b303290efbc760aa3524f629bc0f0b4a0a8bb1ad2b0ba

data/app/assets/javascripts/plugins/ecommerce/admin_product.js.coffee

@@ -0,0 +1,83 @@
+$ ->
+  form = $('#form-post')
+  variation_id = 1
+  product_variations = form.find('#product_variations')
+  form.find('.content-frame-body > .c-field-group:last').after(product_variations.removeClass('hidden'))
+
+  # photo uploader
+  product_variations.on('click', '.product_variation_photo_link', ->
+    $input = $(this).prev()
+    $.fn.upload_filemanager({
+      formats: "image",
+      dimension: $input.attr("data-dimension") || '',
+      versions: $input.attr("data-versions") || '',
+      thumb_size: $input.attr("data-thumb_size") || '',
+      selected: (file, response) ->
+        $input.val(file.url);
+    })
+    return false
+  )
+
+  cache_variation = product_variations.find('.blank_product_variation').remove().clone().removeClass('hidden')
+  cache_values = cache_variation.find('.sortable_values > li:first').remove().clone()
+
+  # add new variation
+  product_variations.find('.add_new_variation').click ->
+    clone = cache_variation.clone().attr('data-id', 'new_'+variation_id+=1)
+    product_variations.children('.variations_sortable').append(clone)
+    clone.trigger('fill_variation_id')
+    return false
+
+  # add new variation value
+  product_variations.on('click', '.add_new_value', ->
+    clone = cache_values.clone()
+    key = $(this).closest('.product_variation').attr('data-id')
+    clone.find('input, select').each(->
+      $(this).attr('name', $(this).attr('name').replace('[]', '['+key+']')).removeAttr('id')
+    )
+    $(this).closest('.variation_attributes').find('.sortable_values').append(clone)
+    clone.find('.product_attribute_select').trigger('change')
+    return false
+  )
+
+  # change attribute
+  product_variations.on('change', '.product_attribute_select', ->
+    v = $(this).val()
+    sel = $(this).closest('.row').find('.product_attribute_vals_select').html('')
+    for attr in PRODUCT_ATTRIBUTES
+      if `attr.id == v`
+        for value in attr.values
+          sel.append('<option value="'+value.id+'">'+value.label.replace(/</g, '&lt;')+'</option>')
+  )
+
+  product_variations.on('fill_variation_id', '.product_variation', ->
+    key = $(this).attr('data-id')
+    $(this).find('input, select').each(->
+      $(this).attr('name', $(this).attr('name').replace('[]', '['+key+']')).removeAttr('id')
+    )
+    $(this).find('.sortable_values').sortable({handle: '.val_sorter'})
+  )
+
+  # sortables
+  product_variations.find('.sortable_values').sortable({handle: '.val_sorter'})
+  product_variations.find('.variations_sortable').sortable({handle: '.variation_sorter', update: ()->
+    $(this).children().each((index)->
+      $(this).find('.product_variation_position').val(index);
+    )
+  })
+
+  # delete actions
+  product_variations.on('click', '.val_del', ->
+    $(this).closest('li').fadeOut('slow', ->
+      $(this).remove()
+    )
+    return false
+  )
+  product_variations.on('click', '.var_del', ->
+    unless confirm(product_variations.attr('data-confirm-msg'))
+      return false
+    $(this).closest('.product_variation').fadeOut('slow', ->
+      $(this).remove()
+    )
+    return false
+  )

data/app/assets/javascripts/plugins/ecommerce/cart.js

@@ -35,6 +35,9 @@ function cama_checkout_actions(){
         });
         return false;
     }});
+    panel.find('#checkout_address_form #billing_address input').blur(function(){
+        panel.find('#checkout_address_form #'+$(this).attr('id').replace('billing_address', 'shipping_address')).val($(this).val())
+    });
 
     // shipping form
     panel.find('#checkout_shipping_form').validate({submitHandler: function(form){

data/app/controllers/plugins/ecommerce/admin/coupons_controller.rb

@@ -1,11 +1,3 @@
-=begin
-  Camaleon CMS is a content management system
-  Copyright (C) 2015 by Owen Peredo Diaz
-  Email: owenperedo@gmail.com
-  This program is free software: you can redistribute it and/or modify   it under the terms of the GNU Affero General Public License as  published by the Free Software Foundation, either version 3 of the  License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the  GNU Affero General Public License (GPLv3) for more details.
-=end
 class Plugins::Ecommerce::Admin::CouponsController < Plugins::Ecommerce::AdminController
   before_action :set_order, only: ['show','edit','update','destroy']
 
@@ -28,8 +20,7 @@ class Plugins::Ecommerce::Admin::CouponsController < Plugins::Ecommerce::AdminCo
   end
 
   def create
-    data = params[:plugins_ecommerce_coupon]
-    @coupon = current_site.coupons.new(data)
+    @coupon = current_site.coupons.new(coupons_permit_data)
     if @coupon.save
       @coupon.set_meta('_default', params[:options])
       flash[:notice] = t('camaleon_cms.admin.post_type.message.created')
@@ -40,8 +31,7 @@ class Plugins::Ecommerce::Admin::CouponsController < Plugins::Ecommerce::AdminCo
   end
 
   def update
-    data = params[:plugins_ecommerce_coupon]
-    if @coupon.update(data)
+    if @coupon.update(coupons_permit_data)
       @coupon.set_meta('_default', params[:options])
       flash[:notice] = t('camaleon_cms.admin.post_type.message.updated')
       redirect_to action: :index
@@ -54,6 +44,10 @@ class Plugins::Ecommerce::Admin::CouponsController < Plugins::Ecommerce::AdminCo
 
 
   private
+
+  def coupons_permit_data
+    params.require(:plugins_ecommerce_coupon).permit!
+  end
   def set_order
     @coupon = current_site.coupons.find(params[:id])
   end

data/app/controllers/plugins/ecommerce/admin/orders_controller.rb

@@ -1,11 +1,3 @@
-=begin
-  Camaleon CMS is a content management system
-  Copyright (C) 2015 by Owen Peredo Diaz
-  Email: owenperedo@gmail.com
-  This program is free software: you can redistribute it and/or modify   it under the terms of the GNU Affero General Public License as  published by the Free Software Foundation, either version 3 of the  License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the  GNU Affero General Public License (GPLv3) for more details.
-=end
 class Plugins::Ecommerce::Admin::OrdersController < Plugins::Ecommerce::AdminController
   before_action :set_order, except: [:index, :new] #, only: ['show', 'edit', 'update', 'destroy']
   before_action :set_order_bread
@@ -27,6 +19,7 @@ class Plugins::Ecommerce::Admin::OrdersController < Plugins::Ecommerce::AdminCon
     if params[:s].present?
       orders = orders.where(status: params[:s])
     end
+    orders = orders.order('received_at desc')
     @orders = orders.paginate(:page => params[:page], :per_page => current_site.admin_per_page)
   end
 
@@ -49,6 +42,7 @@ class Plugins::Ecommerce::Admin::OrdersController < Plugins::Ecommerce::AdminCon
     @order.set_meta("billing_address", params[:order][:billing_address])
     @order.set_meta("shipping_address", params[:order][:shipping_address])
     @order.set_metas(params[:metas])
+    @order.update(params.require(:plugins_ecommerce_order).permit(:shipped_at))
     flash[:notice] = "#{t('plugin.ecommerce.message.order_updated', default: 'Order Updated')}"
     redirect_to action: :show, id: params[:id]
   end

data/app/controllers/plugins/ecommerce/admin/payment_methods_controller.rb

@@ -1,11 +1,3 @@
-=begin
-  Camaleon CMS is a content management system
-  Copyright (C) 2015 by Owen Peredo Diaz
-  Email: owenperedo@gmail.com
-  This program is free software: you can redistribute it and/or modify   it under the terms of the GNU Affero General Public License as  published by the Free Software Foundation, either version 3 of the  License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the  GNU Affero General Public License (GPLv3) for more details.
-=end
 class Plugins::Ecommerce::Admin::PaymentMethodsController < Plugins::Ecommerce::AdminController
   before_action :set_order, only: ['show','edit','update','destroy']
 
@@ -31,8 +23,7 @@ class Plugins::Ecommerce::Admin::PaymentMethodsController < Plugins::Ecommerce::
   end
 
   def create
-    data = params[:plugins_ecommerce_payment_method]
-    @payment_method = current_site.payment_methods.new(data)
+    @payment_method = current_site.payment_methods.new(payment_permit_data)
     if @payment_method.save
       @payment_method.set_meta('_default',params[:options])
       flash[:notice] = t('camaleon_cms.admin.post_type.message.created')
@@ -43,7 +34,6 @@ class Plugins::Ecommerce::Admin::PaymentMethodsController < Plugins::Ecommerce::
   end
 
   def update
-    data = params[:plugins_ecommerce_payment_method]
 
     if defined?(params[:options][:type]) && params[:options][:type] == 'paypal'
       unless valid_paypal_data(params[:options])
@@ -55,7 +45,7 @@ class Plugins::Ecommerce::Admin::PaymentMethodsController < Plugins::Ecommerce::
 
     #FIXME create valid_authorize_net_data function
 
-    if @payment_method.update(data)
+    if @payment_method.update(payment_permit_data)
       @payment_method.set_meta('_default',params[:options])
       flash[:notice] = t('camaleon_cms.admin.post_type.message.updated')
       redirect_to action: :index
@@ -68,6 +58,11 @@ class Plugins::Ecommerce::Admin::PaymentMethodsController < Plugins::Ecommerce::
 
 
   private
+
+  def payment_permit_data
+    params.require(:plugins_ecommerce_payment_method).permit!
+  end
+
   def set_order
     @payment_method = current_site.payment_methods.find(params[:id])#.decorate
   end

data/app/controllers/plugins/ecommerce/admin/prices_controller.rb

@@ -1,11 +1,3 @@
-=begin
-  Camaleon CMS is a content management system
-  Copyright (C) 2015 by Owen Peredo Diaz
-  Email: owenperedo@gmail.com
-  This program is free software: you can redistribute it and/or modify   it under the terms of the GNU Affero General Public License as  published by the Free Software Foundation, either version 3 of the  License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the  GNU Affero General Public License (GPLv3) for more details.
-=end
 class Plugins::Ecommerce::Admin::PricesController < Plugins::Ecommerce::AdminController
   before_action :set_shipping_method
 

data/app/controllers/plugins/ecommerce/admin/settings_controller.rb

@@ -1,11 +1,3 @@
-=begin
-  Camaleon CMS is a content management system
-  Copyright (C) 2015 by Owen Peredo Diaz
-  Email: owenperedo@gmail.com
-  This program is free software: you can redistribute it and/or modify   it under the terms of the GNU Affero General Public License as  published by the Free Software Foundation, either version 3 of the  License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the  GNU Affero General Public License (GPLv3) for more details.
-=end
 class Plugins::Ecommerce::Admin::SettingsController < Plugins::Ecommerce::AdminController
   add_breadcrumb I18n.t("plugin.ecommerce.e_commerce")
   def index

data/app/controllers/plugins/ecommerce/admin/shipping_methods_controller.rb

@@ -1,11 +1,3 @@
-=begin
-  Camaleon CMS is a content management system
-  Copyright (C) 2015 by Owen Peredo Diaz
-  Email: owenperedo@gmail.com
-  This program is free software: you can redistribute it and/or modify   it under the terms of the GNU Affero General Public License as  published by the Free Software Foundation, either version 3 of the  License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the  GNU Affero General Public License (GPLv3) for more details.
-=end
 class Plugins::Ecommerce::Admin::ShippingMethodsController < Plugins::Ecommerce::AdminController
   before_action :set_order, only: ['show','edit','update','destroy']
 
@@ -29,8 +21,7 @@ class Plugins::Ecommerce::Admin::ShippingMethodsController < Plugins::Ecommerce:
   end
 
   def create
-    data = params[:plugins_ecommerce_shipping_method]
-    @shipping_method = current_site.shipping_methods.new(data)
+    @shipping_method = current_site.shipping_methods.new(shipping_permit_data)
     if @shipping_method.save
       @shipping_method.set_meta('_default',params[:options])
       flash[:notice] = t('camaleon_cms.admin.post_type.message.created')
@@ -41,8 +32,7 @@ class Plugins::Ecommerce::Admin::ShippingMethodsController < Plugins::Ecommerce:
   end
 
   def update
-    data = params[:plugins_ecommerce_shipping_method]
-    if @shipping_method.update(data)
+    if @shipping_method.update(shipping_permit_data)
       @shipping_method.set_meta('_default',params[:options])
       flash[:notice] = t('camaleon_cms.admin.post_type.message.updated')
       redirect_to action: :index
@@ -52,11 +42,13 @@ class Plugins::Ecommerce::Admin::ShippingMethodsController < Plugins::Ecommerce:
   end
 
 
-
-
   private
   def set_order
     @shipping_method = current_site.shipping_methods.find(params[:id])
   end
 
+  def shipping_permit_data
+    params.require(:plugins_ecommerce_shipping_method).permit!
+  end
+
 end

data/app/controllers/plugins/ecommerce/admin/tax_rates_controller.rb

@@ -1,11 +1,3 @@
-=begin
-  Camaleon CMS is a content management system
-  Copyright (C) 2015 by Owen Peredo Diaz
-  Email: owenperedo@gmail.com
-  This program is free software: you can redistribute it and/or modify   it under the terms of the GNU Affero General Public License as  published by the Free Software Foundation, either version 3 of the  License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the  GNU Affero General Public License (GPLv3) for more details.
-=end
 class Plugins::Ecommerce::Admin::TaxRatesController < Plugins::Ecommerce::AdminController
   before_action :set_order, only: ['show','edit','update','destroy']
 
@@ -28,8 +20,7 @@ class Plugins::Ecommerce::Admin::TaxRatesController < Plugins::Ecommerce::AdminC
   end
 
   def create
-    data = params[:plugins_ecommerce_tax_rate]
-    @tax_rate = current_site.tax_rates.new(data)
+    @tax_rate = current_site.tax_rates.new(tax_rate_permit_data)
     if @tax_rate.save
       @tax_rate.set_meta('_default', params[:options])
       flash[:notice] = t('camaleon_cms.admin.post_type.message.created')
@@ -40,8 +31,7 @@ class Plugins::Ecommerce::Admin::TaxRatesController < Plugins::Ecommerce::AdminC
   end
 
   def update
-    data = params[:plugins_ecommerce_tax_rate]
-    if @tax_rate.update(data)
+    if @tax_rate.update(tax_rate_permit_data)
       @tax_rate.set_meta('_default', params[:options])
       flash[:notice] = t('camaleon_cms.admin.post_type.message.updated')
       redirect_to action: :index
@@ -54,6 +44,10 @@ class Plugins::Ecommerce::Admin::TaxRatesController < Plugins::Ecommerce::AdminC
 
 
   private
+  def tax_rate_permit_data
+   params.require(:plugins_ecommerce_tax_rate).permit!
+  end
+
   def set_order
     @tax_rate = current_site.tax_rates.find(params[:id])
   end

data/app/controllers/plugins/ecommerce/admin_controller.rb

@@ -1,17 +1,36 @@
-=begin
-  Camaleon CMS is a content management system
-  Copyright (C) 2015 by Owen Peredo Diaz
-  Email: owenperedo@gmail.com
-  This program is free software: you can redistribute it and/or modify   it under the terms of the GNU Affero General Public License as  published by the Free Software Foundation, either version 3 of the  License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the  GNU Affero General Public License (GPLv3) for more details.
-=end
 class Plugins::Ecommerce::AdminController < CamaleonCms::Apps::PluginsAdminController
   before_action :verify_ecommerce_permission
   def index
     # here your actions for admin panel
   end
 
+  def product_attributes
+
+  end
+
+  def save_product_attributes
+    current_site.product_attributes.where.not(id: params[:attribute].keys).destroy_all
+    params[:attribute].each do |key, values|
+      if key.include?('new')
+        group = current_site.product_attributes.create(label: params[:attribute_names][key][:label])
+      else
+        group = current_site.product_attributes.find(key)
+        group.update(label: params[:attribute_names][key][:label])
+      end
+      group.values.where.not(id: values.map{|v| v[:id] }).delete_all
+      values.each do |val|
+        data = {key: val[:key], label: val[:value], position: val[:position]}
+        if val[:id].present?
+          group.values.find(val[:id]).update(data)
+        else
+          group.values.create(data)
+        end
+      end
+    end
+    flash[:notice] = t('.saved_product_attributes', default: 'Attributes Saved')
+    redirect_to action: :product_attributes
+  end
+
   private
   def verify_ecommerce_permission
     authorize! :posts, get_commerce_post_type

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

@@ -1,11 +1,3 @@
-=begin
-  Camaleon CMS is a content management system
-  Copyright (C) 2015 by Owen Peredo Diaz
-  Email: owenperedo@gmail.com
-  This program is free software: you can redistribute it and/or modify   it under the terms of the GNU Affero General Public License as  published by the Free Software Foundation, either version 3 of the  License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the  GNU Affero General Public License (GPLv3) for more details.
-=end
 class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontController
   before_action :commerce_authenticate
   before_action :set_cart
@@ -16,7 +8,7 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
       flash[:notice] = t('plugins.ecommerce.messages.cart_no_products', default: 'Not exist products in your cart')
       return redirect_to action: :cart_index
     end
-    @ecommerce_bredcrumb << [t('plugins.ecommerce.messages.checkout', default: 'Checkout')]
+    @ecommerce_breadcrumb << [t('plugins.ecommerce.messages.checkout', default: 'Checkout')]
   end
 
   def step_address
@@ -54,7 +46,7 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
 
   def cart_index
     @products = @cart.product_items.decorate
-    @ecommerce_bredcrumb << [t('plugins.ecommerce.messages.shopping_cart', default: 'Shopping cart')]
+    @ecommerce_breadcrumb << [t('plugins.ecommerce.messages.shopping_cart', default: 'Shopping cart')]
   end
 
   def res_coupon
@@ -73,24 +65,30 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
     data = params[:cart]
     qty = data[:qty].to_f rescue 0
     product = current_site.products.find(data[:product_id]).decorate
-    unless product.can_added?(qty)
-      flash[:error] =  t('plugins.ecommerce.messages.not_enough_product_qty', product: product.the_title, qty: product.the_qty_real, default: 'There is not enough products "%{product}" (%{qty})')
+    unless product.valid_variation?(params[:variation_id])
+      flash[:error] = t('plugins.ecommerce.messages.missing_variation', default: 'Invalid Product Variation')
+      return redirect_to action: :cart_index
+    end
+
+    unless product.can_added?(qty, params[:variation_id])
+      flash[:error] =  t('plugins.ecommerce.messages.not_enough_product_qty', product: product.the_variation_title(params[:variation_id]), qty: product.the_qty_real(params[:variation_id]), default: 'There is not enough products "%{product}" (Available %{qty})')
       return redirect_to :back
     end
-    @cart.add_product(product, qty)
+    @cart.add_product(product, qty, params[:variation_id])
     flash[:notice] = t('plugins.ecommerce.messages.added_product_in_cart', default: 'Product added into cart')
     redirect_to action: :cart_index
   end
 
   def cart_update
     errors = []
-    params[:products].each do |data|
-      product = @cart.products.find(data[:product_id]).decorate
+    params[:product_items].each do |data|
+      item =  @cart.product_items.find(data[:item_id])
+      product = item.product.decorate
       qty = data[:qty].to_f
-      if product.can_added?(qty)
-        @cart.add_product(product, qty)
+      if product.can_added?(qty, item.variation_id)
+        @cart.add_product(product, qty, item.variation_id)
       else
-        errors << t('plugins.ecommerce.messages.not_enough_product_qty', product: product.the_title, qty: product.the_qty_real, default: 'There is not enough products "%{product}" (%{qty})')
+        errors << t('plugins.ecommerce.messages.not_enough_product_qty', product: product.the_variation_title(item.variation_id), qty: product.the_qty_real(item.variation_id), default: 'There is not enough products "%{product}" (Available %{qty})')
       end
     end
     flash[:error] = errors.join('<br>') if errors.present?
@@ -99,40 +97,32 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
   end
 
   def cart_remove
-    @cart.remove_product(params[:product_id])
+    @cart.product_items.find(params[:product_item_id]).destroy
     flash[:notice] = t('plugins.ecommerce.messages.cart_deleted', default: 'Product removed from your shopping cart')
     redirect_to action: :cart_index
   end
 
   def cancel_order
-    # @cart = current_site.orders.find_by_slug(params[:order])
     @cart.update({status: 'canceled', kind: 'order', closed_at: Time.now})
     flash[:notice] = t('plugins.ecommerce.messages.canceled_order', default: "Canceled Order")
     redirect_to plugins_ecommerce_orders_url
   end
 
-  # pay by stripe
   def pay_by_stripe
-    require 'stripe'
-    Stripe.api_key = @payment.options[:stripe_id]
-    customer = Stripe::Customer.create(:email => params[:stripeEmail], :source  => params[:stripeToken])
-    begin
-      charge = Stripe::Charge.create(
-        :customer    => customer.id,
-        :amount      => commerce_to_cents(@cart.total_amount),
-        :description => "Payment Products: #{@cart.products_title}",
-        :currency    => commerce_current_currency
+    result = Plugins::Ecommerce::CartService.new(current_site, @cart).
+      pay_with_stripe(payment_method: @payment,
+        email: params[:stripeEmail],
+        stripe_token: params[:stripeToken],
       )
-      @cart.set_meta("payment_data", params)
+    if result[:error].present?
+      flash[:error] = result[:error]
+      if result[:payment_error]
+        flash[:payment_error] = true
+      end
+      redirect_to :back
+    else
       mark_order_like_received(@cart)
       redirect_to plugins_ecommerce_orders_url
-    rescue Stripe::CardError => e
-      flash[:error] = e.message
-      flash[:payment_error] = true
-      redirect_to :back
-    rescue => e
-      flash[:error] = e.message
-      redirect_to :back
     end
   end
 
@@ -143,7 +133,15 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
   end
 
   def pay_by_authorize_net
-    res = payment_pay_by_credit_card_authorize_net(@cart, @payment)
+    res = Plugins::Ecommerce::CartService.new(current_site, @cart).
+      pay_with_authorize_net(payment_method: @payment, ip: request.remote_ip,
+        first_name: params[:firstName],
+        last_name: params[:lastName],
+        number: params[:cardNumber],
+        exp_month: params[:expMonth],
+        exp_year: params[:expYear],
+        cvc: params[:cvCode],
+      )
     if res[:error].present?
       flash[:error] = res[:error]
       flash[:payment_error] = true
@@ -155,7 +153,6 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
   end
 
   def success_paypal
-    # @cart = current_site.carts.find_by_slug(params[:order])
     @cart.set_meta('payment_data', {token: params[:token], PayerID: params[:PayerID]})
     mark_order_like_received(@cart)
     redirect_to plugins_ecommerce_orders_url
@@ -167,48 +164,18 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
   end
 
   def pay_by_paypal
-    billing_address = @cart.get_meta("billing_address")
-    ActiveMerchant::Billing::Base.mode = @payment.options[:paypal_sandbox].to_s.to_bool ? :test : :production
-    paypal_options = {
-      :login => @payment.options[:paypal_login],
-      :password => @payment.options[:paypal_password],
-      :signature => @payment.options[:paypal_signature]
-    }
-    @gateway = ActiveMerchant::Billing::PaypalExpressGateway.new(paypal_options)
-    @options = {
-      brand_name: current_site.name,
-      items: [{number: @cart.slug, name: "Buy Products from #{current_site.the_title}: #{@cart.products_title}", amount: commerce_to_cents(@cart.total_amount)}],
-      :order_id => @cart.slug,
-      :currency => current_site.currency_code,
-      :email => @cart.user.email,
-      :billing_address => {:name => "#{billing_address[:first_name]} #{billing_address[:last_name]}",
-                           :address1 => billing_address[:address1],
-                           :address2 => billing_address[:address2],
-                           :city => billing_address[:city],
-                           :state => billing_address[:state],
-                           :country => billing_address[:country],
-                           :zip => billing_address[:zip]
-      },
-      :description => "Buy Products from #{current_site.the_title}: #{@cart.total_amount}",
-      :ip => request.remote_ip,
-      :return_url => plugins_ecommerce_checkout_success_paypal_url(order: @cart.slug),
-      :cancel_return_url => plugins_ecommerce_checkout_cancel_paypal_url(order: @cart.slug)
-    }
-    response = @gateway.setup_purchase(commerce_to_cents(@cart.total_amount), @options)
-    redirect_to @gateway.redirect_url_for(response.token)
+    result = Plugins::Ecommerce::CartService.new(current_site, @cart).
+      pay_with_paypal(payment_method: @payment, ip: request.remote_ip, return_url: plugins_ecommerce_checkout_success_paypal_url(order: @cart.slug), cancel_return_url: plugins_ecommerce_checkout_cancel_paypal_url(order: @cart.slug))
+    redirect_to result[:redirect_url]
   end
 
   private
   def set_cart
-    @cart = current_site.carts.set_user(current_user).first_or_create(name: "Cart by #{current_user.id}").decorate
-  end
-
-  def commerce_to_cents(money)
-    (money*100).round
+    @cart = Plugins::Ecommerce::UserCartService.new(current_site, current_user).get_cart
   end
 
   def set_bread
-    @ecommerce_bredcrumb << [t('plugins.ecommerce.messages.checkout', default: 'Checkout'), url_for(action: :cart_index)]
+    @ecommerce_breadcrumb << [t('plugins.ecommerce.messages.checkout', default: 'Checkout'), url_for(action: :cart_index)]
   end
 
   def set_payment