camaleon_ecommerce 1.2 → 1.2.1

data/app/views/plugins/ecommerce/front/login.html.erb

@@ -1,5 +1,5 @@
 <div class="container" id="ecommerce_login_panel">
-    <%= render 'camaleon_cms/flash_messages' %>
+    <%= render 'camaleon_cms/flash_messages', locals:{ flash: (flash[:cama_ecommerce] || {}).with_indifferent_access } %>
     <div class="row">
         <div class="col-md-6 col-md-offset-3">
             <ul class="nav nav-tabs" role="tablist">
@@ -10,10 +10,10 @@
                 <%= form_tag plugins_ecommerce_login_path, id: 'login-form', class: 'tab-pane active', role: 'tabpanel' do %>
                     <%= hidden_field_tag :kind_form, 'login-form' %>
                     <div class="form-group">
-                        <input type="text" name="username" id="username" tabindex="1" class="form-control required" placeholder="<%= t('.username', default: 'Username') %>" value="">
+                        <input type="text" name="email" tabindex="1" class="form-control required" placeholder="<%= t('.email', default: 'Email') %>" value="<%= params[:email] %>">
                     </div>
                     <div class="form-group">
-                        <input type="password" name="password" id="password" tabindex="2" class="form-control required" placeholder="<%= t('.password', default: 'Password') %>">
+                        <input type="password" name="password" tabindex="2" class="form-control required" placeholder="<%= t('.password', default: 'Password') %>">
                     </div>
                     <div class="form-group">
                         <%= button_tag t('.login', default: 'Login'), class: 'btn btn-default col-md-3', type: 'submit' %>
@@ -28,9 +28,6 @@
                     <div class="form-group">
                         <%= f.text_field :first_name, class: 'form-control required', tabindex: 1, placeholder: t('.full_name', default: 'Full Name') %>
                     </div>
-                    <div class="form-group">
-                        <%= f.text_field :username, class: 'form-control required', tabindex: 2, placeholder: t('.username', default: 'User name') %>
-                    </div>
                     <div class="form-group">
                         <%= f.text_field :email, class: 'form-control email required', tabindex: 3, placeholder: t('.email', default: 'Email address') %>
                     </div>

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

@@ -1,8 +1,14 @@
 <% order ||= @order %>
 <div class="order_details">
     <% unless defined?(as_partial) %>
+        <%= raw ecommerce_draw_breadcrumb %>
         <h1><%= t('.title', default: 'Order Details') %>: <%= order.slug %></h1>
     <% end %>
+    <div class="basic_info">
+        <% if order.received_at.present? %><b><%= t('.received_at', default: 'Received At') %>: </b> <%= order.received_at %><br> <% end %>
+        <b><%= t('.created_at', default: 'Created At') %>: </b> <%= order.created_at %><br>
+        <% if order.shipped_at.present? %><b><%= t('.shipped_at', default: 'Shipped At') %>: </b> <%= order.shipped_at %><br> <% end %>
+    </div>
     <div>
         <h4><%= t('.customer_info', default: 'Customer Info') %></h4>
         <ul class="ec-list-orders-address">
@@ -109,7 +115,7 @@
                 <% if defined?(as_partial) %>
                     <tr>
                         <td>
-                            <%= raw order.get_meta('payment_data', {}).map { |k, v| "<b>#{k.to_s.titleize}</b>: #{v}" }.join('<br>') %>
+                            <%= raw (order.get_meta('payment_data') || {}).map { |k, v| "<b>#{k.to_s.titleize}</b>: #{v}" }.join('<br>') %>
                         </td>
                     </tr>
                 <% end %>

data/app/views/plugins/ecommerce/partials/_cart_widget.html.erb

@@ -1,38 +1,23 @@
 <div class="row" style="min-height: 64px">
     <div class="col-md-9">
-        <ol class="breadcrumb" style="margin: 0;">
-            <% @ecommerce_breadcrumb.each_with_index do |m, index| %>
-                <% if m[1].present? %>
-                    <li class="<%= "active" if @ecommerce_breadcrumb.size == index+1 %>">
-                        <a href="<%= m[1] %>"><%= m[0] %></a></li>
-                <% else %>
-                    <li class="<%= "active" if @ecommerce_breadcrumb.size == index+1 %>"><span><%= m[0] %></span></li>
-                <% end %>
-            <% end %>
-        </ol>
+        <%= raw ecommerce_draw_breadcrumb %>
     </div>
 
     <div class="col-md-3">
-        <% if signin? %>
-            <div class="well shopping_cart_box">
-                <% @cart ||= current_site.carts.set_user(current_user).first_or_create(name: "Cart by #{current_user.id}").decorate %>
-                <h4><%= t('.shopping_cart', default: 'Shopping Cart') %></h4>
-                <p><%= t('.total_items', default: '(%{qty}) items', qty: @cart.items_total) %>, <%= t('.total', default: 'Total') %>: <%= @cart.the_total_amount %></p>
-                <span>
-                    <a href="<%= @ecommerce_post_type.the_url %>" class="btn btn-default btn-xs"><%= t('.products_list', default: 'Products list') %></a>
-                    <% if (@cart.items_total > 0) %>
-                        <a href="<%= plugins_ecommerce_checkout_cart_path %>" class="btn btn-warning btn-xs"><%= t('.purchase', default: 'Purchase') %></a>
-                    <% end %>
-                    <a href="<%= plugins_ecommerce_orders_path %>" class="btn btn-success btn-xs"><%= t('.my_orders', default: 'My Orders') %></a>
-                </span>
-            </div>
-        <% else %>
-            <div class=" text-right">
-                <a href="<%= @ecommerce_post_type.the_url %>" class="btn btn-default"><%= t('.products_list', default: 'Products list') %></a>
-            </div>
-        <% end %>
+        <div class="well shopping_cart_box">
+            <% @cart ||= e_current_cart %>
+            <h4><%= t('.shopping_cart', default: 'Shopping Cart') %></h4>
+            <p><%= t('.total_items', default: '(%{qty}) items', qty: @cart.items_total) %>, <%= t('.total', default: 'Total') %>: <%= @cart.the_total_amount %></p>
+            <span>
+                <a href="<%= cama_ecommerce_post_type.the_url %>" class="btn btn-default btn-xs"><%= t('.products_list', default: 'Products list') %></a>
+                <% if (@cart.items_total > 0) %>
+                    <a href="<%= plugins_ecommerce_checkout_cart_path %>" class="btn btn-warning btn-xs"><%= t('.purchase', default: 'Purchase') %></a>
+                <% end %>
+                <a href="<%= plugins_ecommerce_orders_path %>" class="btn btn-success btn-xs"><%= t('.my_orders', default: 'My Orders') %></a>
+            </span>
+        </div>
     </div>
 </div>
 <div class="clearfix">
-    <%= render partial: "/camaleon_cms/flash_messages.html.erb" %>
+    <%= render partial: "/camaleon_cms/flash_messages.html.erb", locals:{ flash: (flash[:cama_ecommerce] || {}).with_indifferent_access} %>
 </div>

data/app/views/plugins/ecommerce/partials/checkout/_details.html.erb

@@ -18,7 +18,7 @@
                 <h3><%= t('.shipping_options', default: 'Shipping Options') %></h3>
                 <div class="form-group">
                     <select class="form-control required" name="shipping_method" id="shipping_methods" >
-                        <% current_site.shipping_methods.each do |m| price = m.get_price_from_weight(@cart.weight_total); the_price = "#{current_site.current_unit}#{price}" %>
+                        <% current_site.shipping_methods.each do |m| price = m.get_price_from_weight(@cart.weight_total); the_price = e_parse_price(price) %>
                             <option value="<%= m.id %>" <%= 'selected' if @cart.shipping_method_id == m.id %> data-price="<%= price %>"><%= m.name %> (<%= the_price %>)</option>
                         <% end %>
                     </select>

data/app/views/plugins/ecommerce/partials/checkout/_payments.html.erb

@@ -4,17 +4,8 @@
     </div>
 <% else %>
     <div id="e-payments-types" role="tabpanel">
-        <ul class="nav nav-tabs nav-justified" role="tablist">
+        <div class="panel-group" id="e_accordion_payments" role="tablist" aria-multiselectable="true">
             <% (payment_methods = current_site.payment_methods.actives.all).each_with_index do |payment, index| %>
-                <li role="presentation" class="<%= "active" if index == 0 %>">
-                    <a href="#<%= payment.slug %>" aria-controls="<%= payment.slug %>" role="tab" data-toggle="tab"><%= t(".#{payment.options[:type]}", default: payment.options[:type].titleize) %></a>
-                </li>
-            <% end %>
-        </ul>
-
-        <!-- Tab panes -->
-        <div class="tab-content">
-            <% payment_methods.each_with_index do |payment, index| %>
                 <% inputs = content_tag :div do %>
                     <input type="hidden" name="payment[payment_id]" value="<%= payment.id %>">
                     <input type="hidden" name="payment[type]" value="<%= payment.options[:type] %>">
@@ -22,103 +13,113 @@
                         <button class="btn btn-primary col-md-4" type="submit"><i class="fa fa-money"></i> <%= t('.order_now', default: 'Buy') %></button>
                     </div>
                 <% end %>
-
-                <div role="tabpanel" class="tab-pane <%= "active" if index == 0 %>" id="<%= payment.slug %>">
-                    <p><%= payment.description.translate %></p>
-                    <% if payment.options[:type] == 'paypal' %>
-                        <div class="type-paypal">
-                            <img src="https://www.paypalobjects.com/webstatic/mktg/logo/bdg_payments_by_pp_2line.png" alt="Buy now with PayPal"/>
-                            <%= form_tag(plugins_ecommerce_checkout_pay_by_paypal_path(order: @cart.slug), :method => "post") do %>
-                                <%= inputs %>
+                <div class="panel panel-default">
+                    <div class="panel-heading" role="tab" id="heading<%= payment.slug %>">
+                        <a role="button" data-toggle="collapse" data-parent="#e_accordion_payments" href="#<%= payment.slug %>" aria-expanded="true" aria-controls="collapseOne"><%= t(".#{payment.options[:type]}", default: payment.options[:type].titleize) %></a>
+                    </div>
+                    <div id="<%= payment.slug %>" class="panel-collapse collapse <%= "in" if index == 0 %>" role="tabpanel" aria-labelledby="heading<%= payment.slug %>">
+                        <div class="panel-body">
+                            <p><%= payment.description.translate %></p>
+                            <% if payment.options[:type] == 'paypal' %>
+                                <div class="type-paypal">
+                                    <img src="https://www.paypalobjects.com/webstatic/mktg/logo/bdg_payments_by_pp_2line.png" alt="Buy now with PayPal"/>
+                                    <%= form_tag(plugins_ecommerce_checkout_pay_by_paypal_path(order: @cart.slug), :method => "post") do %>
+                                        <%= inputs %>
+                                    <% end %>
+                                </div>
                             <% end %>
-                        </div>
-                    <% end %>
 
-                    <% if payment.options[:type] == 'bank_transfer' %>
-                        <%= form_tag(plugins_ecommerce_checkout_pay_by_bank_transfer_path(order: @cart.slug), :method => "post") do %>
-                            <ul class="ec-list-orders-address">
-                                <li><strong><%= t('.account_number', default: 'Account Number') %>: </strong><span> <%= payment.options[:bank_transfer_number_account] %></span></li>
-                                <li><strong><%= t('.details_transfer', default: 'Details') %>: </strong><span> <%= payment.options[:bank_transfer_detail] %></span></li>
-                            </ul>
-                            <div class="form-group">
-                                <label><%= t('.bank_name', default: 'Bank name') %></label>
-                                <input class="form-control required" type="text" name="details[bank_name]">
-                            </div>
-                            <div class="form-group">
-                                <label><%= t('.bank_owner', default: 'Owner name of bank account') %></label>
-                                <input class="form-control required" type="text" name="details[owner_name]">
-                            </div>
-                            <div class="form-group">
-                                <label><%= t('.cod_key', default: 'CODE / ID / KEY / TICKET') %></label>
-                                <input class="form-control required" type="text" name="details[code]">
-                            </div>
-                            <div class="form-group">
-                                <label><%= t('.descr', default: 'Description') %></label>
-                                <textarea name="details[description]" rows="4" class="form-control required" ></textarea>
-                            </div>
-                            <%= inputs %>
-                        <% end %>
-                    <% end %>
+                            <% if payment.options[:type] == 'bank_transfer' %>
+                                <%= form_tag(plugins_ecommerce_checkout_pay_by_bank_transfer_path(order: @cart.slug), :method => "post") do %>
+                                    <ul class="ec-list-orders-address">
+                                        <li><strong><%= t('.account_number', default: 'Account Number') %>: </strong><span> <%= payment.options[:bank_transfer_number_account] %></span></li>
+                                        <li><strong><%= t('.details_transfer', default: 'Details') %>: </strong><span> <%= payment.options[:bank_transfer_detail] %></span></li>
+                                    </ul>
+                                    <div class="form-group">
+                                        <label><%= t('.bank_name', default: 'Bank name') %></label>
+                                        <input class="form-control required" type="text" name="details[bank_name]">
+                                    </div>
+                                    <div class="form-group">
+                                        <label><%= t('.bank_owner', default: 'Owner name of bank account') %></label>
+                                        <input class="form-control required" type="text" name="details[owner_name]">
+                                    </div>
+                                    <div class="form-group">
+                                        <label><%= t('.cod_key', default: 'CODE / ID / KEY / TICKET') %></label>
+                                        <input class="form-control required" type="text" name="details[code]">
+                                    </div>
+                                    <div class="form-group">
+                                        <label><%= t('.descr', default: 'Description') %></label>
+                                        <textarea name="details[description]" rows="4" class="form-control required" ></textarea>
+                                    </div>
+                                    <%= inputs %>
+                                <% end %>
+                            <% end %>
+                            <% if payment.options[:type] == 'on_delivery' %>
+                                <%= form_tag(plugins_ecommerce_checkout_pay_by_on_delivery_path(order: @cart.slug), :method => "post") do %>
+                                    <%= inputs %>
+                                <% end %>
+                            <% end %>
 
-                    <% if payment.options[:type] == 'credit_card' %>
-                        <img src="http://i76.imgup.net/accepted_c22e0.png" alt="Buy now with Credit Card"/>
-                    <% end %>
+                            <% if payment.options[:type] == 'credit_card' %>
+                                <img src="http://i76.imgup.net/accepted_c22e0.png" alt="Buy now with Credit Card"/>
+                            <% end %>
 
-                    <% if payment.options[:type] == 'authorize_net' %>
-                        <img src="http://i76.imgup.net/accepted_c22e0.png" alt="Buy now with Authorize.net"/>
-                        <%= form_tag(plugins_ecommerce_checkout_pay_by_authorize_net_path(order: @cart.slug), :method => "post") do %>
-                            <div class="form-group">
-                                <label for="firstName"><%= t('.first_name', default: 'First Name') %></label>
-                                <input type="text" class="form-control required" name="firstName" value="<%= @cart.user.first_name %>" required autocomplete="off"/>
-                            </div>
-                            <div class="form-group">
-                                <label for="lastName"><%= t('.last_name', default: 'Last Name') %></label>
-                                <input type="text" class="form-control required" name="lastName" value="<%= @cart.user.last_name %>" autocomplete="off"/>
-                            </div>
-                            <div class="form-group">
-                                <label><%= t('.card_number', default: 'Card Number') %></label>
-                                <div class="input-group">
-                                    <input type="text" class="form-control required" name="cardNumber" autocomplete="off"/>
-                                    <span class="input-group-addon"><i class="fa fa-credit-card"></i></span>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="expMonth"><%= t('.exp_date', default: 'EXPIRATION DATE') %></label>
-                                <div class="row">
-                                    <div class="col-xs-6 col-lg-6">
-                                        <input type="text" class="form-control required" name="expMonth" placeholder="MM" autocomplete="off"/>
+                            <% if payment.options[:type] == 'authorize_net' %>
+                                <img src="http://i76.imgup.net/accepted_c22e0.png" alt="Buy now with Authorize.net"/>
+                                <%= form_tag(plugins_ecommerce_checkout_pay_by_authorize_net_path(order: @cart.slug), :method => "post") do %>
+                                    <div class="form-group">
+                                        <label for="firstName"><%= t('.first_name', default: 'First Name') %></label>
+                                        <input type="text" class="form-control required" name="firstName" value="<%= @cart.user.first_name %>" required autocomplete="off"/>
                                     </div>
-                                    <div class="col-xs-6 col-lg-6">
-                                        <input type="text" class="form-control required" name="expYear" placeholder="YY" autocomplete="off"/>
+                                    <div class="form-group">
+                                        <label for="lastName"><%= t('.last_name', default: 'Last Name') %></label>
+                                        <input type="text" class="form-control required" name="lastName" value="<%= @cart.user.last_name %>" autocomplete="off"/>
                                     </div>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="cvCode"><%= t('.cvv', default: 'Cvv CODE') %></label>
-                                <input type="text" class="form-control required" name="cvCode" placeholder="cvv" autocomplete="off"/>
-                            </div>
-                            <%= inputs %>
-                        <% end %>
-                    <% end %>
-
-                    <% if payment.options[:type] == 'stripe' %>
-                        <%= form_tag(plugins_ecommerce_checkout_pay_by_stripe_path(order: @cart.slug), :method => "post") do %>
-                            <input type="hidden" name="payment[payment_id]" value="<%= payment.id %>">
-                            <input type="hidden" name="payment[type]" value="<%= payment.options[:type] %>">
-                            <img src="http://i76.imgup.net/accepted_c22e0.png" alt="Buy now with Authorize.net"/><br>
-                            <hr>
-                            <script src="https://checkout.stripe.com/checkout.js" class="stripe-button"
-                                    data-key="<%= payment.options[:stripe_key] %>"
-                                    data-description="Payment Products: <%= @cart.products_title %>"
-                                    data-amount="<%= commerce_to_cents(@cart.total_amount) %>"
-                                    data-locale="<%= I18n.locale %>"></script>
-                        <% end %>
-                    <% end %>
+                                    <div class="form-group">
+                                        <label><%= t('.card_number', default: 'Card Number') %></label>
+                                        <div class="input-group">
+                                            <input type="text" class="form-control required" name="cardNumber" autocomplete="off"/>
+                                            <span class="input-group-addon"><i class="fa fa-credit-card"></i></span>
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <label for="expMonth"><%= t('.exp_date', default: 'EXPIRATION DATE') %></label>
+                                        <div class="row">
+                                            <div class="col-xs-6 col-lg-6">
+                                                <input type="text" class="form-control required" name="expMonth" placeholder="MM" autocomplete="off"/>
+                                            </div>
+                                            <div class="col-xs-6 col-lg-6">
+                                                <input type="text" class="form-control required" name="expYear" placeholder="YY" autocomplete="off"/>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <label for="cvCode"><%= t('.cvv', default: 'Cvv CODE') %></label>
+                                        <input type="text" class="form-control required" name="cvCode" placeholder="cvv" autocomplete="off"/>
+                                    </div>
+                                    <%= inputs %>
+                                <% end %>
+                            <% end %>
 
-                    <% if(custom_method = ecommerce_custom_payment_methods[payment.options[:type].to_sym]).present? %>
-                        <%= render custom_method[:payment_form_view_path], payment: payment, options: payment.options, cart: @cart %>
-                    <% end %>
+                            <% if payment.options[:type] == 'stripe' %>
+                                <%= form_tag(plugins_ecommerce_checkout_pay_by_stripe_path(order: @cart.slug), :method => "post") do %>
+                                    <input type="hidden" name="payment[payment_id]" value="<%= payment.id %>">
+                                    <input type="hidden" name="payment[type]" value="<%= payment.options[:type] %>">
+                                    <img src="http://i76.imgup.net/accepted_c22e0.png" alt="Buy now with Authorize.net"/><br>
+                                    <hr>
+                                    <script src="https://checkout.stripe.com/checkout.js" class="stripe-button"
+                                            data-key="<%= payment.options[:stripe_key] %>"
+                                            data-description="Payment Products: <%= @cart.products_title %>"
+                                            data-amount="<%= Plugins::Ecommerce::UtilService.ecommerce_money_to_cents(@cart.total_amount) %>"
+                                            data-locale="<%= I18n.locale %>"></script>
+                                <% end %>
+                            <% end %>
 
+                            <% if(custom_method = ecommerce_custom_payment_methods[payment.options[:type].to_sym]).present? %>
+                                <%= render custom_method[:payment_form_view_path], payment: payment, options: payment.options, cart: @cart %>
+                            <% end %>
+                        </div>
+                    </div>
                 </div>
             <% end %>
             <%= content_tag(:div, 'No Payment Methods Defined', class: 'alert alert-danger') unless payment_methods.any? %>

data/app/views/plugins/ecommerce/partials/checkout/_user_info.html.erb

@@ -28,7 +28,7 @@
         </div>
         <div class="form-group">
             <label><%= t('.country', default: 'Country') %></label>
-            <%= country_select :billing_address, :country, {locale: I18n.locale.to_s, iso_codes: true, selected:  billing_address[:country]}, { :name => 'order[billing_address][country]',  class: 'form-control' } %>
+            <%= country_select :billing_address, :country, {locale: I18n.locale.to_s, iso_codes: true, selected:  billing_address[:country], only: e_shipping_countries}, { :name => 'order[billing_address][country]',  class: 'form-control' } %>
         </div>
         <div class="form-group">
             <label><%= t('.state', default: 'State') %></label>
@@ -72,7 +72,7 @@
         </div>
         <div class="form-group">
             <label><%= t('.country', default: 'Country') %></label>
-            <%= country_select :shipping_address, :country, {locale: I18n.locale.to_s, iso_codes: true, selected:  billing_address[:country]}, { :name => 'order[shipping_address][country]',  class: 'form-control' } %>
+            <%= country_select :shipping_address, :country, {locale: I18n.locale.to_s, iso_codes: true, selected:  billing_address[:country], only: e_shipping_countries}, { :name => 'order[shipping_address][country]',  class: 'form-control' } %>
         </div>
         <div class="form-group">
             <label><%= t('.state', default: 'State') %></label>

data/app/views/post_types/commerce/_product_info.html.erb

@@ -0,0 +1,45 @@
+<h1><%= product.the_title %> <%= product.the_edit_link %></h1>
+<h3>
+    <%= t('plugins.ecommerce.single.sku', default: 'SKU') %>: <span id="product_sku"><%= product.the_sku %></span>
+    <span class="pull-right"><%= raw product.the_featured_status %></span>
+</h3>
+<h4><span id="product_price"><%= product.the_price %></span> <span class="pull-right"><%= raw product.the_stock_status %></span></h4>
+<hr/>
+<p><%= product.the_excerpt %></p>
+<hr/>
+<% if product.in_stock? %>
+    <% if product.the_qty_real.to_i > 0 || product.is_variation_product? %>
+        <%= form_tag(plugins_ecommerce_checkout_cart_add_path, :method => "post", :class => "form") do %>
+            <% if product.is_variation_product? %>
+                <div class="form-group">
+                    <%= label_tag :variation_id %>
+                    <select class="form-control required" name="variation_id" id="product_variation_id">
+                        <% product.product_variations.each_with_index do |variation, index| %>
+                            <option data-sku="<%= variation.sku %>" <%= 'selected' if index == 0 %> <%= 'disabled' if !product.in_stock?(variation.id) || product.the_qty_real(variation.id) <= 0 %> data-price="<%= product.the_price(variation.id) %>" value="<%= variation.id %>"><%= product.the_variation_title(variation.id) %></option>
+                        <% end %>
+                    </select>
+                </div>
+                <script>
+                    jQuery(function(){
+                        var panel = $('#product_view');
+                        panel.find('#product_variation_id').change(function(){ var op = $(this).find('option:selected'); panel.find('#product_sku').html(op.attr('data-sku')); panel.find('#product_price').html(op.attr('data-price'));  }).trigger('change');
+                        if(panel.find('#product_variation_id option').not('[disabled]').length == 0){
+                            panel.find('#e_add_to_cart_field_group').html('<p><%= t('plugins.ecommerce.single.noavailable_items', default: 'No items available') %></p>')
+                            panel.find('#product_price').next().hide();
+                        }
+                    });
+                </script>
+            <% end %>
+            <div class="input-group" id="e_add_to_cart_field_group">
+                <span class="input-group-addon"><%= t('plugins.ecommerce.single.qty', default: 'Qty') %></span>
+                <%= number_field :cart, :qty, class: 'form-control', value: 1, min: 0, max: product.the_qty_real.to_i %>
+                <%= hidden_field :cart, :product_id, value: product.id %>
+                <span class="input-group-btn"><button class="btn btn-default" type="submit"><i class="fa fa-shopping-cart"></i> <%= t('plugins.ecommerce.single.add_to_cart', default: 'Add to cart') %></button></span>
+            </div>
+        <% end %>
+    <% else %>
+        <p><%= t('plugins.ecommerce.single.noavailable_items', default: 'No items available') %></p>
+    <% end %>
+<% else %>
+    <p><%= t('plugins.ecommerce.single.no_stock', default: 'This product is not in stock') %></p>
+<% end %>

data/app/views/post_types/commerce/single.html.erb

@@ -1,107 +1,85 @@
-<%= render plugin_view('partials/cart_widget') %>
+<% args={custom_slider: nil, custom_footer: nil, extra_footer: nil, custom_sidebar: nil, custom_cart_widget: nil, product: @post}; hooks_run('ecommerce_product_page', args) # permit custom footer %>
+<% if args[:custom_cart_widget].nil? %>
+    <%= render plugin_view('partials/cart_widget') %>
+<% else %>
+    <%= raw args[:custom_cart_widget] %>
+<% end %>
 <div class="row">
     <div class="col-md-9 post-view">
         <article class="post-content" id="product_view">
             <div class="row">
                 <div class="col-md-6">
-                    <div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
-                        <!-- Indicators -->
-                        <ol class="carousel-indicators">
-                            <% @post.the_photos.each_with_index do |pthoto, index| %>
-                                <li data-target="#carousel-example-generic" data-slide-to="<%= index %>" class="<%= 'active' if index == 0 %>"></li>
-                            <% end %>
-                        </ol>
-
-                        <!-- Wrapper for slides -->
-                        <div class="carousel-inner" role="listbox">
-                            <% @post.the_photos.each_with_index do |pthoto, index| %>
-                                <div class="item <%= 'active' if index == 0 %>">
-                                    <img src="<%= pthoto %>" class="center-block">
-                                </div>
-                            <% end %>
-                        </div>
-
-                        <!-- Controls -->
-                        <a class="left carousel-control" href="#carousel-example-generic" role="button" data-slide="prev">
-                            <span class="glyphicon glyphicon-chevron-left fa fa-chevron-left" aria-hidden="true"></span>
-                            <span class="sr-only">Previous</span>
-                        </a>
-                        <a class="right carousel-control" href="#carousel-example-generic" role="button" data-slide="next">
-                            <span class="glyphicon glyphicon-chevron-right fa fa-chevron-right " aria-hidden="true"></span>
-                            <span class="sr-only">Next</span>
-                        </a>
-                    </div>
-                </div>
+                    <% unless args[:custom_slider].present? %>
+                        <div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
+                            <!-- Indicators -->
+                            <ol class="carousel-indicators">
+                                <% @post.the_photos.each_with_index do |pthoto, index| %>
+                                    <li data-target="#carousel-example-generic" data-slide-to="<%= index %>" class="<%= 'active' if index == 0 %>"></li>
+                                <% end %>
+                            </ol>
 
-                <div class="col-md-6">
-                    <h1><%= @post.the_title %></h1>
-                    <h3>
-                        <%= t('plugins.ecommerce.single.sku', default: 'SKU') %>: <span id="product_sku"><%= @post.the_sku %></span>
-                        <span class="pull-right"><%= raw @post.the_featured_status %></span>
-                    </h3>
-                    <h4><span id="product_price"><%= @post.the_price %></span> <span class="pull-right"><%= raw @post.the_stock_status %></span></h4>
-                    <hr/>
-                    <p><%= @post.the_excerpt %></p>
-                    <hr/>
-                    <% if @post.in_stock? %>
-                        <% if @post.the_qty_real.to_i > 0 %>
-                            <%= form_tag(plugins_ecommerce_checkout_cart_add_path, :method => "post", :class => "form") do %>
-                                <% if @post.is_variation_product? %>
-                                    <div class="form-group">
-                                        <%= label_tag :variation_id %>
-                                        <select class="form-control required" name="variation_id" id="product_variation_id">
-                                            <% @post.product_variations.each_with_index do |variation, index| %>
-                                                <option data-sku="<%= variation.sku %>" <%= 'selected' if index == 0 %> <%= 'disabled' unless @post.in_stock?(variation.id) %> data-price="<%= @post.the_price(variation.id) %>" value="<%= variation.id %>"><%= @post.the_variation_title(variation.id) %></option>
-                                            <% end %>
-                                        </select>
+                            <!-- Wrapper for slides -->
+                            <div class="carousel-inner" role="listbox">
+                                <% @post.the_photos.each_with_index do |pthoto, index| %>
+                                    <div class="item <%= 'active' if index == 0 %>">
+                                        <img src="<%= pthoto %>" class="center-block">
                                     </div>
                                 <% end %>
-                                <div class="input-group">
-                                    <span class="input-group-addon"><%= t('plugins.ecommerce.single.qty', default: 'Qty') %></span>
-                                    <%= number_field :cart, :qty, class: 'form-control', value: 1, min: 0, max: @post.the_qty_real.to_i %>
-                                    <%= hidden_field :cart, :product_id, value: @post.id %>
-                                    <span class="input-group-btn"><button class="btn btn-default" type="submit"><i class="fa fa-shopping-cart"></i> <%= t('plugins.ecommerce.single.add_to_cart', default: 'Add to cart') %></button></span>
-                                </div>
-                            <% end %>
-                        <% end %>
+                            </div>
+
+                            <!-- Controls -->
+                            <a class="left carousel-control" href="#carousel-example-generic" role="button" data-slide="prev">
+                                <span class="glyphicon glyphicon-chevron-left fa fa-chevron-left" aria-hidden="true"></span>
+                                <span class="sr-only">Previous</span>
+                            </a>
+                            <a class="right carousel-control" href="#carousel-example-generic" role="button" data-slide="next">
+                                <span class="glyphicon glyphicon-chevron-right fa fa-chevron-right " aria-hidden="true"></span>
+                                <span class="sr-only">Next</span>
+                            </a>
+                        </div>
                     <% else %>
-                        <p><%= t('plugins.ecommerce.single.noavailable_items', default: 'No items available') %></p>
+                        <%= raw args[:custom_slider] %>
                     <% end %>
                 </div>
-            </div>
 
-            <div class="row">
                 <div class="col-md-6">
-                    <h3><%= t('plugins.ecommerce.single.descr', default: 'Description') %></h3>
-                    <div class="item-content">
-                        <%= raw @post.the_content %>
-                    </div>
+                    <%= render 'post_types/commerce/product_info', product: @post %>
                 </div>
-                <% if (attrs = @post.the_attribute_fields('ecommerce_attrs').to_a).present? %>
+            </div>
+
+            <% unless args[:custom_footer].present? %>
+                <div class="row">
                     <div class="col-md-6">
-                        <h3><%= t('plugins.ecommerce.single.attrs', default: 'Attributes') %></h3>
-                        <table class="table table-bordered">
-                            <% attrs.each_with_index do |attr, index| %>
-                                <tr>
-                                    <td><strong><%= attr['attr'].to_s.translate %></strong></td>
-                                    <td><%= attr['value'].to_s.translate %></td>
-                                </tr>
-                            <% end %>
-                        </table>
+                        <h3><%= t('plugins.ecommerce.single.descr', default: 'Description') %></h3>
+                        <div class="item-content">
+                            <%= raw @post.the_content %>
+                        </div>
                     </div>
-                <% end %>
-            </div>
-            <% if @post.is_variation_product? %>
-                <script>
-                    jQuery(function(){
-                        var panel = $('#product_view');
-                        panel.find('#product_variation_id').change(function(){ var op = $(this).find('option:selected'); panel.find('#product_sku').html(op.attr('data-sku')); panel.find('#product_price').html(op.attr('data-price'));  }).trigger('change');
-                    });
-                </script>
+                    <% if (attrs = @post.the_attribute_fields('ecommerce_attrs').to_a).present? %>
+                        <div class="col-md-6">
+                            <h3><%= t('plugins.ecommerce.single.attrs', default: 'Attributes') %></h3>
+                            <table class="table table-bordered">
+                                <% attrs.each_with_index do |attr, index| %>
+                                    <tr>
+                                        <td><strong><%= attr['attr'].to_s.translate %></strong></td>
+                                        <td><%= attr['value'].to_s.translate %></td>
+                                    </tr>
+                                <% end %>
+                            </table>
+                        </div>
+                    <% end %>
+                </div>
+            <% else %>
+                <%= raw args[:custom_footer] %>
             <% end %>
+            <%= raw args[:extra_footer] if args[:extra_footer].present? %>
         </article>
     </div>
     <div class="col-md-3">
-        <%= render partial: 'partials/sidebar', locals: {post: @post, skip_fields: true} %>
+        <% unless args[:custom_sidebar].present? %>
+            <%= render partial: 'partials/sidebar', locals: {post: @post, skip_fields: true} %>
+        <% else %>
+        <%= raw args[:custom_sidebar] %>
+        <% end %>
     </div>
 </div>