camaleon_ecommerce 1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d5a7d45b38213978fbc5fc1e46a33b28f513808
-  data.tar.gz: 9681269b718331bbf6ea48b03b05fb7c8bd7a51f
+  metadata.gz: b0c541a7311004ac7d1612a1526fe1bbe74ba6da
+  data.tar.gz: a4a62e0f80a8f9ae124417580584a325c4a98a7f
 SHA512:
-  metadata.gz: dc9c967dce8e3cf4ba124087a9357e248fd0bed5fde41fa6eb3b6d71f503d5d5547f75f0ddd5ccf573bd291db489022c8f0ddd6221dfe2dbc29ecaab2b395a96
-  data.tar.gz: 84b1cb427d77a4db5c49a5665174ae3900e67e3bc380e98a6bdc61e223723230547e27cf90878a00ea2b303290efbc760aa3524f629bc0f0b4a0a8bb1ad2b0ba
+  metadata.gz: adff56c87875152cd91047a8a2180b90c0d0b69b3dffb873d0b202c7063755d182c5dd4a1785e47e8800d8fd8de232683a5ffecbd9a75fa9b5f73cfa0151c2ac
+  data.tar.gz: 803c28e4d16fa6786a3710db1d9a06d2812d2a58f16b05cb3312626dcb67513bfe75203175ca52596fe9d6e030cd68a3fd66e6532f38212450bcf48cf9d450b9

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

@@ -26,6 +26,7 @@ $ ->
     clone = cache_variation.clone().attr('data-id', 'new_'+variation_id+=1)
     product_variations.children('.variations_sortable').append(clone)
     clone.trigger('fill_variation_id')
+    check_variation_status()
     return false
 
   # add new variation value
@@ -46,7 +47,7 @@ $ ->
     sel = $(this).closest('.row').find('.product_attribute_vals_select').html('')
     for attr in PRODUCT_ATTRIBUTES
       if `attr.id == v`
-        for value in attr.values
+        for value in attr.translated_values
           sel.append('<option value="'+value.id+'">'+value.label.replace(/</g, '&lt;')+'</option>')
   )
 
@@ -78,6 +79,21 @@ $ ->
       return false
     $(this).closest('.product_variation').fadeOut('slow', ->
       $(this).remove()
+      check_variation_status()
     )
     return false
   )
+
+  # check the variation status and disable or enable some custom fields
+  check_variation_status = ->
+    fields = ['ecommerce_sku', 'ecommerce_price', 'ecommerce_weight', 'ecommerce_stock', 'ecommerce_qty']
+    if product_variations.find('.product_variation').length > 0 # is a variation product
+      for key in fields
+        p_field = form.find('.c-field-group .item-custom-field[data-field-key="'+key+'"]')
+        p_field.hide().find('.required').addClass('e_skip_required').removeClass('required')
+    else
+      for key in fields
+        p_field = form.find('.c-field-group .item-custom-field[data-field-key="'+key+'"]')
+        p_field.show().find('.e_skip_required').removeClass('e_skip_required').addClass('required')
+  check_variation_status()
+

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

@@ -7,7 +7,7 @@ class Plugins::Ecommerce::Admin::CouponsController < Plugins::Ecommerce::AdminCo
 
   def new
     @coupon = current_site.coupons.new
-    add_breadcrumb("#{t('plugin.ecommerce.new')}")
+    add_breadcrumb("#{t('plugins.ecommerce.new')}")
     render 'form'
   end
 

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

@@ -5,19 +5,16 @@ class Plugins::Ecommerce::Admin::OrdersController < Plugins::Ecommerce::AdminCon
   def index
     orders = current_site.orders
     if params[:q].present?
-      orders = orders.where(slug: params[:q])
+      orders = orders.where("#{Plugins::Ecommerce::Order.table_name}.slug LIKE ?", "%#{params[:q]}%")
     end
     if params[:c].present?
-      orders = orders.joins(:details).where("plugins_order_details.customer LIKE ?", "%#{params[:c]}%")
+      orders = orders.joins(:user).where("#{Cama::User.table_name}.first_name LIKE ? OR #{Cama::User.table_name}.last_name LIKE ?", "%#{params[:c]}%", "%#{params[:c]}%")
     end
     if params[:e].present?
-      orders = orders.joins(:details).where("plugins_order_details.email LIKE ?", "%#{params[:e]}%")
-    end
-    if params[:p].present?
-      orders = orders.joins(:details).where("plugins_order_details.phone LIKE ?", "%#{params[:p]}%")
+      orders = orders.joins(:user).where("#{Cama::User.table_name}.email LIKE ?", "%#{params[:e]}%")
     end
     if params[:s].present?
-      orders = orders.where(status: params[:s])
+      orders = orders.where(status: params[:s].split('|'))
     end
     orders = orders.order('received_at desc')
     @orders = orders.paginate(:page => params[:page], :per_page => current_site.admin_per_page)
@@ -25,7 +22,7 @@ class Plugins::Ecommerce::Admin::OrdersController < Plugins::Ecommerce::AdminCon
 
   def show
     @order = @order.decorate
-    add_breadcrumb("#{t('plugin.ecommerce.details_order', default: 'Order details')} - #{@order.slug}")
+    add_breadcrumb("#{t('plugins.ecommerce.details_order', default: 'Order details')} - #{@order.slug}")
   end
 
   def new
@@ -43,49 +40,55 @@ class Plugins::Ecommerce::Admin::OrdersController < Plugins::Ecommerce::AdminCon
     @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')}"
+    flash[:notice] = "#{t('plugins.ecommerce.message.order_updated', default: 'Order Updated')}"
     redirect_to action: :show, id: params[:id]
   end
 
   def destroy
     if @order.destroy
-      flash[:notice] = "#{t('plugin.ecommerce.message.order_destroyed', default: 'Order Destroyed')}"
+      flash[:notice] = "#{t('plugins.ecommerce.message.order_destroyed', default: 'Order Destroyed')}"
     else
-      flash[:error] = "#{t('plugin.ecommerce.message.order_no_destroyed', default: 'Occurred some problems destroying the order')}"
+      flash[:error] = "#{t('plugins.ecommerce.message.order_no_destroyed', default: 'Occurred some problems destroying the order')}"
     end
     redirect_to action: :index
   end
 
   # accepted order
   def mark_accepted
-    @order.accepted!
     r = {order: @order}; hooks_run('plugin_ecommerce_before_accepted_order', r)
-    message = "#{t('plugin.ecommerce.message.order_accepted', default: 'Order Accepted')}"
+    @order.accepted!
+    message = "#{t('plugins.ecommerce.message.order_accepted', default: 'Order Accepted')}"
     r = {order: @order, message: message}; hooks_run('plugin_ecommerce_after_accepted_order', r)
     flash[:notice] = r[:message]
     redirect_to action: :index
   end
 
   def mark_bank_confirmed
-    @order.bank_confirmed!
-    commerce_send_order_received_email(@order, true)
-    flash[:notice] = "#{t('plugin.ecommerce.message.order_bank_confirmed', default: 'Pay Bank Confirmed')}"
+    if @order.on_delivery_pending?
+      @order.on_delivery_confirmed!
+      flash[:notice] = "#{t('plugins.ecommerce.message.order_on_delivery_confirmed', default: 'Payment on Delivery Confirmed')}"
+      commerce_send_order_received_email(@order)
+    else
+      @order.bank_confirmed!
+      flash[:notice] = "#{t('plugins.ecommerce.message.order_bank_confirmed', default: 'Pay Bank Confirmed')}"
+      commerce_send_order_received_email(@order, true)
+    end
     redirect_to action: :index
   end
 
   # shipped order
   def mark_shipped
     @order.shipped!(params[:consignment_number])
-    cama_send_email(@order.user.email, t('plugin.ecommerce.mail.order_shipped.subject'), {template_name: 'order_shipped', extra_data: {order: @order, consignment_number: params[:consignment_number]}})
-    flash[:notice] = "#{t('plugin.ecommerce.message.order_shipped', default: 'Order Shipped')}"
+    cama_send_email(@order.user.email, t('plugins.ecommerce.mail.order_shipped.subject'), {template_name: 'order_shipped', extra_data: {order: @order, consignment_number: params[:consignment_number]}})
+    flash[:notice] = "#{t('plugins.ecommerce.message.order_shipped', default: 'Order Shipped')}"
     redirect_to action: :index
   end
 
   def mark_canceled
     @order.canceled!
     @order.set_meta('description', params[:description])
-    cama_send_email(@order.user.email, t('plugin.ecommerce.mail.order_canceled.subject'), {template_name: 'order_canceled', extra_data: {order: @order}, description: params[:description]})
-    flash[:notice] = "#{t('plugin.ecommerce.message.order_canceled', default: 'Order canceled')}"
+    cama_send_email(@order.user.email, t('plugins.ecommerce.mail.order_canceled.subject'), {template_name: 'order_canceled', extra_data: {order: @order}, description: params[:description]})
+    flash[:notice] = "#{t('plugins.ecommerce.message.order_canceled', default: 'Order canceled')}"
     redirect_to action: :index
   end
 
@@ -95,7 +98,7 @@ class Plugins::Ecommerce::Admin::OrdersController < Plugins::Ecommerce::AdminCon
   end
 
   def set_order_bread
-    add_breadcrumb I18n.t("plugin.ecommerce.orders", default: 'Orders'), admin_plugins_ecommerce_orders_path
+    add_breadcrumb I18n.t("plugins.ecommerce.orders", default: 'Orders'), admin_plugins_ecommerce_orders_path
   end
 
 end

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

@@ -8,12 +8,12 @@ class Plugins::Ecommerce::Admin::PaymentMethodsController < Plugins::Ecommerce::
   def new
     @payment_method = current_site.payment_methods.new
     @payment_method.status = 1
-    add_breadcrumb("#{t('plugin.ecommerce.new')}")
+    add_breadcrumb("#{t('plugins.ecommerce.new')}")
     render 'form'
   end
 
   def show
-    add_breadcrumb("#{t('plugin.ecommerce.table.details')}")
+    add_breadcrumb("#{t('plugins.ecommerce.table.details')}")
     @payment_method = @payment_method.decorate
   end
 
@@ -34,17 +34,6 @@ class Plugins::Ecommerce::Admin::PaymentMethodsController < Plugins::Ecommerce::
   end
 
   def update
-
-    if defined?(params[:options][:type]) && params[:options][:type] == 'paypal'
-      unless valid_paypal_data(params[:options])
-        flash.now[:error] = "#{t('plugin.ecommerce.message.error_paypal_values')}"
-        render 'form'
-        return
-      end
-    end
-
-    #FIXME create valid_authorize_net_data function
-
     if @payment_method.update(payment_permit_data)
       @payment_method.set_meta('_default',params[:options])
       flash[:notice] = t('camaleon_cms.admin.post_type.message.updated')
@@ -54,11 +43,7 @@ class Plugins::Ecommerce::Admin::PaymentMethodsController < Plugins::Ecommerce::
     end
   end
 
-
-
-
   private
-
   def payment_permit_data
     params.require(:plugins_ecommerce_payment_method).permit!
   end
@@ -66,21 +51,4 @@ class Plugins::Ecommerce::Admin::PaymentMethodsController < Plugins::Ecommerce::
   def set_order
     @payment_method = current_site.payment_methods.find(params[:id])#.decorate
   end
-
-  def valid_paypal_data(data)
-    ActiveMerchant::Billing::Base.mode = data[:paypal_sandbox].to_s.to_bool ? :test : :production
-    paypal_options = {
-        :login => data[:paypal_login],
-        :password => data[:paypal_password],
-        :signature => data[:paypal_signature]
-    }
-    opts = {
-        :ip => request.remote_ip,
-        :return_url => plugins_ecommerce_order_success_url(order: 'test'),
-        :cancel_return_url => plugins_ecommerce_order_cancel_url(order: 'test')
-    }
-    @gateway = ActiveMerchant::Billing::PaypalExpressGateway.new(paypal_options)
-    response = @gateway.setup_authorization(500, opts)
-    response.success?
-  end
 end

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

@@ -2,13 +2,11 @@ class Plugins::Ecommerce::Admin::PricesController < Plugins::Ecommerce::AdminCon
   before_action :set_shipping_method
 
   def index
-    add_breadcrumb("#{t('plugin.ecommerce.product.price')}")
   end
 
   def new
     @price = {}
-    add_breadcrumb("#{t('plugin.ecommerce.product.price')}", admin_plugins_ecommerce_shipping_method_prices_path( params[:shipping_method_id] ))
-    add_breadcrumb("#{t('plugin.ecommerce.new')}")
+    add_breadcrumb("#{t('plugins.ecommerce.new')}")
     render 'form'
   end
 
@@ -17,7 +15,6 @@ class Plugins::Ecommerce::Admin::PricesController < Plugins::Ecommerce::AdminCon
 
   def edit
     @price = @prices[params[:id].to_sym] || {}
-    add_breadcrumb("#{t('plugin.ecommerce.product.price')}", admin_plugins_ecommerce_shipping_method_prices_path( params[:shipping_method_id] ))
     add_breadcrumb("#{t('camaleon_cms.admin.button.edit')}")
     render 'form'
   end
@@ -53,9 +50,9 @@ class Plugins::Ecommerce::Admin::PricesController < Plugins::Ecommerce::AdminCon
   private
   def set_shipping_method
     @shipping_method = current_site.shipping_methods.find(params[:shipping_method_id])
-    add_breadcrumb(t("plugin.ecommerce.shipping_methods"))
+    add_breadcrumb(t("plugins.ecommerce.shipping_methods"))
     add_breadcrumb(@shipping_method.name)
-    add_breadcrumb(t("plugin.ecommerce.shipping_prices"))
+    add_breadcrumb(t("plugins.ecommerce.shipping_prices"), admin_plugins_ecommerce_shipping_method_prices_path(params[:shipping_method_id]))
     @prices = @shipping_method.get_meta("prices", {})
   end
 

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

@@ -1,9 +1,10 @@
 class Plugins::Ecommerce::Admin::SettingsController < Plugins::Ecommerce::AdminController
-  add_breadcrumb I18n.t("plugin.ecommerce.e_commerce")
+  add_breadcrumb I18n.t("plugins.ecommerce.e_commerce")
   def index
     @setting = current_site.get_meta("_setting_ecommerce", {})
   end
 
+  # save settings
   def saved
     current_site.set_meta('_setting_ecommerce', params[:setting])
     flash[:notice] = t('camaleon_cms.admin.post_type.message.updated')

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

@@ -7,12 +7,12 @@ class Plugins::Ecommerce::Admin::ShippingMethodsController < Plugins::Ecommerce:
 
   def new
     @shipping_method = current_site.shipping_methods.new
-    add_breadcrumb("#{t('plugin.ecommerce.new')}")
+    add_breadcrumb("#{t('plugins.ecommerce.new')}")
     render 'form'
   end
 
   def show
-    add_breadcrumb("#{t('plugin.ecommerce.table.details')}")
+    add_breadcrumb("#{t('plugins.ecommerce.table.details')}")
   end
 
   def edit

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

@@ -7,7 +7,7 @@ class Plugins::Ecommerce::Admin::TaxRatesController < Plugins::Ecommerce::AdminC
 
   def new
     @tax_rate = current_site.tax_rates.new
-    add_breadcrumb("#{t('plugin.ecommerce.new')}")
+    add_breadcrumb("#{t('plugins.ecommerce.new')}")
     render 'form'
   end
 

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

@@ -33,7 +33,7 @@ class Plugins::Ecommerce::AdminController < CamaleonCms::Apps::PluginsAdminContr
 
   private
   def verify_ecommerce_permission
-    authorize! :posts, get_commerce_post_type
-    add_breadcrumb I18n.t("plugin.ecommerce.e_commerce", default: 'Ecommerce'), admin_plugins_ecommerce_index_path
+    authorize! :posts, cama_ecommerce_post_type
+    add_breadcrumb I18n.t("plugins.ecommerce.e_commerce", default: 'Ecommerce'), admin_plugins_ecommerce_index_path
   end
 end

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

@@ -1,11 +1,11 @@
 class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontController
-  before_action :commerce_authenticate
+  before_action :commerce_authenticate, except: [:cart_add, :cart_update, :cart_remove, :cart_index]
   before_action :set_cart
-  before_action :set_payment, only: [:pay_by_stripe, :pay_by_bank_transfer, :pay_by_credit_card, :pay_by_authorize_net, :pay_by_paypal]
+  before_action :set_payment, only: [:pay_by_stripe, :pay_by_bank_transfer, :pay_by_credit_card, :pay_by_authorize_net, :pay_by_paypal, :pay_by_on_delivery]
 
   def index
     unless @cart.product_items.count > 0
-      flash[:notice] = t('plugins.ecommerce.messages.cart_no_products', default: 'Not exist products in your cart')
+      flash[:cama_ecommerce][:notice] = t('plugins.ecommerce.messages.cart_no_products', default: 'Not exist products in your cart')
       return redirect_to action: :cart_index
     end
     @ecommerce_breadcrumb << [t('plugins.ecommerce.messages.checkout', default: 'Checkout')]
@@ -31,7 +31,7 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
     if @cart.free_cart?
       errors = ecommerce_verify_cart_errors(@cart)
       if errors.present?
-        flash[:error] = errors.join('<br>')
+        flash[:cama_ecommerce][:error] = errors.join('<br>')
         redirect_to :back
       else
         @cart.set_meta('free_order', true)
@@ -39,7 +39,7 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
         redirect_to plugins_ecommerce_orders_path
       end
     else
-      flash[:error] = "Invalid complete payment"
+      flash[:cama_ecommerce][:error] = "Invalid complete payment"
       redirect_to :back
     end
   end
@@ -66,16 +66,16 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
     qty = data[:qty].to_f rescue 0
     product = current_site.products.find(data[:product_id]).decorate
     unless product.valid_variation?(params[:variation_id])
-      flash[:error] = t('plugins.ecommerce.messages.missing_variation', default: 'Invalid Product Variation')
+      flash[:cama_ecommerce][: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})')
+      flash[:cama_ecommerce][: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, params[:variation_id])
-    flash[:notice] = t('plugins.ecommerce.messages.added_product_in_cart', default: 'Product added into cart')
+    flash[:cama_ecommerce][:notice] = t('plugins.ecommerce.messages.added_product_in_cart', default: 'Product added into cart')
     redirect_to action: :cart_index
   end
 
@@ -91,20 +91,20 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
         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?
-    flash[:notice] = t('plugins.ecommerce.messages.cart_updated', default: 'Shopping cart updated') unless errors.present?
+    flash[:cama_ecommerce][:error] = errors.join('<br>') if errors.present?
+    flash[:cama_ecommerce][:notice] = t('plugins.ecommerce.messages.cart_updated', default: 'Shopping cart updated') unless errors.present?
     redirect_to action: :cart_index
   end
 
   def cart_remove
     @cart.product_items.find(params[:product_item_id]).destroy
-    flash[:notice] = t('plugins.ecommerce.messages.cart_deleted', default: 'Product removed from your shopping cart')
+    flash[:cama_ecommerce][:notice] = t('plugins.ecommerce.messages.cart_deleted', default: 'Product removed from your shopping cart')
     redirect_to action: :cart_index
   end
 
   def cancel_order
     @cart.update({status: 'canceled', kind: 'order', closed_at: Time.now})
-    flash[:notice] = t('plugins.ecommerce.messages.canceled_order', default: "Canceled Order")
+    flash[:cama_ecommerce][:notice] = t('plugins.ecommerce.messages.canceled_order', default: "Canceled Order")
     redirect_to plugins_ecommerce_orders_url
   end
 
@@ -115,7 +115,7 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
         stripe_token: params[:stripeToken],
       )
     if result[:error].present?
-      flash[:error] = result[:error]
+      flash[:cama_ecommerce][:error] = result[:error]
       if result[:payment_error]
         flash[:payment_error] = true
       end
@@ -132,6 +132,12 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
     redirect_to plugins_ecommerce_orders_url
   end
 
+  def pay_by_on_delivery
+    @cart.set_meta("payment_data", params[:details])
+    mark_order_like_received(@cart, 'on_delivery')
+    redirect_to plugins_ecommerce_orders_url
+  end
+
   def pay_by_authorize_net
     res = Plugins::Ecommerce::CartService.new(current_site, @cart).
       pay_with_authorize_net(payment_method: @payment, ip: request.remote_ip,
@@ -143,7 +149,7 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
         cvc: params[:cvCode],
       )
     if res[:error].present?
-      flash[:error] = res[:error]
+      flash[:cama_ecommerce][:error] = res[:error]
       flash[:payment_error] = true
       redirect_to :back
     else
@@ -153,8 +159,18 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
   end
 
   def success_paypal
-    @cart.set_meta('payment_data', {token: params[:token], PayerID: params[:PayerID]})
-    mark_order_like_received(@cart)
+    response = @cart.paypal_gateway.purchase(Plugins::Ecommerce::UtilService.ecommerce_money_to_cents(@cart.total_amount), {
+      :ip => request.remote_ip,
+      :token => params[:token],
+      :payer_id => params[:PayerID]
+    })
+
+    if response.success?
+      @cart.set_meta('payment_data', {token: params[:token], PayerID: params[:PayerID], ip: request.remote_ip})
+      mark_order_like_received(@cart)
+    else
+      flash[:cama_ecommerce][:error] = response.message
+    end
     redirect_to plugins_ecommerce_orders_url
   end
 
@@ -165,13 +181,13 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
 
   def pay_by_paypal
     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))
+      pay_with_paypal(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 = Plugins::Ecommerce::UserCartService.new(current_site, current_user).get_cart
+    @cart = e_current_cart
   end
 
   def set_bread