camaleon_ecommerce 1.2.1 → 2.0.0

data/app/assets/stylesheets/plugins/ecommerce/multi-select.css.scss

@@ -0,0 +1,94 @@
+.ms-container{
+  //background: transparent asset-plugin-url('switch.png') no-repeat 50% 50%;
+  background: transparent asset-plugin-url('switch.png') no-repeat 50% 50%;
+  width: 370px;
+}
+
+.ms-container:after{
+  content: ".";
+  display: block;
+  height: 0;
+  line-height: 0;
+  font-size: 0;
+  clear: both;
+  min-height: 0;
+  visibility: hidden;
+}
+
+.ms-container .ms-selectable, .ms-container .ms-selection{
+  background: #fff;
+  color: #555555;
+  float: left;
+  width: 45%;
+}
+.ms-container .ms-selection{
+  float: right;
+}
+
+.ms-container .ms-list{
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+  transition: border linear 0.2s, box-shadow linear 0.2s;
+  border: 1px solid #ccc;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  position: relative;
+  height: 200px;
+  padding: 0;
+  overflow-y: auto;
+}
+
+.ms-container .ms-list.ms-focus{
+  border-color: rgba(82, 168, 236, 0.8);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+  outline: 0;
+  outline: thin dotted \9;
+}
+
+.ms-container ul{
+  margin: 0;
+  list-style-type: none;
+  padding: 0;
+}
+
+.ms-container .ms-optgroup-container{
+  width: 100%;
+}
+
+.ms-container .ms-optgroup-label{
+  margin: 0;
+  padding: 5px 0px 0px 5px;
+  cursor: pointer;
+  color: #999;
+}
+
+.ms-container .ms-selectable li.ms-elem-selectable,
+.ms-container .ms-selection li.ms-elem-selection{
+  border-bottom: 1px #eee solid;
+  padding: 2px 10px;
+  color: #555;
+  font-size: 14px;
+}
+
+.ms-container .ms-selectable li.ms-hover,
+.ms-container .ms-selection li.ms-hover{
+  cursor: pointer;
+  color: #fff;
+  text-decoration: none;
+  background-color: #08c;
+}
+
+.ms-container .ms-selectable li.disabled,
+.ms-container .ms-selection li.disabled{
+  background-color: #eee;
+  color: #aaa;
+  cursor: text;
+}

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

@@ -3,21 +3,8 @@ class Plugins::Ecommerce::Admin::OrdersController < Plugins::Ecommerce::AdminCon
   before_action :set_order_bread
 
   def index
-    orders = current_site.orders
-    if params[:q].present?
-      orders = orders.where("#{Plugins::Ecommerce::Order.table_name}.slug LIKE ?", "%#{params[:q]}%")
-    end
-    if params[:c].present?
-      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(:user).where("#{Cama::User.table_name}.email LIKE ?", "%#{params[:e]}%")
-    end
-    if params[:s].present?
-      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)
+    @q = current_site.orders.order('received_at desc').ransack(params[:q])
+    @orders = @q.result.paginate(:page => params[:page], :per_page => current_site.admin_per_page)
   end
 
   def show
@@ -36,20 +23,24 @@ class Plugins::Ecommerce::Admin::OrdersController < Plugins::Ecommerce::AdminCon
   end
 
   def update
+    hooks_run('plugin_ecommerce_before_update_order', @order)
     @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))
+    hooks_run('plugin_ecommerce_after_destroy_order', @order)
     flash[:notice] = "#{t('plugins.ecommerce.message.order_updated', default: 'Order Updated')}"
     redirect_to action: :show, id: params[:id]
   end
 
   def destroy
+    hooks_run('plugin_ecommerce_before_destroy_order', @order)
     if @order.destroy
       flash[:notice] = "#{t('plugins.ecommerce.message.order_destroyed', default: 'Order Destroyed')}"
     else
       flash[:error] = "#{t('plugins.ecommerce.message.order_no_destroyed', default: 'Occurred some problems destroying the order')}"
     end
+    hooks_run('plugin_ecommerce_after_destroy_order', @order)
     redirect_to action: :index
   end
 
@@ -57,6 +48,7 @@ class Plugins::Ecommerce::Admin::OrdersController < Plugins::Ecommerce::AdminCon
   def mark_accepted
     r = {order: @order}; hooks_run('plugin_ecommerce_before_accepted_order', r)
     @order.accepted!
+    commerce_order_send_mail(@order, 'email_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]
@@ -65,36 +57,61 @@ class Plugins::Ecommerce::Admin::OrdersController < Plugins::Ecommerce::AdminCon
 
   def mark_bank_confirmed
     if @order.on_delivery_pending?
+      hooks_run('plugin_ecommerce_before_on_delivery_order', @order)
       @order.on_delivery_confirmed!
+      commerce_order_send_mail(@order, 'email_order_confirmed_on_delivery')
       flash[:notice] = "#{t('plugins.ecommerce.message.order_on_delivery_confirmed', default: 'Payment on Delivery Confirmed')}"
-      commerce_send_order_received_email(@order)
+      hooks_run('plugin_ecommerce_after_on_delivery_order', @order)
     else
+      hooks_run('plugin_ecommerce_before_bank_confirm_order', @order)
       @order.bank_confirmed!
+      commerce_order_send_mail(@order, 'email_order_confirmed_bank')
       flash[:notice] = "#{t('plugins.ecommerce.message.order_bank_confirmed', default: 'Pay Bank Confirmed')}"
-      commerce_send_order_received_email(@order, true)
+      hooks_run('plugin_ecommerce_after_bank_confirm_order', @order)
     end
     redirect_to action: :index
   end
 
   # shipped order
   def mark_shipped
+    hooks_run('plugin_ecommerce_before_shipped_order', @order)
     @order.shipped!(params[:consignment_number])
-    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]}})
+    commerce_order_send_mail(@order, 'email_order_shipped')
     flash[:notice] = "#{t('plugins.ecommerce.message.order_shipped', default: 'Order Shipped')}"
+    hooks_run('plugin_ecommerce_after_shipped_order', @order)
     redirect_to action: :index
   end
 
   def mark_canceled
+    hooks_run('plugin_ecommerce_before_canceled_order', @order)
     @order.canceled!
     @order.set_meta('description', params[:description])
-    cama_send_email(@order.user.email, t('plugins.ecommerce.mail.order_canceled.subject'), {template_name: 'order_canceled', extra_data: {order: @order}, description: params[:description]})
+    commerce_order_send_mail(@order, 'email_order_cancelled')
     flash[:notice] = "#{t('plugins.ecommerce.message.order_canceled', default: 'Order canceled')}"
+    hooks_run('plugin_ecommerce_after_canceled_order', @order)
+    redirect_to action: :index
+  end
+
+  def resend_email
+    case @order.status
+      when 'paid', 'bank_pending', 'on_delivery'
+        commerce_order_send_mail(@order)
+      when 'shipped'
+        commerce_order_send_mail(@order, 'email_order_shipped')
+      when 'canceled'
+        commerce_order_send_mail(@order, 'email_order_cancelled')
+      else
+        flash[:error] = "#{t('plugins.ecommerce.message.unknown_status', default: 'Unknown Status')}"
+        redirect_to action: :index
+        return
+    end
+    flash[:notice] = "#{t('plugins.ecommerce.message.order_email_resent', default: 'Order Email Resent')}"
     redirect_to action: :index
   end
 
   private
   def set_order
-    @order = current_site.orders.find_by_slug(params[:id] || params[:order_id])
+    @order = current_site.orders.find_by_slug(params[:id] || params[:order_id]).decorate
   end
 
   def set_order_bread

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

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

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

@@ -34,8 +34,10 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
         flash[:cama_ecommerce][:error] = errors.join('<br>')
         redirect_to :back
       else
+        hooks_run('plugin_ecommerce_before_complete_free_order', @cart)
         @cart.set_meta('free_order', true)
-        mark_order_like_received(@cart)
+        commerce_mark_cart_received(@cart)
+        hooks_run('plugin_ecommerce_after_complete_free_order', @cart)
         redirect_to plugins_ecommerce_orders_path
       end
     else
@@ -67,16 +69,16 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
     product = current_site.products.find(data[:product_id]).decorate
     unless product.valid_variation?(params[:variation_id])
       flash[:cama_ecommerce][:error] = t('plugins.ecommerce.messages.missing_variation', default: 'Invalid Product Variation')
-      return redirect_to action: :cart_index
+      return params[:format] == 'json' ? render(json: flash.discard(:cama_ecommerce).to_hash) : (redirect_to action: :cart_index)
     end
 
     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_real(params[:variation_id]), default: 'There is not enough products "%{product}" (Available %{qty})')
-      return redirect_to :back
+      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)
     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')
-    redirect_to action: :cart_index
+    params[:format] == 'json' ? render(json: flash.discard(:cama_ecommerce).to_hash) : (redirect_to action: :cart_index)
   end
 
   def cart_update
@@ -88,24 +90,24 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
       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_variation_title(item.variation_id), qty: product.the_qty_real(item.variation_id), default: 'There is not enough products "%{product}" (Available %{qty})')
+        errors << t('plugins.ecommerce.messages.not_enough_product_qty', product: product.the_variation_title(item.variation_id), qty: product.the_qty(item.variation_id), default: 'There is not enough products "%{product}" (Available %{qty})')
       end
     end
     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
+    params[:format] == 'json' ? render(json: flash.discard(:cama_ecommerce).to_hash) : (redirect_to action: :cart_index)
   end
 
   def cart_remove
     @cart.product_items.find(params[:product_item_id]).destroy
     flash[:cama_ecommerce][:notice] = t('plugins.ecommerce.messages.cart_deleted', default: 'Product removed from your shopping cart')
-    redirect_to action: :cart_index
+    params[:format] == 'json' ? render(json: flash.discard(:cama_ecommerce).to_hash) : (redirect_to action: :cart_index)
   end
 
   def cancel_order
     @cart.update({status: 'canceled', kind: 'order', closed_at: Time.now})
     flash[:cama_ecommerce][:notice] = t('plugins.ecommerce.messages.canceled_order', default: "Canceled Order")
-    redirect_to plugins_ecommerce_orders_url
+    params[:format] == 'json' ? render(json: flash.discard(:cama_ecommerce).to_hash) : (redirect_to plugins_ecommerce_orders_url)
   end
 
   def pay_by_stripe
@@ -121,20 +123,20 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
       end
       redirect_to :back
     else
-      mark_order_like_received(@cart)
+      commerce_mark_cart_received(@cart)
       redirect_to plugins_ecommerce_orders_url
     end
   end
 
   def pay_by_bank_transfer
     @cart.set_meta("payment_data", params[:details])
-    mark_order_like_received(@cart, 'bank_pending')
+    commerce_mark_cart_received(@cart, 'bank_pending')
     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')
+    commerce_mark_cart_received(@cart, 'on_delivery')
     redirect_to plugins_ecommerce_orders_url
   end
 
@@ -153,7 +155,7 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
       flash[:payment_error] = true
       redirect_to :back
     else
-      mark_order_like_received(@cart)
+      commerce_mark_cart_received(@cart)
       redirect_to plugins_ecommerce_orders_url
     end
   end
@@ -167,7 +169,7 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
 
     if response.success?
       @cart.set_meta('payment_data', {token: params[:token], PayerID: params[:PayerID], ip: request.remote_ip})
-      mark_order_like_received(@cart)
+      commerce_mark_cart_received(@cart)
     else
       flash[:cama_ecommerce][:error] = response.message
     end
@@ -175,7 +177,6 @@ class Plugins::Ecommerce::Front::CheckoutController < Plugins::Ecommerce::FrontC
   end
 
   def cancel_paypal
-    # @cart = current_site.orders.find_by_slug(params[:order])
     redirect_to plugins_ecommerce_orders_url
   end
 

data/app/decorators/plugins/ecommerce/cart_decorator.rb

@@ -24,4 +24,23 @@ class Plugins::Ecommerce::CartDecorator < Draper::Decorator
   def the_total_shipping
     h.e_parse_price(object.total_shipping)
   end
+
+  # return the product titles in array format
+  def products_title
+    object.product_items.map{|i| p=i.product.decorate; p.the_variation_title(i.variation_id) }.join(', ')
+  end
+
+  # convert the cart into order with specific status
+  def convert_to_order(status = 'paid')
+    prepare_to_pay
+    update_amounts
+    object.update_columns(
+      status: status,
+      kind: 'order',
+      received_at: Time.current
+    )
+    order = h.current_site.orders.find(object.id).decorate
+    order.paid! if status == 'paid'
+    order
+  end
 end

data/app/decorators/plugins/ecommerce/order_decorator.rb

@@ -19,4 +19,74 @@ class Plugins::Ecommerce::OrderDecorator < Draper::Decorator
       _url = object.shipping_method.options[:url_tracking].gsub("{{consignment_number}}", consignment_number) rescue ''
     end
   end
+
+  # return created at date formatted
+  def the_created_at(format = :long)
+    h.l(object.created_at, format: format.to_sym)
+  end
+
+  def the_paid_at(format = :long)
+    h.l(object.paid_at, format: format.to_sym) rescue ''
+  end
+
+  def the_received_at(format = :long)
+    h.l(object.received_at, format: format.to_sym) rescue ''
+  end
+
+  def the_shipped_at(format = :long)
+    h.l(object.shipped_at, format: format.to_sym) rescue ''
+  end
+
+  # return shipping method title
+  def the_shipping_method
+    object.shipping_method.try(:decorate).try(:the_title)
+  end
+
+  # return the url of the current order
+  def the_url
+    h.plugins_ecommerce_order_show_path(order: object.slug)
+  end
+
+  # mark current order as paid and set a invoice number
+  def paid!
+    update_columns(invoice_number: get_invoice_number, status: 'paid', paid_at: Time.current)
+  end
+
+  def accepted!
+    update_columns({status: 'accepted', accepted_at: Time.current})
+  end
+
+  def shipped!(code)
+    update_columns({status: 'shipped', shipped_at: Time.current})
+    set_meta('consignment_number', code)
+  end
+
+  def canceled!
+    update_columns({status: 'canceled', closed_at: Time.current})
+  end
+
+  def bank_confirmed!
+    paid!
+  end
+
+  def on_delivery_confirmed!
+    paid!
+  end
+
+  # return the invoice pdf path
+  def the_invoice_path
+    folder = CamaleonCmsLocalUploader::private_file_path('invoices', h.current_site).to_s
+    FileUtils.mkdir_p(folder) unless Dir.exist?(folder)
+    File.join(folder, "#{object.invoice_number.presence || object.slug}.pdf").to_s
+  end
+
+  private
+  # return a new invoice number
+  def get_invoice_number
+    res = h.current_site.e_invoice_number_from
+    new_inv = res + 1
+    h.current_site.e_set_setting('invoice_number_from', new_inv)
+    h.cama_send_mail_to_admin(I18n.t('plugins.ecommerce.email.invoice_number_exceeded_subject', default: 'Invoice Number Exceeded.'), {content: I18n.t('plugins.ecommerce.email.invoice_number_exceeded_body', default: 'The Invoice Number %{number} was exceeded. Please review ecommerce settings.', number: new_inv)}) if new_inv >= h.current_site.e_invoice_number_to
+    res
+  end
 end

data/app/decorators/plugins/ecommerce/product_decorator.rb

@@ -32,7 +32,7 @@ class Plugins::Ecommerce::ProductDecorator < CamaleonCms::PostDecorator
     if variation_id.present?
       get_variation(variation_id).qty || 0
     else
-      is_variation_product? ? (get_default_variation.qty || 0) : object.get_field_value('ecommerce_qty').to_i || 0
+      is_variation_product? ? map_variations_the_qty.map{|k,v| v }.reduce(&:+) : (object.get_field_value('ecommerce_qty').to_i || 0)
     end
   end
 
@@ -46,15 +46,11 @@ class Plugins::Ecommerce::ProductDecorator < CamaleonCms::PostDecorator
   end
 
   def the_photos
-    object.get_field_values('ecommerce_photos') || []
+    is_variation_product? ? object.product_variations.pluck(:photo) : object.get_field_values('ecommerce_photos') || []
   end
 
   def in_stock?(variation_id = nil)
-    if variation_id.present?
-      get_variation(variation_id).qty > 0
-    else
-      object.get_field_value('ecommerce_stock').to_s.to_bool
-    end
+    the_qty(variation_id) > 0
   end
 
   def price(variation_id = nil)
@@ -92,7 +88,7 @@ class Plugins::Ecommerce::ProductDecorator < CamaleonCms::PostDecorator
   end
 
   def the_stock_status(variation_id = nil)
-    if in_stock?(variation_id) && the_qty_real.to_i > 0
+    if in_stock?(variation_id)
       "<span class='label label-success'>#{I18n.t('plugins.ecommerce.product.in_stock')}</span>"
     else
       "<span class='label label-danger'>#{I18n.t('plugins.ecommerce.product.not_in_tock')}</span>"
@@ -113,7 +109,7 @@ class Plugins::Ecommerce::ProductDecorator < CamaleonCms::PostDecorator
 
   # check if there are enough products to be purchased
   def can_added?(qty, variation_id = nil)
-    (the_qty_real(variation_id) - qty).to_i >= 0
+    (the_qty(variation_id) - qty).to_i >= 0
   end
 
   def self.object_class_name
@@ -136,6 +132,7 @@ class Plugins::Ecommerce::ProductDecorator < CamaleonCms::PostDecorator
   end
 
   # return (Hash) all variations qty for each variation, sample: {1: 10, 5: 2, 3: 0}
+  # note: this includes the quantity of items of user carts
   def map_variations_the_qty_real
     res = {}
     return res unless is_variation_product?
@@ -145,6 +142,16 @@ class Plugins::Ecommerce::ProductDecorator < CamaleonCms::PostDecorator
     res
   end
 
+  # return (Hash) all variations qty for each variation, sample: {1: 10, 5: 2, 3: 0}
+  def map_variations_the_qty
+    res = {}
+    return res unless is_variation_product?
+    object.product_variations.each do |var|
+      res[var.id] = var.qty
+    end
+    res
+  end
+
   # return the first variation of a product
   def get_default_variation
     @_cama_cache_get_default_variation ||= object.product_variations.first