camaleon_ecommerce 1.1 → 1.2

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

@@ -0,0 +1,26 @@
+class Plugins::Ecommerce::OrderService
+  def initialize(site, order)
+    @site = site
+    @order = order
+  end
+  
+  attr_reader :site, :order
+  
+  def product_owners
+    owners = []
+    order.products.each do |product|
+      owners << product.owner if product.owner.present?
+    end
+    owners.uniq
+  end
+  
+  def product_files
+    files = []
+    order.products.each do |product|
+      files += product.get_fields('ecommerce_files').map do |f|
+        CamaleonCmsLocalUploader::private_file_path(f, site)
+      end
+    end
+    files.uniq
+  end
+end

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

@@ -0,0 +1,29 @@
+class Plugins::Ecommerce::ProductItemService
+  def initialize(site, product_item)
+    @site = site
+    @product_item = product_item
+  end
+
+  attr_reader :site, :product_item
+
+  def user
+    @user ||= product_item.cart.user
+  end
+
+  def product
+    @product ||= product_item.product
+  end
+
+  def decrement_qty!
+    available_qty = Plugins::Ecommerce::UserProductService.new(
+      site, user, product, product_item.variation_id).available_qty
+    val = (available_qty - product_item.qty).to_i
+    if val >= 0
+      if product_item.variation_id.present?
+        product_item.product_variation.update_column(:qty, val)
+      else
+        product.update_field_value('ecommerce_qty', val)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+class Plugins::Ecommerce::ProductService
+  def initialize(site, product, variation_id = nil)
+    @site = site
+    @product = product
+    @variation_id = variation_id
+  end
+  
+  attr_reader :site, :product, :variation_id
+  
+  def available_qty
+    if variation_id.present?
+      product.decorate.get_variation(variation_id).qty || 0
+    else
+      product.get_field_value('ecommerce_qty').to_f || 0
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+class Plugins::Ecommerce::SiteService
+  def initialize(site)
+    @site = site
+  end
+  
+  attr_reader :site
+  
+  def currency
+    site.get_meta("_setting_ecommerce", {})[:current_unit] || 'USD'
+  end
+  
+  def payment_method(type)
+    payment_method = site.payment_methods.actives.detect do |payment_method|
+      payment_method.get_option('type') == type
+    end
+    if payment_method.nil?
+      raise ArgumentError, "Payment method #{type} is not found"
+    end
+    payment_method
+  end
+end

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

@@ -0,0 +1,12 @@
+class Plugins::Ecommerce::UserCartService
+  def initialize(site, user)
+    @site = site
+    @user = user
+  end
+  
+  attr_reader :site, :user
+  
+  def get_cart
+    site.carts.set_user(user).active_cart.first_or_create(name: "Cart by #{user.id}").decorate
+  end
+end

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

@@ -0,0 +1,29 @@
+class Plugins::Ecommerce::UserProductService
+  def initialize(site, user, product, variation_id = nil)
+    @site = site
+    @user = user
+    @product = product
+    @variation_id = variation_id
+  end
+  
+  attr_reader :site, :user, :product, :variation_id
+  
+  def available_qty
+    available_qty = Plugins::Ecommerce::ProductService.new(
+      site, product, variation_id).available_qty
+    available_qty -= qty_in_carts
+  end
+  
+  private
+  
+  def qty_in_carts
+    carts = site.carts.where.not(user_id: user.id).active_cart.joins(:product_items)
+    if variation_id.present?
+      carts.where("#{Plugins::Ecommerce::ProductItemDecorator.table_name}" =>
+        {variation_id: variation_id}).sum("#{Plugins::Ecommerce::ProductItem.table_name}.qty")
+    else
+      carts.where("#{Plugins::Ecommerce::ProductItemDecorator.table_name}" =>
+        {product_id: product.id}).sum("#{Plugins::Ecommerce::ProductItem.table_name}.qty")
+    end
+  end
+end

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

@@ -0,0 +1,5 @@
+class Plugins::Ecommerce::UtilService
+  def self.ecommerce_money_to_cents(money)
+    (money*100).round
+  end
+end

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

@@ -1,20 +1,32 @@
 <div class="panel panel-default">
-  <div class="panel-heading">
-    <h4><span class="fa fa-cog"></span> <%= t('plugin.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')  %>
-            <%= text_field_tag 'metas[consignment_number]', @order.get_meta('consignment_number'), class: 'form-control' %>
+    <div class="panel-heading">
+        <h4><span class="fa fa-cog"></span> <%= t('plugin.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') %>
+                <%= text_field_tag 'metas[consignment_number]', @order.get_meta('consignment_number'), class: 'form-control' %>
+            </div>
+            <div class="form-group">
+                <%= f.label nil, t('plugins.ecommerce.front.orders.show.date_shipped', default: 'Date Shipped') %>
+                <div class="input-group date date-input-box">
+                    <%= f.text_field :shipped_at, class: 'form-control' %>
+                    <span class="add-on input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
+                </div>
+            </div>
         </div>
-      </div>
 
-      <div class="panel-footer">
-        <button class="btn btn-default" onclick="history.back()"><%= t('camaleon_cms.admin.button.back') %></button>
-        <button class="btn btn-primary pull-right"><%= t('camaleon_cms.admin.button.update') %></button>
-      </div>
-  <% end %>
+        <div class="panel-footer">
+            <button class="btn btn-default" onclick="history.back()"><%= t('camaleon_cms.admin.button.back') %></button>
+            <button class="btn btn-primary pull-right"><%= t('camaleon_cms.admin.button.update') %></button>
+        </div>
+        <script>
+            jQuery(function () {
+                $('#form-order').find('#plugins_ecommerce_order_shipped_at').parent().datetimepicker({ format: 'YYYY-MM-DD HH:mm' });;
+            })
+        </script>
+    <% end %>
 </div>

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

@@ -88,7 +88,13 @@
             %>
                 <tr>
                     <td><%= order.slug %></td>
-                    <td><%= order.user.fullname %></td>
+                    <td>
+                      <% if order.user %>
+                        <%= order.user.fullname %>
+                      <% else %>
+                        <small>(No user)</small>
+                      <% end %>
+                    </td>
                     <td><%= raw order.the_status %></td>
                     <td><%= order.paid? ? 'Yes' : 'No' %></td>
                     <td>

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

@@ -30,9 +30,11 @@
                 <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] == 'credit_card' %>"><a href="#tab7" data-toggle="tab"><%= t('plugin.ecommerce.by_credit_card') %></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>
+                    <% 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 %>
                 </ul>
                 <div class="panel-body tab-content">
 
@@ -115,6 +117,14 @@
                             <%= text_field_tag('options[stripe_key]', options[:stripe_key], class: 'form-control required') %>
                         </div>
                     </div>
+
+                    <% ecommerce_custom_payment_methods.each do |k, obj| %>
+                        <div class="tab-pane <%= 'active' if options[:type] == k %>" id="tab_<%= k %>">
+                            <%= hidden_field_tag('options[type]', k) %>
+                            <%= render obj[:settings_view_path], options: options %>
+                        </div>
+                    <% end %>
+
                 </div>
             </div>
 

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

@@ -0,0 +1,95 @@
+<%= form_tag url_for(action: :save_product_attributes), class: 'panel panel-default', id: 'ecommerce_product_attributes', 'data-confirm-msg' => t('.confirm_delete', default: 'Are you sure to delete?') do %>
+    <div class="panel-heading ui-draggable-handle">
+        <h3 class="panel-title"><%= t('.title', default: 'Product Attributes') %></h3>
+    </div>
+    <div class="panel-body">
+        <% (current_site.product_attributes.to_a + [Plugins::Ecommerce::Attribute.new]).each_with_index do |attr, index| %>
+            <div data-id="<%= attr.id %>" class="panel panel-info attribute_group attribute_<%= attr.id %> <%= 'hidden' unless attr.id.present? %>">
+                <div class="panel-heading">
+                    <h3 class="panel-title">&nbsp;</h3>
+                    <ul class="panel-controls">
+                        <li><a href="#" class="del_group"><i class="fa fa-times"></i></a></li>
+                        <li><a class="hidden group_sorter"><i class="fa fa-arrows" style="cursor: move"></i></a></li>
+                        <li><a class="panel-collapse" href="#"><span class="fa fa-angle-down"></span></a></li>
+                    </ul>
+                </div>
+                <div class="panel-body">
+                    <div class="form-group">
+                        <label><%= t('.group_label', default: 'Group Label') %></label>
+                        <%= text_field_tag "attribute_names[#{attr.id}][label]", attr.label, class: 'form-control translatable required' %>
+                    </div>
+                    <label><%= t('.values', default: 'Values') %></label>
+                    <hr>
+                    <div class="item-custom-field">
+                        <div class="actions"></div>
+                        <div class="row group-input-fields-content">
+                            <div class="col-md-4">
+                                <label><%= t('.code', default: 'Code') %></label><em class="text-danger">*</em><br>
+                            </div>
+                            <div class="col-md-8">
+                                <label><%= t('.value', default: 'Value') %></label><em class="text-danger">*</em><br>
+                            </div>
+                        </div>
+                    </div>
+                    <ul class="values_sortable">
+                        <% (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' %>
+                                <%= hidden_field_tag "attribute[#{attr.id}][][id]", value.id %>
+                                <div class="actions">
+                                    <i style="cursor: move" class="fa fa-arrows values_sorter"></i>
+                                    <a href="#" class="del"><i class="fa fa-times"></i></a>
+                                </div>
+                                <div class="group-input-fields-content row">
+                                    <div class="col-md-4">
+                                        <%= text_field_tag "attribute[#{attr.id}][][key]", value.key, class: 'form-control slug required', "data-parent" => "category_name", style: "#{'margin-top: 47px;' if current_site.get_languages.count > 1 }" %>
+                                    </div>
+                                    <div class="col-md-8">
+                                        <%= text_field_tag "attribute[#{attr.id}][][value]", value.label, class: 'form-control required translatable' %>
+                                    </div>
+                                </div>
+                            </li>
+                        <% end %>
+                    </ul>
+                    <div> <a href="#" class="btn btn-warning btn-xs add_new_value"> <i class="fa fa-plus"></i> <%= t('.add_new_value', default: 'Add new value') %></a></div>
+                </div>
+            </div>
+        <% end %>
+
+    </div>
+    <div class="panel-footer text-right">
+        <a class="btn btn-default pull-left" href="<%= url_for action: :index %>" role="back"><%= t('camaleon_cms.admin.button.back', default: 'Back')%></a>
+        <a class="btn btn-default add_new_group"><%= t('.add_attr_group', default: 'Add new group')%></a>
+        <button class="btn btn-primary" type="submit"><%= t('camaleon_cms.admin.button.submit', default: 'Save')%></button>
+    </div>
+<% end %>
+<script>
+    jQuery(function(){
+        var groups_counter = 1;
+        var panel = $('#ecommerce_product_attributes');
+        var val_cache = panel.find('.product_attribute_value_').remove().clone();
+        var p_cache = panel.find('.panel.attribute_').remove().clone().removeClass('hidden');
+        var after_reorder = function(){ $(this).children().each(function(index){ $(this).find('input.value_position').val(index); }) }
+        panel.find('.add_new_group').click(function(){
+            var g = p_cache.clone().attr('data-id', 'new_'+groups_counter);
+            panel.children('.panel-body').append(g);
+            g.find('input').each(function(){ $(this).attr('name', $(this).attr('name').replace('[]', '['+g.attr('data-id')+']')) });
+            g.find('.translatable').Translatable();
+            g.find('.add_new_value').click();
+            g.find('.values_sortable').sortable({handle: '.values_sorter', update: after_reorder})
+            return false;
+        });
+
+        panel.on('click', '.add_new_value', function(){
+            var g = $(this).closest('.attribute_group');
+            var clone = val_cache.clone();
+            clone.find('input').each(function(){ $(this).attr('name', $(this).attr('name').replace('[]', '['+g.attr('data-id')+']')) });
+            clone.find('.translatable').Translatable();
+            g.find('.panel-body > ul').append(clone);
+            return false;
+        });
+        panel.find('.values_sortable').sortable({handle: '.values_sorter', update: after_reorder})
+        panel.on('click', '.item-custom-field a.del', function(){ if(!confirm(panel.attr('data-confirm-msg'))) return false; $(this).closest('li').fadeOut('slow', function(){ $(this).remove(); }); return false; });
+        panel.on('click', 'a.del_group', function(){ if(!confirm(panel.attr('data-confirm-msg'))) return false; $(this).closest('.attribute_group').fadeOut('slow', function(){ $(this).remove(); }); return false; });
+    });
+</script>

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

@@ -0,0 +1,72 @@
+<% field = post_type.get_field_object('ecommerce_photos') %>
+<div class="panel panel-default hidden" id="product_variations" data-confirm-msg="<%= t('.confirm_del', default: 'Are you sure to delete this variation?') %>">
+    <div class="panel-heading ">
+        <h3 class="panel-title"><%= t('.title', default: 'Product Variations') %></h3>
+    </div>
+    <div class="panel-body variations_sortable">
+        <% (product.product_variations.to_a + [Plugins::Ecommerce::ProductVariation.new]).each do |variation| %>
+            <div class="panel panel-info product_variation <%= 'blank_product_variation hidden' unless variation.id.present? %>" data-id="<%= variation.id %>">
+                <div class="panel-heading">
+                    <h3 class="panel-title">&nbsp;</h3>
+                    <ul class="panel-controls">
+                        <li><a class="var_del" href="#"><i class="fa fa-times text-danger"></i></a></li>
+                        <li><a class="variation_sorter"><i class="fa fa-arrows" style="cursor: move"></i></a></li>
+                        <li><a class="panel-collapse" href="#"><span class="fa fa-angle-down"></span></a></li>
+                    </ul>
+                </div>
+                <div class="panel-body">
+                    <%= 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">
+                            <% (variation.id.present? ? variation.attribute_values : [variation.attribute_values.rewhere(id: nil).new]).each do |val| %>
+                                <li>
+                                    <div class="actions">
+                                        <a class="val_sorter"><i class="fa fa-arrows" style="cursor: move"></i></a>
+                                        <a href="#" class="val_del "><i class="fa fa-times text-danger"></i></a>
+                                    </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' %>
+                                        </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' %>
+                                        </div>
+                                    </div>
+                                </li>
+                            <% end %>
+                        </ul>
+                        <div> <a href="#" class="btn btn-warning btn-xs add_new_value"> <i class="fa fa-plus"></i> <%= t('.add_new_value', default: 'Add new value') %></a></div>
+                    </div>
+                    <div class="form-group">
+                        <label><%= t('.photo', default: 'Photo') %></label><em class="text-danger">*</em><br>
+                        <div class=" input-group">
+                            <%= url_field_tag "product_variation[#{variation.id}][photo]", variation.photo, data:{dimension: field.options[:dimension], versions: field.options[:versions], thumb_size: field.options[:thumb_size]}, class: 'data-error-place-parent form-control required' %>
+                            <a href="#" class="input-group-addon product_variation_photo_link"><i class="fa fa-upload"></i> <%= t('camaleon_cms.admin.button.upload_image', default: 'Upload Photo')%> <%= "(#{field.get_option('dimension')})" if field.get_option('dimension').present? %></a>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label><%= t('.sku', default: 'SKU') %></label><em class="text-danger">*</em><br>
+                        <%= text_field_tag "product_variation[#{variation.id}][sku]", variation.sku, class: 'form-control required' %>
+                    </div>
+                    <div class="form-group">
+                            <label><%= t('.price', default: 'Price') %></label><em class="text-danger">*</em><br>
+                        <%= number_field_tag "product_variation[#{variation.id}][price]", variation.amount, class: 'form-control required number' %>
+                    </div>
+                    <div class="form-group">
+                        <label><%= t('.weight', default: 'Weight') %></label><em class="text-danger">*</em><br>
+                        <%= number_field_tag "product_variation[#{variation.id}][weight]", variation.weight, class: 'form-control required number' %>
+                    </div>
+                    <div class="form-group">
+                        <label><%= t('.qty', default: 'Quantity') %></label>
+                        <%= number_field_tag "product_variation[#{variation.id}][qty]", variation.qty, class: 'form-control number' %>
+                    </div>
+                </div>
+            </div>
+        <% end %>
+    </div>
+    <div class="panel-footer text-right">
+        <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>

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

@@ -16,16 +16,16 @@
           <tbody>
           <% @products.each do |item| product = item.product.decorate %>
               <tr>
-                  <td><a href="<%= product.the_url %>"><%= product.the_title %></a></td>
+                  <td><a href="<%= product.the_url %>"><%= product.the_variation_title(item.variation_id) %></a></td>
                   <td><%= item.the_price %></td>
-                  <td><%= product.the_tax %></td>
+                  <td><%= item.the_tax %></td>
                   <td>
-                      <input name="products[][product_id]" type="hidden" value="<%= product.id %>"/>
-                      <input class="text-qty" type="number" name="products[][qty]" value="<%= item.qty %>">
+                      <input name="product_items[][item_id]" type="hidden" value="<%= item.id %>"/>
+                      <input class="text-qty" type="number" name="product_items[][qty]" value="<%= item.qty %>">
                   </td>
                   <td><%= item.the_sub_total %></td>
                   <td>
-                      <a rel="nofollow" data-method="delete" href="<%= plugins_ecommerce_checkout_cart_remove_path(product_id: product.id) %>"><%= t('.delete', default: 'Remove') %></a>
+                      <a rel="nofollow" data-method="delete" href="<%= plugins_ecommerce_checkout_cart_remove_path(product_item_id: item.id) %>"><%= t('.delete', default: 'Remove') %></a>
                   </td>
               </tr>
           <% end %>

data/app/views/plugins/ecommerce/front/orders/show.html.erb

@@ -1,17 +1,20 @@
 <% order ||= @order %>
 <div class="order_details">
-  <% unless defined?(as_partial) %>
-    <h1><%= t('.title', default: 'Order Details') %>: <%= order.slug %></h1>
-  <% end %>
-  <div class="row">
-        <div class="col-md-6">
-            <h4><%= t('.customer_info', default: 'Customer Info') %></h4>
-            <ul class="ec-list-orders-address">
-              <li><strong><%= t('.name', default: 'Name') %>:</strong> <span> <%= order.user.fullname %></span></li>
-              <li><strong><%= t('.email', default: 'Email') %>:</strong> <span> <%= order.user.email %></span></li>
-              <li><strong><%= t('.phone', default: 'Phone') %>:</strong> <span> <%= order.user.get_option('phone') %></span></li>
-            </ul>
+    <% unless defined?(as_partial) %>
+        <h1><%= t('.title', default: 'Order Details') %>: <%= order.slug %></h1>
+    <% end %>
+    <div>
+        <h4><%= t('.customer_info', default: 'Customer Info') %></h4>
+        <ul class="ec-list-orders-address">
+            <li><strong><%= t('.name', default: 'Name') %>:</strong> <span> <%= order.user.fullname %></span></li>
+            <li><strong><%= t('.email', default: 'Email') %>:</strong> <span> <%= order.user.email %></span></li>
+            <li><strong><%= t('.phone', default: 'Phone') %>:</strong>
+                <span> <%= order.user.get_option('phone') %></span></li>
+        </ul>
+    </div>
 
+    <div class="row">
+        <div class="col-md-6">
             <h4><%= t('.billing_address', default: 'Billing Address') %></h4>
             <% detail = order.get_meta("billing_address", {}) %>
             <ul class="ec-list-orders-address">
@@ -21,11 +24,13 @@
                 <li><strong><%= t('.state', default: 'State') %>:</strong> <%= detail[:state] %></li>
                 <li><strong><%= t('.zip_code', default: 'Zip code') %>:</strong> <%= detail[:zip] %></li>
                 <li><strong><%= t('.country', default: 'Country') %>:</strong> <%= detail[:country] %></li>
+                <li><strong><%= t('.phone_number', default: 'Phone Number') %>:</strong> <%= detail[:phone_number] %>
+                </li>
             </ul>
         </div>
         <div class="col-md-6">
-          <h4><%= t('.shipping_address', default: 'Shipping Address') %></h4>
-          <% detail = order.get_meta("shipping_address", {}) %>
+            <h4><%= t('.shipping_address', default: 'Shipping Address') %></h4>
+            <% detail = order.get_meta("shipping_address", {}) %>
             <ul class="ec-list-orders-address">
                 <li><strong><%= t('.address', default: 'Address1') %>:</strong> <%= detail[:address1] %></li>
                 <li><strong><%= t('.address', default: 'Address') %>2:</strong> <%= detail[:address2] %></li>
@@ -33,98 +38,100 @@
                 <li><strong><%= t('.state', default: 'State') %>:</strong> <%= detail[:state] %></li>
                 <li><strong><%= t('.zip_code', default: 'Zip code') %>:</strong> <%= detail[:zip] %></li>
                 <li><strong><%= t('.country', default: 'Country') %>:</strong> <%= detail[:country] %></li>
+                <li><strong><%= t('.phone_number', default: 'Phone Number') %>:</strong> <%= detail[:phone_number] %>
+                </li>
             </ul>
         </div>
-  </div>
+    </div>
 
-  <div class="row">
-    <div class="col-md-12">
-      <h4><%= t('.title_products', default: 'Products and Payments') %></h4>
-        <div id="totals_section">
-            <table class="table table-bordered">
-                <tbody>
-                <tr>
-                    <th id="quantity_col"><%= t('.qty', default: 'Quantity') %></th>
-                    <th id="item_col"><%= t('.item', default: 'Item') %></th>
-                    <th id="price_col"><%= t('.price', default: 'Price') %></th>
+    <div class="row">
+        <div class="col-md-12">
+            <h4><%= t('.title_products', default: 'Products and Payments') %></h4>
+            <div id="totals_section">
+                <table class="table table-bordered">
+                    <tbody>
+                    <tr>
+                        <th id="quantity_col"><%= t('.qty', default: 'Quantity') %></th>
+                        <th id="item_col"><%= t('.item', default: 'Item') %></th>
+                        <th id="price_col"><%= t('.price', default: 'Price') %></th>
 
-                    <th id="tax_col"><%= t('.tax', default: 'Tax') %></th>
-                    <th id="subtotal_col"><%= t('.subtotal', default: 'Sub Total') %></th>
-                </tr>
-                <% order.product_items.each do |item| %>
+                        <th id="tax_col"><%= t('.tax', default: 'Tax') %></th>
+                        <th id="subtotal_col"><%= t('.subtotal', default: 'Sub Total') %></th>
+                    </tr>
+                    <% order.product_items.each do |item| %>
+                        <tr>
+                            <td><%= item.qty %></td>
+                            <td><%= link_to(item.cache_the_title, item.product.try(:decorate).try(:the_url)) %></td>
+                            <td><%= item.cache_the_price %></td>
+                            <td><%= item.cache_the_tax %></td>
+                            <td><%= item.cache_the_sub_total %></td>
+                        </tr>
+                    <% end %>
                     <tr>
-                        <td><%= item.qty %></td>
-                        <td><%= item.cache_the_title %></td>
-                        <td><%= item.cache_the_price %></td>
-                        <td><%= item.cache_the_tax %></td>
-                        <td><%= item.cache_the_sub_total %></td>
+                        <td colspan="2"></td>
+                        <td colspan="2" class="text-right"><%= t('.total_excl', default: 'Total (excluding Tax)') %> </td>
+                        <td><%= order.cache_the_sub_total %></td>
                     </tr>
-                <% end %>
-                <tr>
-                    <td colspan="2"></td>
-                    <td colspan="2" class="text-right"><%= t('.total_excl', default: 'Total (excluding Tax)') %> </td>
-                    <td><%= order.cache_the_sub_total %></td>
-                </tr>
+                    <tr>
+                        <td colspan="2"></td>
+                        <td colspan="2" class="text-right"><%= t('.tax', default: 'Tax') %></td>
+                        <td id="tax_total"><%= order.cache_the_tax %></td>
+                    </tr>
+                    <tr>
+                        <td colspan="2"></td>
+                        <td colspan="2" class="text-right"><%= t('.discount', default: 'Discount') %></td>
+                        <td><%= order.cache_the_discounts %></td>
+                    </tr>
+                    <tr>
+                        <td colspan="2"></td>
+                        <td colspan="2" class="text-right"><%= t('.total_shipping', default: 'Total shipping') %></td>
+                        <td><%= order.cache_the_shipping %></td>
+                    </tr>
+                    <tr>
+                        <td colspan="2"></td>
+                        <td colspan="2" class="text-right"><%= t('.total_price', default: 'Total Price') %></td>
+                        <td><%= order.cache_the_total %></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+
+            <table class="table table-bordered">
+                <tbody>
                 <tr>
-                    <td colspan="2"></td>
-                    <td colspan="2" class="text-right"><%= t('.tax', default: 'Tax') %></td>
-                    <td id="tax_total"><%= order.cache_the_tax %></td>
+                    <th><%= t('.payment_type', default: 'Type Payment') %></th>
+                    <th></th>
                 </tr>
                 <tr>
-                    <td colspan="2"></td>
-                    <td colspan="2" class="text-right"><%= t('.discount', default: 'Discount') %></td>
-                    <td><%= order.cache_the_discounts %></td>
+                    <td><%= order.payment_method.name rescue 'Not Payment' %></td>
+                    <td><%= raw order.the_status %></td>
                 </tr>
+                <% if defined?(as_partial) %>
+                    <tr>
+                        <td>
+                            <%= raw order.get_meta('payment_data', {}).map { |k, v| "<b>#{k.to_s.titleize}</b>: #{v}" }.join('<br>') %>
+                        </td>
+                    </tr>
+                <% end %>
+                </tbody>
+            </table>
+
+            <table class="table table-bordered">
+                <tbody>
                 <tr>
-                    <td colspan="2"></td>
-                    <td colspan="2" class="text-right"><%= t('.total_shipping', default: 'Total shipping') %></td>
-                    <td><%= order.cache_the_shipping %></td>
+                    <th><%= t('.shipping_method', default: 'Shipping Method') %></th>
+                    <th><%= t('.date_shipped', default: 'Shipped Date') %></th>
+                    <th><%= t('.track_url', default: 'URL Tracking') %></th>
                 </tr>
                 <tr>
-                    <td colspan="2"></td>
-                    <td colspan="2" class="text-right"><%= t('.total_price', default: 'Total Price') %></td>
-                    <td><%= order.cache_the_total %></td>
+                    <td><%= order.shipping_method.name rescue t('.no_shipping', default: 'Not Shipped Assigned') %></td>
+                    <td><%= order.shipped_at.presence || t('.no_shipped', default: 'Not Shipped') %></td>
+                    <td><%= order.the_url_tracking %></td>
                 </tr>
                 </tbody>
             </table>
+            <div class="text-center">
+            </div>
         </div>
-
-      <table class="table table-bordered">
-        <tbody>
-        <tr>
-          <th><%= t('.payment_type', default: 'Type Payment') %></th>
-          <th></th>
-        </tr>
-        <tr>
-          <td><%= order.payment_method.name  rescue 'Not Payment' %></td>
-          <td><%= raw order.the_status %></td>
-        </tr>
-        <% if defined?(as_partial) %>
-            <tr>
-                <td>
-                    <%= raw order.get_meta('payment_data', {}).map{|k, v| "<b>#{k.to_s.titleize}</b>: #{v}" }.join('<br>') %>
-                </td>
-            </tr>
-        <% end %>
-        </tbody>
-      </table>
-
-      <table class="table table-bordered">
-        <tbody>
-        <tr>
-          <th><%= t('.shipping_method', default: 'Shipping Method') %></th>
-          <th><%= t('.date_shipped', default: 'Shipped Date') %></th>
-          <th><%= t('.track_url', default: 'URL Tracking') %></th>
-        </tr>
-        <tr>
-          <td><%= order.shipping_method.name rescue t('.no_shipping', default: 'Not Shipped Assigned') %></td>
-          <td><%= order.shipped_at.presence || t('.no_shipped', default: 'Not Shipped') %></td>
-          <td><%= order.the_url_tracking %></td>
-        </tr>
-         </tbody>
-      </table>
-      <div class="text-center">
-      </div>
     </div>
-  </div>
 </div>