camaleon_ecommerce 1.2.1 → 2.0.0

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

@@ -4,6 +4,10 @@ class Plugins::Ecommerce::ProductItemDecorator < Draper::Decorator
     get_product.the_variation_title(object.variation_id)
   end
 
+  def the_url
+    get_product.the_url(variation_id: object.variation_id)
+  end
+
   def the_sub_total
     h.e_parse_price(object.sub_total)
   end
@@ -43,6 +47,6 @@ class Plugins::Ecommerce::ProductItemDecorator < Draper::Decorator
   # verify if the quantity of the cart item is avilable
   # return true if quantity is available
   def is_valid_qty?
-    (get_product.the_qty_real(object.variation_id) - object.qty).to_i >= 0
+    (get_product.the_qty(object.variation_id) - object.qty).to_i >= 0
   end
 end

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

@@ -1,49 +1,17 @@
 module Plugins::Ecommerce::EcommerceEmailHelper
   include CamaleonCms::EmailHelper
 
-  def mark_order_like_received(cart, status = 'paid')
-    cart_service = Plugins::Ecommerce::CartService.new(current_site, cart)
-    order = cart_service.convert_to_order(status)
-
-    # send email to buyer
-    commerce_send_order_received_email(order)
-
-    # Send email to products owner
-    commerce_send_order_received_admin_notice(order)
-
-    flash[:notice] = t('plugins.ecommerce.messages.payment_completed', default: "Payment completed successfully")
-    args = {order: order}; hooks_run("commerce_after_payment_completed", args)
-
+  # mark current cart into order with specific status
+  def commerce_mark_cart_received(cart, status = 'paid')
+    args = {cart: cart, status: status}; hooks_run('commerce_before_payment_completed', args)
+    order = cart.convert_to_order(status)
+    order.set_meta('locale', I18n.locale)
+    commerce_order_send_mail(order)
+    flash[:cama_ecommerce][:notice] = t('plugins.ecommerce.messages.payment_completed', default: "Payment completed successfully")
+    args = {order: order, status: status}; hooks_run("commerce_after_payment_completed", args)
     order
   end
 
-  def commerce_send_order_received_email(order, is_after_bank_confirmation = false)
-    data = _commerce_prepare_send_order_email_data(order)
-    if is_after_bank_confirmation
-      cama_send_email(order.user.email, t('plugins.ecommerce.mail.order_confirmed.subject'), {template_name: 'order_confirmed', extra_data: data[:extra_data], attachs: data[:files]})
-    else
-      data.delete(:files) unless order.paid?
-      cama_send_email(order.user.email, t('plugins.ecommerce.email.order_received.subject'), {template_name: 'order_received', extra_data: data[:extra_data], attachs: data[:files]})
-    end
-  end
-
-  def commerce_send_order_received_admin_notice(order)
-    data = _commerce_prepare_send_order_email_data(order)
-    data[:owners].each do |user|
-      data[:extra_data][:admin] = user
-      cama_send_email(user.email, t('plugins.ecommerce.email.order_received_admin.subject'), {template_name: 'order_received_admin', extra_data: data[:extra_data], attachs: data[:files]})
-    end
-  end
-
-  def send_recovery_cart_email(order)
-    extra_data = {
-      :fullname => order.user.fullname,
-      :order => order
-    }
-    send_email(order.user.email, t('plugins.ecommerce.email.recovery_cart.subject'), '', nil, [], 'recovery_cart', nil, extra_data)
-    Rails.logger.info "Send recovery to #{order.user.email} with order #{order.slug}"
-  end
-
   # return translated message
   def commerce_coupon_error_message(error_code, coupon = nil)
     case error_code
@@ -70,7 +38,7 @@ module Plugins::Ecommerce::EcommerceEmailHelper
     cart.product_items.decorate.each do |item|
       unless item.is_valid_qty?
         product = item.product.decorate
-        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}" (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
 
@@ -85,24 +53,57 @@ module Plugins::Ecommerce::EcommerceEmailHelper
     errors
   end
 
-  private
-  def _commerce_prepare_send_order_email_data(order)
-    data = {}
-    data[:extra_data] = {
-      :fullname => order.user.fullname,
-      :order_slug => order.slug,
-      :order_url => plugins_ecommerce_order_show_url(order: order.slug),
-      :billing_information => order.get_meta('billing_address'),
-      :shipping_address => order.get_meta('shipping_address'),
-      :subtotal => order.cache_the_sub_total,
-      :total_cost => order.cache_the_total,
-      :order => order,
-      :order_details_html => render_to_string(file: 'plugins/ecommerce/front/orders/show', layout: false, locals: {as_partial: true, order: order.decorated? ? order : order.decorate})
+  # send the email to the user for specific events or status
+  # event: (String) email_order_received | email_order_shipped | email_order_cancelled | email_order_confirmed_bank | email_order_confirmed_on_delivery
+  def commerce_order_send_mail(order, event = 'email_order_received')
+    bk_l = I18n.locale
+    I18n.locale = order.get_meta('locale', 'en').to_s
+    subject, content_key = case event
+                         when 'email_order_received'
+                           [I18n.t('plugins.ecommerce.email.order_received_label', default: 'Order Received'), 'email_order_received']
+                         when 'email_order_confirmed'
+                           [I18n.t('plugins.ecommerce.email.order_confirmed_label', default: 'Order Confirmed'), 'email_order_confirmed']
+                         when 'email_order_confirmed_bank'
+                           [I18n.t('plugins.ecommerce.email.order_bank_confirmed_label', default: 'Order Bank Confirmed'), 'email_order_confirmed']
+                         when 'email_order_confirmed_on_delivery'
+                           [I18n.t('plugins.ecommerce.email.order_on_delivery_confirmed_label', default: 'Order on Delivery Confirmed'), 'email_order_confirmed']
+                         when 'email_order_shipped'
+                           [I18n.t('plugins.ecommerce.email.order_shipped_label', default: 'Order Shipped'), 'email_order_shipped']
+                         when 'email_order_cancelled'
+                           [I18n.t('plugins.ecommerce.email.order_cancelled_label', default: 'Order Cancelled'), 'email_order_cancelled']
+                       end
+    data = {template_name: nil, content: current_site.e_email_for(content_key).to_s.translate, files: []}
+    replaces = {
+      order_table: render_to_string(partial: 'plugins/ecommerce/partials/email/product_table', locals: {order: order}),
+      shipping_info: render_to_string(partial: 'plugins/ecommerce/partials/email/shipping_address', locals: {order: order}),
+      billing_info: render_to_string(partial: 'plugins/ecommerce/partials/email/billing_address', locals: {order: order}),
+      cancelled_description: order.get_meta('description').to_s,
+      root_url: current_site.the_url,
+      date: order.the_created_at,
+      current_date: l(Date.today, format: :long),
+      number: order.slug,
+      name: order.user.first_name,
+      full_name: order.user.fullname,
+      tracking_url: order.the_url_tracking.to_s,
+      shipping_name: order.the_shipping_method.to_s,
+      invoice_number: order.invoice_number.to_s,
+      status: order.the_status,
+      url: order.the_url
     }
-    order_service = Plugins::Ecommerce::OrderService.new(current_site, order)
-    data[:owners] = order_service.product_owners
-    data[:files] = order_service.product_files
-    data
-  end
+    args={order: order, replaces: replaces}; hooks_run('commerce_custom_email_replacements', args) # permit to add custom replacements
 
+    if order.status == 'paid'
+      order.products.each do |product|
+        data[:files] += product.get_fields('ecommerce_files').map{|f| CamaleonCmsLocalUploader::private_file_path(f, current_site) }
+      end
+      data[:files] = data[:files].uniq
+      pdf_path = order.the_invoice_path
+      data[:ecommerce_invoice] = {pdf_path: pdf_path, html: current_site.e_email_for('email_order_invoice').to_s.translate.to_s.cama_replace_codes(replaces, format_code = '{')}
+      data[:files] << pdf_path
+      order.update_column(:invoice_path, pdf_path.split('/').last)
+    end
+    data[:content] = data[:content].to_s.cama_replace_codes(replaces, format_code = '{')
+    cama_send_email(order.user.email, subject, data)
+    I18n.locale = bk_l
+  end
 end

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

@@ -1,10 +1,5 @@
 #encoding: utf-8
 module Plugins::Ecommerce::EcommerceFunctionsHelper
-  # return the settings for ecommerce (Hash)
-  def ecommerce_get_settings
-    current_site.get_meta("_setting_ecommerce", {})
-  end
-
   # return the visitor key which is used to relate the cart until login/register
   def ecommerce_get_visitor_key
     cookies[:e_cart_id] ||= cama_get_session_id unless cama_current_user.present?
@@ -17,12 +12,12 @@ module Plugins::Ecommerce::EcommerceFunctionsHelper
 
   # return all shipping country codes supported for shipping
   def e_shipping_countries
-    ecommerce_get_settings[:shipping_countries] || ISO3166::Country.codes
+    current_site.e_settings[:shipping_countries] || ISO3166::Country.codes
   end
 
   # return (Array) all the currencies for visitors
   def e_visitor_unit_currencies
-    ecommerce_get_settings[:visitor_unit_currencies] || ['USD']
+    current_site.e_settings[:visitor_unit_currencies] || ['USD']
   end
 
   # draw a select dropdown with all frontend currencies and actions to change current currency
@@ -61,13 +56,13 @@ module Plugins::Ecommerce::EcommerceFunctionsHelper
 
   # return the currency defined for admin panel
   def e_system_currency
-    ecommerce_get_settings[:current_unit] || 'USD'
+    current_site.e_settings[:current_unit] || 'USD'
   end
 
   # render price formatted of a product with current currency
   def e_parse_price(price)
     currency = cama_is_admin_request? ? e_system_currency : e_current_visitor_currency
-    args = {currency: currency, price: price, data: "#{currency} #{sprintf('%.2f', e_parse_to_current_currency(price))}"}; hooks_run('ecommerce_parse_price', args) # permit to customize price format
+    args = {currency: currency, price: price, data: number_to_currency(e_parse_to_current_currency(price), unit: currency)}; hooks_run('ecommerce_parse_price', args) # permit to customize price format
     args[:data]
   end
 
@@ -275,7 +270,7 @@ module Plugins::Ecommerce::EcommerceFunctionsHelper
 
   def ecommerce_draw_breadcrumb
     res = '<ol class="breadcrumb" style="margin: 0;">'
-    @ecommerce_breadcrumb.each_with_index do |m, index|
+    (@ecommerce_breadcrumb || []).each_with_index do |m, index|
       if m[1].present?
         res << "<li class='#{"active" if @ecommerce_breadcrumb.size == index+1}'><a href='#{m[1]}'>#{m[0]}</a></li>"
       else

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

@@ -36,8 +36,9 @@ module Plugins::Ecommerce::EcommerceHelper
         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('plugins.ecommerce.product_attributes', default: 'Product Attributes'), url: admin_plugins_ecommerce_product_attributes_path}
+        items_i << {icon: "cogs", title: t('camaleon_cms.admin.button.settings', default: 'Settings'), url: admin_plugins_ecommerce_settings_path}
+        hooks_run('plugin_ecommerce_after_menus', items_i) # permit to add menus for ecommerce plugin
       end
 
       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?
@@ -47,6 +48,13 @@ module Plugins::Ecommerce::EcommerceHelper
   def ecommerce_app_before_load
   end
 
+  # permit to generate invoice PDF by background just before delivery email
+  def ecommerce_admin_before_email_send(args)
+    if args[:ecommerce_invoice].present?
+      File.open(args[:ecommerce_invoice][:pdf_path], 'wb'){|file| file << WickedPdf.new.pdf_from_string(args[:ecommerce_invoice][:html], encoding: 'utf8') }
+    end
+  end
+
   # here all actions on plugin destroying
   # plugin: plugin model
   def ecommerce_on_destroy(plugin)
@@ -74,7 +82,7 @@ module Plugins::Ecommerce::EcommerceHelper
       # 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
+      flash[:warning] += t('plugins.ecommerce.variations.not_deletable_product_variations', default: 'Some Product variations can not be deleted.') 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(',')}
@@ -124,7 +132,8 @@ module Plugins::Ecommerce::EcommerceHelper
       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})
+      # changed to validate using the quantity of the inventory
+      # 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

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

@@ -8,6 +8,7 @@ class Plugins::Ecommerce::Cart < ActiveRecord::Base
 
   belongs_to :site, :class_name => "CamaleonCms::Site", foreign_key: :site_id
   belongs_to :user, :class_name => "CamaleonCms::User", foreign_key: :user_id
+  belongs_to :shipping_method, class_name: 'Plugins::Ecommerce::ShippingMethod'
   scope :active_cart, ->{ where("#{Plugins::Ecommerce::Cart.table_name}.updated_at >= ?", 24.hours.ago) }
 
   after_create :generate_slug
@@ -16,7 +17,6 @@ class Plugins::Ecommerce::Cart < ActiveRecord::Base
   #         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))
@@ -32,11 +32,6 @@ class Plugins::Ecommerce::Cart < ActiveRecord::Base
     pi
   end
 
-  # return the product titles in array format
-  def products_title
-    product_items.map{|i| p=i.product.decorate; p.the_variation_title(i.variation_id) }.join(', ')
-  end
-
   def items_total
     product_items.map{|item| item.qty }.inject{|sum,x| sum + x } || 0
   end
@@ -79,8 +74,8 @@ class Plugins::Ecommerce::Cart < ActiveRecord::Base
             res[:discount] = opts[:amount].to_f
         end
       end
-    else
-      res[:error] = 'coupon_not_found'
+    # else
+    #   res[:error] = 'coupon_not_found'
     end
     res
   end
@@ -94,16 +89,6 @@ class Plugins::Ecommerce::Cart < ActiveRecord::Base
     end
   end
 
-  # convert into order current cart
-  def convert_to_order
-    self.update_columns(kind: 'order', created_at: Time.current)
-    site.orders.find(self.id)
-  end
-
-  def shipping_method
-    Plugins::Ecommerce::ShippingMethod.find_by_id(self.shipping_method_id)
-  end
-
   # return the total price without coupon price
   def total_to_pay_without_discounts
     sub_total + tax_total + total_shipping
@@ -180,13 +165,6 @@ class Plugins::Ecommerce::Cart < ActiveRecord::Base
     )
   end
 
-  def mark_paid(status = 'paid')
-    self.update_columns(
-      status: status,
-      paid_at: Time.current,
-    )
-  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

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

@@ -18,27 +18,14 @@ class Plugins::Ecommerce::Order < Plugins::Ecommerce::Cart
     status == 'accepted'
   end
 
-  def accepted!
-    update_columns({status: 'accepted', accepted_at: Time.current})
-  end
-
   def shipped?
     status == 'shipped'
   end
 
-  def shipped!(code)
-    update_columns({status: 'shipped', shipped_at: Time.current})
-    set_meta('consignment_number', code)
-  end
-
   def canceled?
     status == 'canceled'
   end
 
-  def canceled!
-    update_columns({status: 'canceled', shipped_at: Time.current})
-  end
-
   def received?
     status == 'received'
   end
@@ -51,14 +38,6 @@ class Plugins::Ecommerce::Order < Plugins::Ecommerce::Cart
     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/payment_method.rb

@@ -4,6 +4,10 @@ class Plugins::Ecommerce::PaymentMethod < CamaleonCms::TermTaxonomy
 
   scope :actives, -> {where(status: '1')}
 
+  def skip_slug_validation?
+    true
+  end
+
   def method_text
     if options[:type] == 'paypal'
       I18n.t 'plugins.ecommerce.by_paypal', default: 'Paypal'

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

@@ -1,9 +1,12 @@
 class Plugins::Ecommerce::ShippingMethod < CamaleonCms::TermTaxonomy
   default_scope { where(taxonomy: :ecommerce_shipping_method) }
   belongs_to :site, :class_name => "CamaleonCms::Site", foreign_key: :parent_id
-
   scope :actives, -> {where(status: '1')}
 
+  def skip_slug_validation?
+    true
+  end
+
   def get_price_from_weight(weight = 0)
     price_total = 0
     prices = get_meta("prices")

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

@@ -124,13 +124,4 @@ class Plugins::Ecommerce::CartService
       {error: e.message}
     end
   end
-
-  def convert_to_order(status = 'paid')
-    Plugins::Ecommerce::Cart.transaction do
-      cart.prepare_to_pay
-      cart.update_amounts
-      cart.mark_paid(status)
-      cart.convert_to_order
-    end
-  end
 end

data/app/views/plugins/ecommerce/admin/orders/index.html.erb

@@ -4,36 +4,39 @@
     </div>
 
     <div class="panel-body">
-        <%= form_tag(url_for(action: :index), class: 'pull-right', method: 'get') do %>
-            <div class="input-group" id="adv-search">
-                <input type="text" class="form-control" placeholder="<%= t('plugins.ecommerce.search_order_number') %>" name="q" value="<%= params[:q] %>"/>
-                <div class="input-group-btn">
-                    <button type="button" title="<%= t('plugins.ecommerce.advanced_search', default: 'Advanced Search') %>" class="btn btn-default" id="ecommerce_adv_search_btn"><span class="caret"></span></button>
-                    <button type="submit" class="btn btn-primary"><span class="fa fa-search"></span></button>
-                </div>
+        <%= search_form_for @q, url: url_for(action: :index), class: 'row' do |f| %>
+            <div class="col-md-3">
+                <%= f.label :user_email_or_slug_or_coupon_cont, t('.search_field', default: 'Email or Number or Coupon') %>
+                <%= f.search_field :user_email_or_slug_or_coupon_cont, class: 'form-control' %>
             </div>
-        <% end %>
-        <div class="hidden" id="commerce_adv_search_modal">
-            <%= form_tag(url_for(action: :index), method: :get) do %>
-                <div class="form-group">
-                    <label for="contain"><%= t('plugins.ecommerce.table.customer') %> </label>
-                    <input class="form-control" type="text" name="c" value="<%= params[:c] %>"/>
-                </div>
-                <div class="form-group">
-                    <label for="contain"><%= t('plugins.ecommerce.e_mail_address') %></label>
-                    <input class="form-control" type="email" name="e" value="<%= params[:e] %>"/>
+            <div class="col-md-2">
+                <%= f.label :created_at_gteq, t('.created_after', default: 'Created After') %>
+                <div class='input-group date date_field_w'>
+                    <%= f.text_field :created_at_gteq, class: 'form-control ' %>
+                    <span class='add-on input-group-addon'><span class='glyphicon glyphicon-calendar'></span></span>
                 </div>
-                <!--<div class="form-group">-->
-                    <!--<label for="contain"><%= t('plugins.ecommerce.phone_number') %></label>-->
-                    <!--<input class="form-control" type="text" name="p" value="<%= params[:p] %>"/>-->
-                <!--</div>-->
-                <div class="form-group">
-                    <label for="contain"><%= t('plugins.ecommerce.table.status') %></label>
-                    <%= select_tag "s", options_for_select([[""], [t('plugins.ecommerce.select.accepted'), "accepted"], [cama_t('plugins.ecommerce.select.shipped'), "shipped"], [cama_t('plugins.ecommerce.select.canceled'), "canceled"], [cama_t('plugins.ecommerce.select.paid'), "paid"], [cama_t('plugins.ecommerce.select.pending'), "on_delivery|bank_pending"]], params[:s]), class: 'form-control' %>
+            </div>
+            <div class="col-md-2">
+                <%= f.label :created_at_lteq, t('.created_before', default: 'Created Before') %>
+                <div class='input-group date date_field_w'>
+                    <%= f.text_field :created_at_lteq, class: 'form-control ' %>
+                    <span class='add-on input-group-addon'><span class='glyphicon glyphicon-calendar'></span></span>
                 </div>
-                <button type="submit" class="btn btn-primary"><span class="fa fa-search" aria-hidden="true"></span> <%= t("camaleon_cms.admin.button.search") %></button>
-            <% end %>
-        </div>
+            </div>
+            <div class="col-md-2">
+                <%= f.label :status_eq, t('.search_status', default: 'Status') %>
+                <%= f.select :status_eq, [[t('plugins.ecommerce.select.shipped', default: 'Shipped'), "shipped"], [t('plugins.ecommerce.select.canceled', default: 'Cancelled'), "canceled"], [t('plugins.ecommerce.select.paid', default: 'Paid'), "paid"], [t('plugins.ecommerce.messages.order_status.bank_pending', default: 'Bank Pending'), "bank_pending"], [t('plugins.ecommerce.by_on_delivery', default: 'Payment no Delivery'), "on_delivery"]], {include_blank: true}, class: 'form-control' %>
+            </div>
+            <div class="col-md-2">
+                <%= f.label :user_id_eq, t('.search_user', default: 'User') %>
+                <%= f.collection_select :user_id_eq, current_site.users.where(id: current_site.orders.pluck(:user_id)).decorate, :id, :the_name, {include_blank: true}, class: 'form-control' %>
+            </div>
+            <div class="col-md-1 text-left">
+                <label>&nbsp;</label><br>
+                <button type="submit" class="btn btn-primary"><span class="fa fa-search"></span></button>
+            </div>
+        <% end %>
+        <hr>
         <div class="hidden" id="commerce_cancel_modal">
             <%= form_tag '#' do %>
                 <div class="form-group">
@@ -61,22 +64,19 @@
         <table class="table">
             <thead>
             <tr>
-                <th><%= cama_t('plugins.ecommerce.table.id') %></th>
-                <th><%= cama_t('plugins.ecommerce.table.customer') %></th>
-                <th><%= cama_t('plugins.ecommerce.table.status') %></th>
-                <th><%= cama_t('plugins.ecommerce.table.paid') %></th>
-                <th><%= cama_t('plugins.ecommerce.table.products') %></th>
-                <th><%= cama_t('plugins.ecommerce.table.amount') %></th>
-                <th><%= cama_t('plugins.ecommerce.table.created_at') %></th>
-                <th><%= cama_t('plugins.ecommerce.table.payment_method') %></th>
-                <th><%= cama_t('camaleon_cms.admin.table.actions') %></th>
+                <th><%= t('plugins.ecommerce.table.id', default: 'Id') %></th>
+                <th><%= t('plugins.ecommerce.table.customer', default: 'Customer') %></th>
+                <th><%= t('plugins.ecommerce.table.status', default: 'Status') %></th>
+                <th><%= t('plugins.ecommerce.table.paid', default: 'Paid?') %></th>
+                <th><%= t('plugins.ecommerce.table.products', default: 'Products') %></th>
+                <th><%= t('plugins.ecommerce.table.amount', default: 'Amount') %></th>
+                <th><%= t('plugins.ecommerce.table.created_at', default: 'Created at') %></th>
+                <th><%= t('plugins.ecommerce.table.payment_method', default: 'Payment Method') %></th>
+                <th><%= t('camaleon_cms.admin.table.actions', default: 'Actions') %></th>
             </tr>
             </thead>
             <tbody>
-            <%
-                @orders.each do |order|
-                  order = order.decorate
-            %>
+            <% amount = 0; @orders.each do |order| order = order.decorate; amount += order.amount %>
                 <tr>
                     <td><%= order.slug %></td>
                     <td>
@@ -94,7 +94,7 @@
                         <% end %>
                     </td>
                     <td><%= order.cache_the_total %></td>
-                    <td><%= order.created_at %></td>
+                    <td><%= order.the_created_at %></td>
                     <td><%= order.payment_method.name rescue "" %></td>
                     <td>
                         <%= link_to raw('<i class="fa fa-eye"></i>'), {action: :show, id: order.slug}, class: "btn btn-info btn-xs", title: "#{t('camaleon_cms.admin.button.preview')}" %>
@@ -103,7 +103,8 @@
                         <div class="btn-group">
                             <button class="btn btn-info btn-xs dropdown-toggle" data-toggle="dropdown" aria-expanded="false" title="<%= t('camaleon_cms.admin.button.settings') %>"><i class="fa fa-cog"></i></button>
                                 <ul class="dropdown-menu pull-right" style="min-width: 50px;">
-                                    <%= content_tag :li, link_to(t('plugins.ecommerce.table.make_accepted', default: 'Mark as Accepted'), url_for(action: :mark_accepted, order_id: order.slug), class: 'btn btn-xs') if order.paid? %>
+                                    <%#= content_tag :li, link_to(t('plugins.ecommerce.table.make_accepted', default: 'Mark as Accepted'), url_for(action: :mark_accepted, order_id: order.slug), class: 'btn btn-xs') if order.paid? %>
+                                    <%= content_tag :li, link_to(t('.resend_email', default: 'Resend Email'), url_for(action: :resend_email, order_id: order.slug), class: 'btn btn-xs') %>
                                     <%= content_tag :li, link_to(t('plugins.ecommerce.table.make_shipped', default: 'Mark as Shipped'), url_for(action: :mark_shipped, order_id: order.slug), class: 'btn btn-xs mark_shipped_btn') if order.accepted? || order.paid? %>
                                     <%= content_tag :li, link_to(t('plugins.ecommerce.table.make_canceled', default: 'Mark as Canceled'), url_for(action: :mark_canceled, order_id: order.slug), class: 'btn btn-xs mark_canceled_btn', 'data-confirm_msg'=> t('plugins.ecommerce.table.confirm_mark_as_cancel', default: 'Are you sure to mark as Canceled?')) if order.bank_pending? || order.on_delivery_pending? || order.paid? %>
                                     <%= content_tag :li, link_to(t('plugins.ecommerce.table.make_bank_confirmed', default: 'Mark as Paid'), url_for(action: :mark_bank_confirmed, order_id: order.slug), class: 'btn btn-xs', 'data-confirm'=> t('plugins.ecommerce.table.confirm_mark_as_paid', default: 'Are you sure to mark as Paid?')) if order.bank_pending? || order.on_delivery_pending? %>
@@ -115,26 +116,21 @@
             </tbody>
         </table>
         <%= content_tag("div", raw(t('camaleon_cms.admin.message.data_found_list')), class: "alert alert-warning") if @orders.empty? %>
-        <%= will_paginate @orders %>
+        <%= content_tag("div", "<strong>#{t('plugins.ecommerce.front.orders.index.total_amount', default: 'Total Amount')}: #{e_parse_price(amount)}</strong>".html_safe, class: "") %>
+        <%= raw cama_do_pagination @orders %>
     </div>
 </div>
 <script>
     jQuery(function () {
         var panel = $('#commerce-orders-list');
+        panel.find('.date_field_w').datepicker();
+
         panel.find('.mark_shipped_btn').click(function(e){
             var link = $(this);
             e.preventDefault();
             open_modal({title: link.text(), content: panel.find('#commerce_shipped_modal').html(), callback: function(modal){ modal.find('form').attr('action', link.attr('href')).validate(); }});
         });
 
-        panel.find('#ecommerce_adv_search_btn').click(function(e){
-            var link = $(this);
-            e.preventDefault();
-            open_modal({title: link.attr('title'), content: panel.find('#commerce_adv_search_modal').html(), callback: function(modal){
-                modal.find('form').validate();
-            }});
-        });
-
         panel.find('.mark_canceled_btn').click(function(e){
             var link = $(this);
             e.preventDefault();