camaleon_ecommerce 1.2 → 1.2.1

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

@@ -1,19 +1,19 @@
 <div class="panel panel-default">
   <div class="panel-heading">
-    <h4><span class="fa fa-credit-card"></span> <%= t('plugin.ecommerce.payment_methods') %></h4>
-    <%= link_to raw("<i class='fa fa-plus'></i> #{t('plugin.ecommerce.add_payment_method')}"), {action: :new}, class: "btn btn-primary pull-right" %>
+    <h4><span class="fa fa-credit-card"></span> <%= t('plugins.ecommerce.payment_methods') %></h4>
+    <%= link_to raw("<i class='fa fa-plus'></i> #{t('plugins.ecommerce.add_payment_method')}"), {action: :new}, class: "btn btn-primary pull-right" %>
   </div>
   <div class="panel-body">
 
     <table class="table">
       <thead>
         <tr>
-          <th id=""><%= t('plugin.ecommerce.table.id') %></th>
-          <th id=""><%= t('plugin.ecommerce.table.name') %></th>
-          <th id=""><%= t('plugin.ecommerce.table.method_type') %></th>
-          <th id=""><%= t('plugin.ecommerce.table.status') %></th>
-          <th id=""><%= t('plugin.ecommerce.table.description') %></th>
-          <th><%= t('plugin.ecommerce.table.actions') %></th>
+          <th id=""><%= t('plugins.ecommerce.table.id') %></th>
+          <th id=""><%= t('plugins.ecommerce.table.name') %></th>
+          <th id=""><%= t('plugins.ecommerce.table.method_type') %></th>
+          <th id=""><%= t('plugins.ecommerce.table.status') %></th>
+          <th id=""><%= t('plugins.ecommerce.table.description') %></th>
+          <th><%= t('plugins.ecommerce.table.actions') %></th>
         </tr>
       </thead>
       <tbody>

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

@@ -1,61 +1,61 @@
 <div class="panel panel-default">
     <div class="panel-heading">
         <h4><span class="fa fa-credit-card"></span> <%= @payment_method.name %></h4>
-        <%= link_to raw("<i class='fa fa-edit'></i> #{t('plugin.ecommerce.edit_payment_methods')}"), {action: :edit, id: @payment_method.id}, class: "btn btn-primary pull-right" %>
+        <%= link_to raw("<i class='fa fa-edit'></i> #{t('plugins.ecommerce.edit_payment_methods')}"), {action: :edit, id: @payment_method.id}, class: "btn btn-primary pull-right" %>
     </div>
     <div class="panel-body">
         <div class="row">
             <div class="col-md-6">
-                <h3><%= t('plugin.ecommerce.info') %></h3>
+                <h3><%= t('plugins.ecommerce.info') %></h3>
                 <ul class="ec-list-orders-address">
-                    <li><strong><%= t('plugin.ecommerce.table.name') %>:</strong> <span> <%= @payment_method.name %></span></li>
-                    <li><strong><%= t('plugin.ecommerce.table.description') %>:</strong> <span> <%= @payment_method.description %></span></li>
-                    <li><strong><%= t('plugin.ecommerce.status') %>:</strong> <span> <%= raw @payment_method.the_status %></span></li>
+                    <li><strong><%= t('plugins.ecommerce.table.name') %>:</strong> <span> <%= @payment_method.name %></span></li>
+                    <li><strong><%= t('plugins.ecommerce.table.description') %>:</strong> <span> <%= @payment_method.description %></span></li>
+                    <li><strong><%= t('plugins.ecommerce.status') %>:</strong> <span> <%= raw @payment_method.the_status %></span></li>
                 </ul>
             </div>
 
             <div class="col-md-6">
                 <% if @payment_method.options[:type] == 'paypal' %>
-                    <h3><%= t('plugin.ecommerce.method_paypal') %></h3>
+                    <h3><%= t('plugins.ecommerce.method_paypal') %></h3>
                     <ul class="ec-list-orders-address">
-                        <li><strong><%= t('plugin.ecommerce.table.login') %>:</strong> <span> <%= @payment_method.options[:paypal_login]  %></span></li>
-                        <li><strong><%= t('plugin.ecommerce.table.password') %>:</strong> <span> <%= @payment_method.options[:paypal_password]  %></span></li>
-                        <li><strong><%= t('plugin.ecommerce.table.signature') %>:</strong> <span> <%= @payment_method.options[:paypal_signature]  %></span></li>
-                        <li><strong><%= t('plugin.ecommerce.table.sandbox') %>:</strong> <span> <%= @payment_method.options[:paypal_sandbox].to_s.to_bool ? 'Yes' : 'No'  %></span></li>
+                        <li><strong><%= t('plugins.ecommerce.table.login') %>:</strong> <span> <%= @payment_method.options[:paypal_login]  %></span></li>
+                        <li><strong><%= t('plugins.ecommerce.table.password') %>:</strong> <span> <%= @payment_method.options[:paypal_password]  %></span></li>
+                        <li><strong><%= t('plugins.ecommerce.table.signature') %>:</strong> <span> <%= @payment_method.options[:paypal_signature]  %></span></li>
+                        <li><strong><%= t('plugins.ecommerce.table.sandbox') %>:</strong> <span> <%= @payment_method.options[:paypal_sandbox].to_s.to_bool ? 'Yes' : 'No'  %></span></li>
                     </ul>
                 <% end  %>
 
                 <% if @payment_method.options[:type] == 'credit_card' %>
-                    <h3><%= t('plugin.ecommerce.method_credit_card') %></h3>
+                    <h3><%= t('plugins.ecommerce.method_credit_card') %></h3>
                     <ul class="ec-list-orders-address">
-                        <li><strong><%= t('plugin.ecommerce.table.login') %>:</strong> <span> <%= @payment_method.options[:cc_paypal_login]  %></span></li>
-                        <li><strong><%= t('plugin.ecommerce.table.password') %>:</strong> <span> <%= @payment_method.options[:cc_paypal_password]  %></span></li>
-                        <li><strong><%= t('plugin.ecommerce.table.signature') %>:</strong> <span> <%= @payment_method.options[:cc_paypal_signature]  %></span></li>
-                        <li><strong><%= t('plugin.ecommerce.table.sandbox') %>:</strong> <span> <%= @payment_method.options[:cc_paypal_sandbox].to_s.to_bool ? 'Yes' : 'No'  %></span></li>
+                        <li><strong><%= t('plugins.ecommerce.table.login') %>:</strong> <span> <%= @payment_method.options[:cc_paypal_login]  %></span></li>
+                        <li><strong><%= t('plugins.ecommerce.table.password') %>:</strong> <span> <%= @payment_method.options[:cc_paypal_password]  %></span></li>
+                        <li><strong><%= t('plugins.ecommerce.table.signature') %>:</strong> <span> <%= @payment_method.options[:cc_paypal_signature]  %></span></li>
+                        <li><strong><%= t('plugins.ecommerce.table.sandbox') %>:</strong> <span> <%= @payment_method.options[:cc_paypal_sandbox].to_s.to_bool ? 'Yes' : 'No'  %></span></li>
                     </ul>
                 <% end  %>
 
                 <% if @payment_method.options[:type] == 'bank_transfer' %>
-                    <h3><%= t('plugin.ecommerce.method_bank_transfer') %></h3>
+                    <h3><%= t('plugins.ecommerce.method_bank_transfer') %></h3>
                     <ul class="ec-list-orders-address">
-                        <li><strong><%= t('plugin.ecommerce.table.number_account_bank') %>:</strong> <span> <%= @payment_method.options[:bank_transfer_number_account]  %></span></li>
-                        <li><strong><%= t('plugin.ecommerce.table.details') %>:</strong> <span> <%= @payment_method.options[:bank_transfer_detail] %></span></li>
+                        <li><strong><%= t('plugins.ecommerce.table.number_account_bank') %>:</strong> <span> <%= @payment_method.options[:bank_transfer_number_account]  %></span></li>
+                        <li><strong><%= t('plugins.ecommerce.table.details') %>:</strong> <span> <%= @payment_method.options[:bank_transfer_detail] %></span></li>
                     </ul>
                 <% end  %>
 
                 <% if @payment_method.options[:type] == 'authorize_net' %>
-                    <h3><%= t('plugin.ecommerce.method_authorize_net') %></h3>
+                    <h3><%= t('plugins.ecommerce.method_authorize_net') %></h3>
                     <ul class="ec-list-orders-address">
                         <li>
-                            <strong><%= t('plugin.ecommerce.table.login_id') %>:</strong>
+                            <strong><%= t('plugins.ecommerce.table.login_id') %>:</strong>
                             <span> <%= @payment_method.options[:authorize_net_login_id] %></span>
                         </li>
                         <li>
-                            <strong><%= t('plugin.ecommerce.table.transaction_key') %>:</strong>
+                            <strong><%= t('plugins.ecommerce.table.transaction_key') %>:</strong>
                             <span> <%= @payment_method.options[:authorize_net_transaction_key] %></span>
                         </li>
                         <li>
-                            <strong><%= t('plugin.ecommerce.table.sandbox') %>:</strong>
+                            <strong><%= t('plugins.ecommerce.table.sandbox') %>:</strong>
                             <span> <%= @payment_method.options[:authorize_net_sandbox].to_s.to_bool ? 'Yes' : 'No' %></span>
                         </li>
                     </ul>

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

@@ -1,5 +1,5 @@
 <div class="page-title">
-  <h2><span class="fa fa-usd"></span> <%= !@price[:id].present? ? t('plugin.ecommerce.add_price') : "#{t('plugin.ecommerce.edit_price')}: #{@price[:code]}" %></h2>
+  <h2><span class="fa fa-usd"></span> <%= !@price[:id].present? ? t('plugins.ecommerce.add_price') : "#{t('plugins.ecommerce.edit_price')}: #{@price[:code]}" %></h2>
 </div>
 
 <!-- PAGE CONTENT WRAPPER -->
@@ -9,7 +9,7 @@
     <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_price') %></h3>
+          <h3 class="panel-title"><%= t('plugins.ecommerce.form_price') %></h3>
         </div>
         <%#= form_tag ({url:{action: @price.blank? ? :create : :update}}, :method => "post", :class => "form" ) do %>
             <%= form_tag(@price[:id].present? ? {action: :update, id: @price[:id]} : {action: :create}, :method => @price[:id].present? ? "patch" :"post", :class => "validate-price") do %>
@@ -17,19 +17,19 @@
               <div class="row">
 
                 <div class="form-group col-md-6">
-                  <label><%= t('plugin.ecommerce.table.code') %></label><br>
+                  <label><%= t('plugins.ecommerce.table.code') %></label><br>
                   <%= text_field_tag( "price[code]", @price[:code], class: "form-control required") %>
                 </div>
                 <div class="form-group col-md-6">
-                  <label><%= t('plugin.ecommerce.product.price') %> </label> (<%= current_site.current_unit %>)<br>
+                  <label><%= t('plugins.ecommerce.product.price') %> </label> (<%= e_system_currency %>)<br>
                   <%= number_field_tag( "price[price]", @price[:price], class: "form-control required") %>
                 </div>
                 <div class="form-group col-md-6">
-                  <label><%= t('plugin.ecommerce.table.min_weight') %> </label> (<%= current_site.current_weight %>)<br>
+                  <label><%= t('plugins.ecommerce.table.min_weight') %> </label> (<%= current_site.current_weight %>)<br>
                   <%= number_field_tag( "price[min_weight]", @price[:min_weight], class: "form-control required") %>
                 </div>
                 <div class="form-group col-md-6">
-                  <label><%= t('plugin.ecommerce.table.max_weight') %> </label> (<%= current_site.current_weight %>)<br>
+                  <label><%= t('plugins.ecommerce.table.max_weight') %> </label> (<%= current_site.current_weight %>)<br>
                   <%= number_field_tag( "price[max_weight]", @price[:max_weight], class: "form-control required") %>
                 </div>
               </div>

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

@@ -1,18 +1,18 @@
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h4><span class="fa fa-usd"></span> <%= t('plugin.ecommerce.product.price') %></h4>
-        <%= link_to raw("<i class='fa fa-plus'></i> #{t('plugin.ecommerce.add_price')}"), {action: :new}, class: "btn btn-primary pull-right" %>
+        <h4><span class="fa fa-usd"></span> <%= t('plugins.ecommerce.shipping_prices') %></h4>
+        <%= link_to raw("<i class='fa fa-plus'></i> #{t('plugins.ecommerce.add_price')}"), {action: :new}, class: "btn btn-primary pull-right" %>
     </div>
     <div class="panel-body">
 
         <table class="table">
             <thead>
             <tr>
-                <th><%= t('plugin.ecommerce.table.code')%></th>
-                <th><%= t('plugin.ecommerce.product.price')%></th>
-                <th><%= t('plugin.ecommerce.table.min_weight') %></th>
-                <th><%= t('plugin.ecommerce.table.max_weight') %></th>
-                <th><%= t('plugin.ecommerce.table.actions') %></th>
+                <th><%= t('plugins.ecommerce.table.code')%></th>
+                <th><%= t('plugins.ecommerce.product.price')%></th>
+                <th><%= t('plugins.ecommerce.table.min_weight') %></th>
+                <th><%= t('plugins.ecommerce.table.max_weight') %></th>
+                <th><%= t('plugins.ecommerce.table.actions') %></th>
             </tr>
             </thead>
             <tbody>
@@ -21,7 +21,7 @@
             %>
                 <tr>
                     <td><%= row[:code] %></td>
-                    <td><%= current_site.current_unit %> <%= row[:price] %></td>
+                    <td><%= e_parse_price(row[:price]) %></td>
                     <td><%= row[:min_weight] %> <%= current_site.current_weight %></td>
                     <td><%= row[:max_weight] %> <%= current_site.current_weight %></td>
                     <td>

data/app/views/plugins/ecommerce/admin/product_attributes.html.erb

@@ -31,7 +31,7 @@
                             </div>
                         </div>
                     </div>
-                    <ul class="values_sortable">
+                    <ul class="values_sortable" style="padding: 0; list-style: none;">
                         <% (attr.values.to_a + (attr.id.present? ? [] : [Plugins::Ecommerce::Attribute.new])).each do |value| %>
                             <li class="item-custom-field product_attribute_value_<%= value.id %>">
                                 <%= hidden_field_tag "attribute[#{attr.id}][][position]", value.position, class: 'value_position' %>

data/app/views/plugins/ecommerce/admin/products/_variations.html.erb

@@ -18,7 +18,7 @@
                     <%= hidden_field_tag "product_variation[#{variation.id}][position]", variation.position, class: 'product_variation_position' %>
                     <div class="variation_attributes form-group">
                         <label><%= t('.attributes', default: 'Attributes') %></label>
-                        <ul class="item-custom-field sortable_values">
+                        <ul class="item-custom-field sortable_values" style="padding: 0; list-style: none;">
                             <% (variation.id.present? ? variation.attribute_values : [variation.attribute_values.rewhere(id: nil).new]).each do |val| %>
                                 <li>
                                     <div class="actions">
@@ -27,10 +27,10 @@
                                     </div>
                                     <div class="row group-input-fields-content">
                                         <div class="col-md-4">
-                                            <%= select_tag "product_variation[#{variation.id}][attributes][][id]", options_from_collection_for_select(current_site.product_attributes, :id, :label, val.parent_id), class: 'form-control required product_attribute_select' %>
+                                            <%= select_tag "product_variation[#{variation.id}][attributes][][id]", options_from_collection_for_select(current_site.product_attributes, :id, lambda{|i| i.label.to_s.translate }, val.parent_id), class: 'form-control required product_attribute_select' %>
                                         </div>
                                         <div class="col-md-8">
-                                            <%= select_tag "product_variation[#{variation.id}][attributes][][value]", val.id.present? ? options_from_collection_for_select(val.product_attribute.values, :id, :label, val.id) : [], class: 'form-control required product_attribute_vals_select' %>
+                                            <%= select_tag "product_variation[#{variation.id}][attributes][][value]", val.id.present? ? options_from_collection_for_select(val.product_attribute.values, :id, lambda{|i| i.label.to_s.translate }, val.id) : [], class: 'form-control required product_attribute_vals_select' %>
                                         </div>
                                     </div>
                                 </li>
@@ -69,4 +69,4 @@
         <a class="btn btn-warning add_new_variation btn-xs" href="#"><i class="fa fa-plus"></i> <%= t('.add_new_variation', default: 'Add new variation') %></a>
     </div>
 </div>
-<script>var PRODUCT_ATTRIBUTES = <%= raw current_site.product_attributes.to_json(include: :values) %></script>
+<script>var PRODUCT_ATTRIBUTES = <%= raw current_site.product_attributes.map{|item| item.label = item.label.to_s.translate; item }.to_json(include: :translated_values) %></script>

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

@@ -23,13 +23,13 @@
         <table class="table table-hover ecomerce" id="posts-table-list">
             <thead>
             <tr>
-                <th><%= t('plugin.ecommerce.product.sku') %></th>
+                <th><%= t('plugins.ecommerce.product.sku') %></th>
                 <th><%= t('camaleon_cms.admin.table.title') %></th>
                 <th><%= t('camaleon_cms.admin.table.status') %></th>
-                <th><%= t('plugin.ecommerce.product.price') %></th>
-                <th><%= t('plugin.ecommerce.product.weight') %></th>
-                <th><%= t('plugin.ecommerce.product.stock') %></th>
-                <th><%= t('plugin.ecommerce.product.qty') %></th>
+                <th><%= t('plugins.ecommerce.product.price') %></th>
+                <th><%= t('plugins.ecommerce.product.weight') %></th>
+                <th><%= t('plugins.ecommerce.product.stock') %></th>
+                <th><%= t('plugins.ecommerce.product.qty') %></th>
                 <th><%= t('camaleon_cms.admin.table.author')%></th>
                 <% if @post_type.manage_categories?  %>
                     <th><%= t('camaleon_cms.admin.table.categories')%></th>

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

@@ -1,20 +1,28 @@
 <div class="panel panel-default">
     <div class="panel-heading ui-draggable-handle">
-        <h4><span class="fa fa-cogs"></span> <%= t('plugin.ecommerce.e_commerce_settings') %></h4>
+        <h4><span class="fa fa-cogs"></span> <%= cama_t('plugins.ecommerce.e_commerce_settings') %></h4>
     </div>
-    <%= form_tag(action: :saved, :method => "post", :class => "validate-settings") do %>
+    <%= form_tag(url_for(action: :saved, :method => "post"), :class => "validate-settings", id: 'ecommerce_settings_form') do %>
         <div class="panel-body">
+            <div class="form-group col-md-4">
+                <label><%= cama_t('plugins.ecommerce.table.system_currency_unit') %></label><br>
+                <%= select_tag( "setting[current_unit]", options_for_select(e_get_all_currencies.collect{|k, x| ["#{x[:label]} (#{x[:symbol]})", k]}, e_system_currency), class: "form-control required masked_select", 'data-live-search' => true) %>
+            </div>
 
-            <div class="form-group col-md-6">
-                <label><%= t('plugin.ecommerce.table.currency_unit') %></label><br>
-                <%= select_tag( "setting[current_unit]", options_for_select(e_get_currency_units.collect{|k, x| ["#{x['name']} (#{x['symbol']})", x['code']]}, @setting[:current_unit] || 'USD'), class: "form-control required") %>
+            <div class="form-group col-md-4">
+                <label><%= cama_t('plugins.ecommerce.table.available_currencies_unit') %></label><br>
+                <%= select_tag( "setting[visitor_unit_currencies]", options_for_select(e_get_all_currencies.collect{|k, x| ["#{x[:label]} (#{x[:symbol]})", k]}, e_visitor_unit_currencies), class: "form-control required", multiple: true, 'data-live-search' => true) %>
             </div>
 
-            <div class="form-group col-md-6">
-                <label><%= t('plugin.ecommerce.table.currency_weight') %></label><br>
-                <%= select_tag( "setting[current_weight]",  options_for_select(e_get_currency_weight.collect{|k,x| ["#{x['name']} (#{x['code']})", x['code']]}, @setting[:current_weight] || 'kg'), class: "form-control required") %>
+            <div class="form-group col-md-4">
+                <label><%= cama_t('plugins.ecommerce.table.currency_weight') %></label><br>
+                <%= select_tag( "setting[current_weight]",  options_for_select(e_get_currency_weights.collect{|k,x| ["#{x} (#{k})", k]}, @setting[:current_weight] || 'kg'), class: "form-control required") %>
             </div>
 
+            <div class="form-group col-md-4">
+                <label><%= cama_t('plugins.ecommerce.table.shipping_countries') %></label><br>
+                <%= country_select :setting, :shipping_countries, {locale: I18n.locale.to_s, iso_codes: true, selected:  e_shipping_countries}, { :name => 'setting[shipping_countries][]',  class: 'form-control', multiple: true, 'data-live-search' => true, 'data-actions-box' => true } %>
+            </div>
         </div>
         <div class="panel-footer">
             <a class="btn btn-default" href="<%= url_for action: :index %>" role="back"><%= t('camaleon_cms.admin.button.back')%></a>
@@ -22,3 +30,7 @@
         </div>
     <% end %>
 </div>
+<script type="application/javascript">jQuery(function(){
+    var form = $('#ecommerce_settings_form');
+    form.find('select[multiple], .masked_select').selectpicker();
+})</script>

data/app/views/plugins/ecommerce/admin/shipping_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> <%= @shipping_method.new_record? ? t('plugin.ecommerce.new_shipping_methods') : "#{t('plugin.ecommerce.edit_shipping_methods')}: #{@shipping_method.name}" %></h4>
+        <h4><span class="fa fa-credit-card"></span> <%= @shipping_method.new_record? ? t('plugins.ecommerce.new_shipping_methods') : "#{t('plugins.ecommerce.edit_shipping_methods')}: #{@shipping_method.name}" %></h4>
     </div>
     <%= form_for @shipping_method, url:{action: @shipping_method.new_record? ? :create : :update},  html: {class: 'validate-shipping_method', id: 'form-shipping_method'}  do |f| %>
         <div class="panel-body">
             <%= render partial: 'layouts/camaleon_cms/admin/form_error', locals: {data: @shipping_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">
@@ -22,13 +22,13 @@
                options = params[:options] if params[:options].present?
             %>
             <div class="form-group">
-                <label><%= t('plugin.ecommerce.table.url_tracking') %></label><br>
+                <label><%= t('plugins.ecommerce.table.url_tracking') %></label><br>
                 <%= text_field_tag( "options[url_tracking]", options[:url_tracking], class: "form-control required") %>
-                <small><%= t('plugin.ecommerce.message.consignment_number') %></small>
+                <small><%= t('plugins.ecommerce.message.consignment_number') %></small>
             </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/shipping_methods/index.html.erb

@@ -1,18 +1,18 @@
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h4><span class="fa fa-credit-card"></span> <%= t('plugin.ecommerce.shipping_methods') %> </h4>
-        <%= link_to raw("<i class='fa fa-plus'></i> #{t('plugin.ecommerce.add_shipping_methods')}"), {action: :new}, class: "btn btn-primary pull-right" %>
+        <h4><span class="fa fa-credit-card"></span> <%= t('plugins.ecommerce.shipping_methods') %> </h4>
+        <%= link_to raw("<i class='fa fa-plus'></i> #{t('plugins.ecommerce.add_shipping_methods')}"), {action: :new}, class: "btn btn-primary pull-right" %>
     </div>
     <div class="panel-body">
 
         <table class="table">
             <thead>
             <tr>
-                <th id=""><%= t('plugin.ecommerce.table.id') %></th>
-                <th id=""><%= t('plugin.ecommerce.table.name') %></th>
-                <th id=""><%= t('plugin.ecommerce.table.status') %></th>
-                <th id=""><%= t('plugin.ecommerce.table.description') %></th>
-                <th><%= t('plugin.ecommerce.table.actions') %></th>
+                <th id=""><%= t('plugins.ecommerce.table.id') %></th>
+                <th id=""><%= t('plugins.ecommerce.table.name') %></th>
+                <th id=""><%= t('plugins.ecommerce.table.status') %></th>
+                <th id=""><%= t('plugins.ecommerce.table.description') %></th>
+                <th><%= t('plugins.ecommerce.table.actions') %></th>
             </tr>
             </thead>
             <tbody>
@@ -25,8 +25,7 @@
                     <td><%= row.status %></td>
                     <td><%= row.description  %></td>
                     <td>
-                        <%= link_to raw('<i class="fa fa-eye"></i>'), {action: :show, id: row.id }, class: "btn btn-info btn-xs", title: "#{t('camaleon_cms.admin.button.preview')}" %>
-                        <%= link_to raw('<i class="fa fa-usd"></i> ' + "#{t('plugin.ecommerce.product.price')}"), admin_plugins_ecommerce_shipping_method_prices_path(row.id), class: "btn btn-primary btn-xs" %>
+                        <%= link_to raw('<i class="fa fa-usd"></i> ' + "#{t('plugins.ecommerce.shipping_prices', default: 'Prices')}"), admin_plugins_ecommerce_shipping_method_prices_path(row.id), class: "btn btn-primary btn-xs" %>
                         <%= link_to raw('<i class="fa fa-edit"></i>'), {action: :edit, id: row.id }, class: "btn btn-default btn-xs", title: "#{t('camaleon_cms.admin.button.edit')}" %>
                     </td>
                 </tr>

data/app/views/plugins/ecommerce/admin/shipping_methods/show.html.erb

@@ -1,15 +1,15 @@
 <div class="panel panel-default">
     <div class="panel-heading">
         <h4><span class="fa fa-taxi"></span> <%= @shipping_method.name %></h4>
-        <%= link_to raw("<i class='fa fa-edit'></i> #{t('plugin.ecommerce.edit_shipping_methods')}"), {action: :edit, id: @shipping_method.id}, class: "btn btn-primary pull-right" %>
+        <%= link_to raw("<i class='fa fa-edit'></i> #{t('plugins.ecommerce.edit_shipping_methods')}"), {action: :edit, id: @shipping_method.id}, class: "btn btn-primary pull-right" %>
     </div>
     <div class="panel-body">
         <div class="row">
             <div class="col-md-6">
-                <h3><%= t('plugin.ecommerce.info') %></h3>
+                <h3><%= t('plugins.ecommerce.info') %></h3>
                 <ul class="ec-list-orders-address">
-                    <li><strong><%= t('plugin.ecommerce.table.name') %>:</strong> <span> <%= @shipping_method.name %></span></li>
-                    <li><strong><%= t('plugin.ecommerce.table.description') %>:</strong> <span> <%= @shipping_method.description %></span></li>
+                    <li><strong><%= t('plugins.ecommerce.table.name') %>:</strong> <span> <%= @shipping_method.name %></span></li>
+                    <li><strong><%= t('plugins.ecommerce.table.description') %>:</strong> <span> <%= @shipping_method.description %></span></li>
                 </ul>
             </div>
 

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

@@ -1,6 +1,6 @@
 <div class="panel panel-default">
     <div class="panel-heading ui-draggable-handle">
-        <h4><span class="fa fa-money"></span> <%= @tax_rate.new_record? ? t('plugin.ecommerce.new_tax_rate') : "#{t('plugin.ecommerce.edit_tax_rate')}: #{@tax_rate.name}" %></h4>
+        <h4><span class="fa fa-money"></span> <%= @tax_rate.new_record? ? t('plugins.ecommerce.new_tax_rate') : "#{t('plugins.ecommerce.edit_tax_rate')}: #{@tax_rate.name}" %></h4>
     </div>
     <%= form_for @tax_rate, url:{action: @tax_rate.new_record? ? :create : :update},  html: {class: 'validate-tax_rate', id: 'form-tax_rate'}  do |f| %>
         <div class="panel-body">
@@ -11,7 +11,7 @@
             </div>
             <% options = params[:options].present? ? params[:options] : @tax_rate.options rescue {} %>
             <div class="form-group">
-                <label for=""><%= t('plugin.ecommerce.table.rate') %></label> (%)<br>
+                <label for=""><%= t('plugins.ecommerce.table.rate') %></label> (%)<br>
                 <%= number_field_tag "options[rate]", options[:rate] || '', :class => "form-control required" %>
             </div>
 
@@ -19,7 +19,7 @@
 
 
             <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/tax_rates/index.html.erb

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

data/app/views/plugins/ecommerce/front/checkout/index.html.erb

@@ -4,20 +4,20 @@
 <% end %>
 <div id="cama_checkout_view" class="row checkout_view">
     <%= render plugin_view('partials/cart_widget') %>
-    <h1>Checkout Process</h1>
+    <h1><%= t('.check_out_process', default: 'Checkout Process') %></h1>
     <div class="stepwizard col-md-offset-3 col-sm-offset-3">
         <div class="stepwizard-row setup-panel">
             <div class="stepwizard-step">
                 <a href="#step-1" type="button" class="btn btn-default btn-circle" disabled="disabled">1</a>
-                <p>Step 1</p>
+                <p><%= t('.step', default: 'Step') %> 1</p>
             </div>
             <div class="stepwizard-step">
                 <a href="#step-2" type="button" class="btn btn-default btn-circle" disabled="disabled">2</a>
-                <p>Step 2</p>
+                <p><%= t('.step', default: 'Step') %> 2</p>
             </div>
             <div class="stepwizard-step">
                 <a href="#step-3" type="button" class="btn btn-default btn-circle" disabled="disabled">3</a>
-                <p>Step 3</p>
+                <p><%= t('.step', default: 'Step') %> 3</p>
             </div>
         </div>
     </div>