camaleon_ecommerce 1.2 → 1.2.1

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

@@ -1,3 +1,3 @@
-<p><%= t('plugin.ecommerce.mail.order_received.welcome') %><%= @extra_data[:admin][:fullname] %></p>
-<p><%= t('plugin.ecommerce.mail.order_received.boght_by', user: @extra_data[:fullname], default: '%{user} has bought') %></p>
-<p><%= t('plugin.ecommerce.mail.order_received.reference') %> <a href="<%= @extra_data[:order_url] %>"><%= @extra_data[:order_slug] %></a>
+<p><%= t('plugins.ecommerce.mail.order_received.welcome') %><%= @extra_data[:admin][:fullname] %></p>
+<p><%= t('plugins.ecommerce.mail.order_received.boght_by', user: @extra_data[:fullname], default: '%{user} has bought') %></p>
+<p><%= t('plugins.ecommerce.mail.order_received.reference') %> <a href="<%= @extra_data[:order_url] %>"><%= @extra_data[:order_slug] %></a>

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

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

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

@@ -1,4 +1,4 @@
 <% order_slug = @extra_data[:order].slug %>
-<p><%= t('plugin.ecommerce.mail.order_received.welcome') %><%= @extra_data[:fullname] %></p>
-<p><%= t('plugin.ecommerce.mail.recovery_cart.body') %></p>
-<p><%= t('plugin.ecommerce.mail.recovery_cart.reference') %> <a href="<%= plugins_ecommerce_order_show_url(order: order_slug) %>"><%= order_slug %></a>
+<p><%= t('plugins.ecommerce.mail.order_received.welcome') %><%= @extra_data[:fullname] %></p>
+<p><%= t('plugins.ecommerce.mail.recovery_cart.body') %></p>
+<p><%= t('plugins.ecommerce.mail.recovery_cart.reference') %> <a href="<%= plugins_ecommerce_order_show_url(order: order_slug) %>"><%= order_slug %></a>

data/app/views/plugins/ecommerce/admin/coupons/form.html.erb

@@ -1,5 +1,5 @@
 <div class="page-title">
-  <h2><span class="fa fa-tag"></span> <%= @coupon.new_record? ? "#{t('plugin.ecommerce.new_coupon')}" : "#{t('plugin.ecommerce.edit_coupon')}: #{@coupon.name}" %></h2>
+  <h2><span class="fa fa-tag"></span> <%= @coupon.new_record? ? "#{t('plugins.ecommerce.new_coupon')}" : "#{t('plugins.ecommerce.edit_coupon')}: #{@coupon.name}" %></h2>
 </div>
 
 <!-- PAGE CONTENT WRAPPER -->
@@ -8,37 +8,37 @@
     <div class="col-md-8 col-md-offset-2">
       <div class="panel panel-default">
         <div class="panel-heading ui-draggable-handle">
-          <h3 class="panel-title"><%= t('plugin.ecommerce.form_coupon') %></h3>
+          <h3 class="panel-title"><%= t('plugins.ecommerce.form_coupon') %></h3>
         </div>
         <%= form_for @coupon, url:{action: @coupon.new_record? ? :create : :update},  html: {class: 'validate-coupon', id: 'form-coupon'}  do |f| %>
             <div class="panel-body">
               <%= render partial: 'layouts/camaleon_cms/admin/form_error', locals: {data: @coupon} %>
               <div class="form-group">
-                <%= f.label t('plugin.ecommerce.table.name') %><br>
+                <%= f.label t('plugins.ecommerce.table.name') %><br>
                 <%= f.text_field :name, :class => "form-control required" %>
               </div>
               <div class="form-group">
-                <label for=""><%= t('plugin.ecommerce.table.code') %></label><br>
+                <label for=""><%= t('plugins.ecommerce.table.code') %></label><br>
                 <%= f.text_field :slug, :class => "form-control required" %>
               </div>
               <% options = params[:options].present? ? params[:options] : @coupon.options rescue {} %>
               <div class="form-group">
-                <label for=""><%= t('plugin.ecommerce.table.amount') %></label><br>
+                <label for=""><%= t('plugins.ecommerce.table.amount') %></label><br>
                 <%= number_field_tag "options[amount]", options[:amount] || '', :class => "form-control required" %>
               </div>
 
               <div class="form-group">
-                <label for=""><%= t('plugin.ecommerce.table.discount_type') %></label><br>
-                <%= select_tag "options[discount_type]", options_for_select([[t('plugin.ecommerce.table.percent'),"percent"],[t('plugin.ecommerce.table.money'),"money"],[t('plugin.ecommerce.table.free_shipping'),"free_ship"]], options[:discount_type] || ''), :class => "form-control required" %>
+                <label for=""><%= t('plugins.ecommerce.table.discount_type') %></label><br>
+                <%= select_tag "options[discount_type]", options_for_select([[t('plugins.ecommerce.table.percent'),"percent"],[t('plugins.ecommerce.table.money'),"money"],[t('plugins.ecommerce.table.free_shipping'),"free_ship"]], options[:discount_type] || ''), :class => "form-control required" %>
               </div>
 
               <div class="form-group">
-                <label for=""><%= t('plugin.ecommerce.table.min_cart_total') %></label><br>
+                <label for=""><%= t('plugins.ecommerce.table.min_cart_total') %></label><br>
                 <%= text_field_tag "options[min_cart_total]",options[:min_cart_total] || '', :class => "form-control required" %>
               </div>
 
               <div class="form-group">
-                  <label for=""><%= t('plugin.ecommerce.table.expiration_date') %></label><br>
+                  <label for=""><%= t('plugins.ecommerce.table.expiration_date') %></label><br>
                   <div class="input-group date date-input-box">
                       <%= text_field_tag "options[expirate_date]",options[:expirate_date] || '', :class => "form-control required", "data-locale" => current_locale %>
                       <span class="add-on input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
@@ -46,13 +46,13 @@
               </div>
 
               <div class="form-group">
-                <label for=""><%= t('plugin.ecommerce.table.allowed_applications') %></label><br>
+                <label for=""><%= t('plugins.ecommerce.table.allowed_applications') %></label><br>
                 <%= number_field_tag "options[allowed_applications]", options[:allowed_applications] || '1', :class => "form-control required" %>
               </div>
 
 
               <div class="form-group">
-                <label><%= f.check_box :status %> &nbsp; <%= t('plugin.ecommerce.active') %></label>
+                <label><%= f.check_box :status %> &nbsp; <%= t('plugins.ecommerce.active') %></label>
               </div>
             </div>
             <div class="panel-footer">

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

@@ -1,22 +1,22 @@
 <div class="panel panel-default">
   <div class="panel-heading">
-    <h4><span class="fa fa-tag"></span> <%= t('plugin.ecommerce.coupons') %></h4>
-    <%= link_to raw("<i class='fa fa-plus'></i> #{t('plugin.ecommerce.add_coupons')}"), {action: :new}, class: "btn btn-primary pull-right" %>
+    <h4><span class="fa fa-tag"></span> <%= t('plugins.ecommerce.coupons') %></h4>
+    <%= link_to raw("<i class='fa fa-plus'></i> #{t('plugins.ecommerce.add_coupons')}"), {action: :new}, class: "btn btn-primary pull-right" %>
   </div>
   <div class="panel-body">
 
     <table class="table">
       <thead>
         <tr>
-          <th id=""><%= t('plugin.ecommerce.table.code') %></th>
-          <th id=""><%= t('plugin.ecommerce.table.name') %></th>
-          <th id=""><%= t('plugin.ecommerce.table.status') %></th>
-          <th id=""><%= t('plugin.ecommerce.table.amount') %></th>
-          <th id=""><%= t('plugin.ecommerce.table.min_cart_total') %></th>
-          <th id=""><%= t('plugin.ecommerce.table.expiration_date') %></th>
-          <th id=""><%= t('plugin.ecommerce.table.allowed_applications') %></th>
-          <th id=""><%= t('plugin.ecommerce.table.used_applications') %></th>
-          <th><%= t('plugin.ecommerce.table.actions') %></th>
+          <th id=""><%= t('plugins.ecommerce.table.code') %></th>
+          <th id=""><%= t('plugins.ecommerce.table.name') %></th>
+          <th id=""><%= t('plugins.ecommerce.table.status') %></th>
+          <th id=""><%= t('plugins.ecommerce.table.amount') %></th>
+          <th id=""><%= t('plugins.ecommerce.table.min_cart_total') %></th>
+          <th id=""><%= t('plugins.ecommerce.table.expiration_date') %></th>
+          <th id=""><%= t('plugins.ecommerce.table.allowed_applications') %></th>
+          <th id=""><%= t('plugins.ecommerce.table.used_applications') %></th>
+          <th><%= t('plugins.ecommerce.table.actions') %></th>
         </tr>
       </thead>
       <tbody>

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

@@ -1,13 +1,13 @@
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h4><span class="fa fa-cog"></span> <%= t('plugin.ecommerce.edit_order') %>: <%= @order.slug %></h4>
+        <h4><span class="fa fa-cog"></span> <%= t('plugins.ecommerce.edit_order') %>: <%= @order.slug %></h4>
     </div>
     <%= form_for @order, url: {action: @order.new_record? ? :create : :update}, html: {class: 'form-order', id: 'form-order'} do |f| %>
         <div class="panel-body">
             <%= render plugin_view('partials/checkout/user_info'), cart: @order, as_partial: true %>
             <hr>
             <div class="form-group">
-                <%= f.label nil, t('plugin.ecommerce.show_order.consignment_number', default: 'Consignment Number') %>
+                <%= f.label nil, t('plugins.ecommerce.show_order.consignment_number', default: 'Consignment Number') %>
                 <%= text_field_tag 'metas[consignment_number]', @order.get_meta('consignment_number'), class: 'form-control' %>
             </div>
             <div class="form-group">

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

@@ -1,56 +1,47 @@
 <div class="panel panel-default" id="commerce-orders-list">
     <div class="panel-heading">
-        <h4><span class="fa fa-cog"></span> <%= t('plugin.ecommerce.orders') %></h4>
+        <h4><span class="fa fa-cog"></span> <%= t('plugins.ecommerce.orders') %></h4>
     </div>
 
     <div class="panel-body">
-        <div class="box-adv-search pull-right" id="orders-box-adv-search">
+        <%= 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('plugin.ecommerce.search_order_number') %>" name="q" value="<%= params[:q] %>"/>
-
+                <input type="text" class="form-control" placeholder="<%= t('plugins.ecommerce.search_order_number') %>" name="q" value="<%= params[:q] %>"/>
                 <div class="input-group-btn">
-                    <div class="btn-group" role="group">
-                        <div class="dropdown dropdown-lg">
-                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-                                <span class="caret"></span></button>
-                            <div class="dropdown-menu dropdown-menu-right" role="menu">
-                                <form action="<%= url_for(action: :index) %>" method="get" class="form-horizontal" role="form">
-                                    <div class="form-group">
-                                        <label for="contain"><%= t('plugin.ecommerce.table.customer') %> </label>
-                                        <input class="form-control" type="text" name="c" value="<%= params[:c] %>"/>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="contain"><%= t('plugin.ecommerce.e_mail_address') %></label>
-                                        <input class="form-control" type="email" name="e" value="<%= params[:e] %>"/>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="contain"><%= t('plugin.ecommerce.phone_number') %></label>
-                                        <input class="form-control" type="text" name="p" value="<%= params[:p] %>"/>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="contain"><%= t('plugin.ecommerce.table.status') %></label>
-                                        <%= select_tag "s", options_for_select([[""], [t('plugin.ecommerce.select.received'), "received"], [t('plugin.ecommerce.select.unpaid'), "unpaid"], [t('plugin.ecommerce.select.accepted'), "accepted"], [t('plugin.ecommerce.select.shipped'), "shipped"], [t('plugin.ecommerce.select.closed'), "closed"], [t('plugin.ecommerce.select.canceled'), "canceled"]], params[:s]), class: 'form-control' %>
-                                    </div>
-
-                                    <button type="submit" class="btn btn-primary">
-                                        <span class="fa fa-search" aria-hidden="true"></span></button>
-                                </form>
-                            </div>
-                        </div>
-                        <button type="button" class="btn btn-primary">
-                            <span class="fa fa-search" aria-hidden="true"></span></button>
-                    </div>
+                    <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>
             </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>
+                <!--<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>
+                <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 class="hidden" id="commerce_cancel_modal">
             <%= form_tag '#' do %>
                 <div class="form-group">
-                    <%= label_tag nil, t('plugin.ecommerce.table.description', default: 'Description') %>
+                    <%= label_tag nil, t('plugins.ecommerce.table.description', default: 'Description') %>
                     <%= text_area_tag 'description', '', class: 'form-control required' %>
                 </div>
                 <div class="">
-                    <span class="input-group-btn"><button class="btn btn-default" type="submit"><%= t('plugin.ecommerce.table.make_canceled', default: 'Mark as Canceled') %></button></span>
+                    <span class="input-group-btn"><button class="btn btn-default" type="submit"><%= t('plugins.ecommerce.table.make_canceled', default: 'Mark as Canceled') %></button></span>
                 </div>
             <% end %>
         </div>
@@ -58,11 +49,11 @@
         <div class="hidden" id="commerce_shipped_modal">
             <%= form_tag '#' do %>
                 <div>
-                    <%= label_tag nil, t('plugin.ecommerce.show_order.consignment_number', default: 'Consignment Number') %>
+                    <%= label_tag nil, t('plugins.ecommerce.show_order.consignment_number', default: 'Consignment Number') %>
                 </div>
                 <div class="input-group">
                     <%= text_field_tag 'consignment_number', '', class: 'form-control' %>
-                    <span class="input-group-btn"><button class="btn btn-default" type="submit"><%= t('plugin.ecommerce.table.make_shipped', default: 'Mark as Shipped') %></button></span>
+                    <span class="input-group-btn"><button class="btn btn-default" type="submit"><%= t('plugins.ecommerce.table.make_shipped', default: 'Mark as Shipped') %></button></span>
                 </div>
             <% end %>
         </div>
@@ -70,15 +61,15 @@
         <table class="table">
             <thead>
             <tr>
-                <th id=""><%= t('plugin.ecommerce.table.id') %></th>
-                <th id=""><%= t('plugin.ecommerce.table.customer') %></th>
-                <th id=""><%= t('plugin.ecommerce.table.status') %></th>
-                <th id=""><%= t('plugin.ecommerce.table.paid') %></th>
-                <th id=""><%= t('plugin.ecommerce.table.products') %></th>
-                <th id=""><%= t('plugin.ecommerce.table.amount') %></th>
-                <th id=""><%= t('plugin.ecommerce.table.received_time') %></th>
-                <th id=""><%= t('plugin.ecommerce.table.payment_method') %></th>
-                <th><%= t('camaleon_cms.admin.table.actions') %></th>
+                <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>
             </tr>
             </thead>
             <tbody>
@@ -103,19 +94,19 @@
                         <% end %>
                     </td>
                     <td><%= order.cache_the_total %></td>
-                    <td><%= order.received_at %></td>
+                    <td><%= order.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')}" %>
                         <%= link_to raw('<i class="fa fa-edit"></i>'), {action: :edit, id: order.slug}, class: "btn btn-default btn-xs", title: "#{t('camaleon_cms.admin.button.edit')}" %>
-                        <%= link_to raw('<i class="fa fa-trash"></i>'), {action: :destroy, id: order.slug}, class: "btn btn-danger btn-xs", title: "#{t('camaleon_cms.admin.button.delete', default: 'Delete Order')}", method: :delete, 'data-confirm'=> t('plugin.ecommerce.table.confirm_delete', default: 'Are you sure to delete this order?') %>
+                        <%= link_to raw('<i class="fa fa-trash"></i>'), {action: :destroy, id: order.slug}, class: "btn btn-danger btn-xs", title: "#{t('camaleon_cms.admin.button.delete', default: 'Delete Order')}", method: :delete, 'data-confirm'=> t('plugins.ecommerce.table.confirm_delete', default: 'Are you sure to delete this order?') %>
                         <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('plugin.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('plugin.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('plugin.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('plugin.ecommerce.table.confirm_mark_as_cancel', default: 'Are you sure to mark as Canceled?')) if order.bank_pending? || order.paid? %>
-                                    <%= content_tag :li, link_to(t('plugin.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('plugin.ecommerce.table.confirm_mark_as_paid', default: 'Are you sure to mark as Paid?')) if order.bank_pending? %>
+                                    <%= 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_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? %>
                                 </ul>
                         </div>
                     </td>
@@ -136,6 +127,14 @@
             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();
@@ -143,14 +142,5 @@
                 modal.find('form').attr('action', link.attr('href')).validate({submitHandler: function(){ return confirm(link.attr('data-confirm_msg')); }});
             }});
         });
-
-        var cont = $('#orders-box-adv-search');
-        var rnd = "input_" + Math.floor((Math.random() * 1000000) + 1);
-        cont.find('#adv-search > input').change(function () {
-            cont.find('form  .' + rnd).val($(this).val());
-        }).clone().attr('type', 'hidden').addClass(rnd).appendTo(cont.find('form'));
-        cont.find('#adv-search .btn-group > button').click(function () {
-            cont.find('form').submit();
-        });
     });
 </script>

data/app/views/plugins/ecommerce/admin/payment_methods/form.html.erb

@@ -1,12 +1,12 @@
 <div class="panel panel-default">
     <div class="panel-heading ui-draggable-handle">
-        <h4><span class="fa fa-credit-card"></span> <%= @payment_method.new_record? ? "#{t('plugin.ecommerce.new_payment_methods')}" : "#{t('plugin.ecommerce.edit_payment_methods')}: #{@payment_method.name}" %></h4>
+        <h4><span class="fa fa-credit-card"></span> <%= @payment_method.new_record? ? "#{t('plugins.ecommerce.new_payment_methods')}" : "#{t('plugins.ecommerce.edit_payment_methods')}: #{@payment_method.name}" %></h4>
     </div>
     <%= form_for @payment_method, url:{action: @payment_method.new_record? ? :create : :update},  html: {class: 'validate-payment_method', id: 'form-payment_method'}  do |f| %>
         <div class="panel-body">
             <%= render partial: 'layouts/camaleon_cms/admin/form_error', locals: {data: @payment_method} %>
             <div class="form-group">
-                <%= f.label t('plugin.ecommerce.table.name') %><br>
+                <%= f.label t('plugins.ecommerce.table.name') %><br>
                 <%= f.text_field :name, :class => "form-control required" %>
             </div>
             <div class="form-group hidden">
@@ -14,24 +14,25 @@
                 <%= f.text_field :slug, :class => "form-control slug", "data-parent" => 'plugins_ecommerce_payment_method_name' %>
             </div>
             <div class="form-group">
-                <%= f.label t('plugin.ecommerce.table.description') %><br>
+                <%= f.label t('plugins.ecommerce.table.description') %><br>
                 <%= f.text_area :description, :class => "form-control translatable", :rows => 4 %>
             </div>
             <div class="form-group">
-                <label><%= f.check_box :status %> &nbsp; <%= t('plugin.ecommerce.active') %> </label>
+                <label><%= f.check_box :status %> &nbsp; <%= t('plugins.ecommerce.active') %> </label>
             </div>
 
             <% options = @payment_method.options rescue {type: 'bank_transfer'}
                options = params[:options] if params[:options].present?
             %>
-            <h4><%= t('plugin.ecommerce.options_payment_methods') %></h4>
+            <h4><%= t('plugins.ecommerce.options_payment_methods') %></h4>
             <hr/>
             <div id="tab-select-payment-method" class="panel panel-default tabs">
                 <ul  class="nav nav-tabs nav-justified">
-                    <li class="<%= 'active' if options[:type] == 'bank_transfer' %>"><a href="#tab8" data-toggle="tab"><%= t('plugin.ecommerce.by_bank_transfer') %></a></li>
-                    <li class="<%= 'active' if options[:type] == 'paypal' %>"><a href="#tab9" data-toggle="tab"><%= t('plugin.ecommerce.by_paypal') %></a></li>
-                    <li class="<%= 'active' if options[:type] == 'authorize_net' %>"><a href="#tab10" data-toggle="tab"><%= t('plugin.ecommerce.by_authorize_net') %></a></li>
-                    <li class="<%= 'active' if options[:type] == 'stripe' %>"><a href="#tab11" data-toggle="tab"><%= t('plugin.ecommerce.by_stripe', default: 'Stripe') %></a></li>
+                    <li class="<%= 'active' if options[:type] == 'bank_transfer' %>"><a href="#tab8" data-toggle="tab"><%= t('plugins.ecommerce.by_bank_transfer') %></a></li>
+                    <li class="<%= 'active' if options[:type] == 'on_delivery' %>"><a href="#tab_on_delivery" data-toggle="tab"><%= t('plugins.ecommerce.by_on_delivery', default: 'Payment on delivery') %></a></li>
+                    <li class="<%= 'active' if options[:type] == 'paypal' %>"><a href="#tab9" data-toggle="tab"><%= t('plugins.ecommerce.by_paypal') %></a></li>
+                    <li class="<%= 'active' if options[:type] == 'authorize_net' %>"><a href="#tab10" data-toggle="tab"><%= t('plugins.ecommerce.by_authorize_net') %></a></li>
+                    <li class="<%= 'active' if options[:type] == 'stripe' %>"><a href="#tab11" data-toggle="tab"><%= t('plugins.ecommerce.by_stripe', default: 'Stripe') %></a></li>
                     <% ecommerce_custom_payment_methods.each do |k, obj| %>
                         <li class="<%= 'active' if options[:type] == k %>"><a href="#tab_<%= k %>" data-toggle="tab"><%= obj[:title] %></a></li>
                     <% end %>
@@ -41,79 +42,84 @@
                     <div class="tab-pane <%= 'active' if options[:type] == 'bank_transfer' %>" id="tab8">
                         <%= hidden_field_tag( "options[type]", 'bank_transfer') %>
                         <div class="form-group">
-                            <label><%= t('plugin.ecommerce.table.number_account_bank') %></label><br>
+                            <label><%= t('plugins.ecommerce.table.number_account_bank') %></label><br>
                             <%= text_field_tag( "options[bank_transfer_number_account]", options[:bank_transfer_number_account], class: "form-control required") %>
                         </div>
                         <div class="form-group">
-                            <label><%= t('plugin.ecommerce.table.details') %></label><br>
+                            <label><%= t('plugins.ecommerce.table.details') %></label><br>
                             <%= text_area_tag( "options[bank_transfer_detail]", options[:bank_transfer_detail], class: "form-control required") %>
                         </div>
                     </div>
 
                     <div class="tab-pane <%= 'active' if options[:type] == 'paypal' %>" id="tab9">
+                        <a href="http://support.berta.me/kb/online-shop/how-to-get-paypal-api-username-password-and-signature-information">Steps here: http://support.berta.me/kb/online-shop/how-to-get-paypal-api-username-password-and-signature-information</a>
                         <%= hidden_field_tag( "options[type]", 'paypal') %>
                         <div class="form-group">
-                            <label><%= t('plugin.ecommerce.table.username_login') %></label><br>
+                            <label><%= t('plugins.ecommerce.table.username_login') %></label><br>
                             <%= text_field_tag( "options[paypal_login]", options[:paypal_login], class: "form-control required") %>
                         </div>
                         <div class="form-group">
-                            <label><%= t('plugin.ecommerce.table.password') %></label><br>
+                            <label><%= t('plugins.ecommerce.table.password') %></label><br>
                             <%= text_field_tag( "options[paypal_password]", options[:paypal_password], class: "form-control required") %>
                         </div>
                         <div class="form-group">
-                            <label><%= t('plugin.ecommerce.table.signature') %></label><br>
+                            <label><%= t('plugins.ecommerce.table.signature') %></label><br>
                             <%= text_field_tag( "options[paypal_signature]", options[:paypal_signature], class: "form-control required") %>
                         </div>
                         <div class="form-group">
-                            <div class="checkbox"><label><input type="checkbox" name="options[paypal_sandbox]" value="1" <%= 'checked' if options[:paypal_sandbox] %>>  <%= t('plugin.ecommerce.table.sandbox') %> </label></div>
+                            <div class="checkbox"><label><input type="checkbox" name="options[paypal_sandbox]" value="1" <%= 'checked' if options[:paypal_sandbox] %>>  <%= t('plugins.ecommerce.table.sandbox') %> </label></div>
                         </div>
                     </div>
 
                     <div class="tab-pane <%= 'active' if options[:type] == 'credit_card' %>" id="tab7">
                         <%= hidden_field_tag( "options[type]", 'credit_card') %>
                         <div class="form-group">
-                            <label><%= t('plugin.ecommerce.table.username_login') %></label><br>
+                            <label><%= t('plugins.ecommerce.table.username_login') %></label><br>
                             <%= text_field_tag( "options[cc_paypal_login]", options[:cc_paypal_login], class: "form-control required") %>
                         </div>
                         <div class="form-group">
-                            <label><%= t('plugin.ecommerce.table.password') %></label><br>
+                            <label><%= t('plugins.ecommerce.table.password') %></label><br>
                             <%= text_field_tag( "options[cc_paypal_password]", options[:cc_paypal_password], class: "form-control required") %>
                         </div>
                         <div class="form-group">
-                            <label><%= t('plugin.ecommerce.table.signature') %></label><br>
+                            <label><%= t('plugins.ecommerce.table.signature') %></label><br>
                             <%= text_field_tag( "options[cc_paypal_signature]", options[:cc_paypal_signature], class: "form-control required") %>
                         </div>
                         <div class="form-group">
-                            <div class="checkbox"><label><input type="checkbox" name="options[cc_paypal_sandbox]" value="1" <%= 'checked' if options[:cc_paypal_sandbox] %>>  <%= t('plugin.ecommerce.table.sandbox') %> </label></div>
+                            <div class="checkbox"><label><input type="checkbox" name="options[cc_paypal_sandbox]" value="1" <%= 'checked' if options[:cc_paypal_sandbox] %>>  <%= t('plugins.ecommerce.table.sandbox') %> </label></div>
                         </div>
                     </div>
 
                     <div class="tab-pane <%= 'active' if options[:type] == 'authorize_net' %>" id="tab10">
                         <%= hidden_field_tag('options[type]', 'authorize_net') %>
                         <div class="form-group">
-                            <label><%= t('plugin.ecommerce.table.login_id') %></label><br>
+                            <label><%= t('plugins.ecommerce.table.login_id') %></label><br>
                             <%= text_field_tag('options[authorize_net_login_id]', options[:authorize_net_login_id], class: 'form-control required') %>
                         </div>
                         <div class="form-group">
-                            <label><%= t('plugin.ecommerce.table.transaction_key') %></label><br>
+                            <label><%= t('plugins.ecommerce.table.transaction_key') %></label><br>
                             <%= text_field_tag('options[authorize_net_transaction_key]', options[:authorize_net_transaction_key], class: 'form-control required') %>
                         </div>
                         <div class="form-group">
                             <div class="checkbox">
                                 <label>
-                                    <input type="checkbox" name="options[authorize_net_sandbox]" value="1" <%= 'checked' if options[:authorize_net_sandbox] %>>  <%= t('plugin.ecommerce.table.sandbox') %>
+                                    <input type="checkbox" name="options[authorize_net_sandbox]" value="1" <%= 'checked' if options[:authorize_net_sandbox] %>>  <%= t('plugins.ecommerce.table.sandbox') %>
                                 </label>
                             </div>
                         </div>
                     </div>
+                    <div class="tab-pane <%= 'active' if options[:type] == 'on_delivery' %>" id="tab_on_delivery">
+                        <%= hidden_field_tag('options[type]', 'on_delivery') %>
+                        <h3><i class="fa fa-check-circle"></i></h3>
+                    </div>
                     <div class="tab-pane <%= 'active' if options[:type] == 'stripe' %>" id="tab11">
                         <%= hidden_field_tag('options[type]', 'stripe') %>
                         <div class="form-group">
-                            <label><%= t('plugin.ecommerce.stripe_scret_key', default: 'Secret Key') %></label><br>
+                            <label><%= t('plugins.ecommerce.stripe_scret_key', default: 'Secret Key') %></label><br>
                             <%= text_field_tag('options[stripe_id]', options[:stripe_id], class: 'form-control required') %>
                         </div>
                         <div class="form-group">
-                            <label><%= t('plugin.ecommerce.stripe_publish_key', default: 'Publishable Key') %></label><br>
+                            <label><%= t('plugins.ecommerce.stripe_publish_key', default: 'Publishable Key') %></label><br>
                             <%= text_field_tag('options[stripe_key]', options[:stripe_key], class: 'form-control required') %>
                         </div>
                     </div>