camaleon_ecommerce 0.0.4 → 1.1

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

@@ -26,15 +26,13 @@
               <td><%= row.name %></td>
               <td><%= row.method_text %></td>
               <td><%= raw row.the_status %></td>
-              <td><%= row.description %></td>
+              <td><%= row.description.translate %></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-edit"></i>'), {action: :edit, id: row.id}, class: "btn btn-default btn-xs", title: "#{t('camaleon_cms.admin.button.edit')}" %>
               </td>
             </tr>
         <% end %>
-
-
       </tbody>
     </table>
     <%= content_tag("div", raw(t('camaleon_cms.admin.message.data_found_list')), class: "alert alert-warning") if @payment_methods.empty? %>

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

@@ -30,8 +30,6 @@
                     </td>
                 </tr>
             <% end  %>
-
-
             </tbody>
         </table>
         <%= content_tag("div", raw(t('camaleon_cms.admin.message.data_found_list')), class: "alert alert-warning") if @prices.empty? %>

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

@@ -12,8 +12,6 @@
                     <li><strong>Description:</strong> <span> <%= @shipping_method.description %></span></li>
                 </ul>
             </div>
-
         </div>
-
     </div>
 </div>

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

@@ -77,7 +77,7 @@
                                     <button class="btn btn-info btn-xs dropdown-toggle e-co" data-toggle="dropdown" aria-expanded="false" title="<%= t('camaleon_cms.admin.button.preview') %>"><i class="fa fa-eye"></i> </button>
                                     <ul class="dropdown-menu" style="min-width: 50px;">
                                         <% f.slug.to_s.translations.each do |locale, slug| %>
-                                            <li><a href="<%= url_to_fixed("post_path", slug: slug, locale: locale) %>" target="_blank"><%= locale.to_s.upcase %></a></li>
+                                            <li><a href="<%= f.the_url(locale: locale) %>" target="_blank"><%= locale.to_s.upcase %></a></li>
                                         <% end %>
                                     </ul>
                                 </div>

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

@@ -2,7 +2,6 @@
     <div class="panel-heading ui-draggable-handle">
         <h4><span class="fa fa-cogs"></span> <%= t('plugin.ecommerce.e_commerce_settings') %></h4>
     </div>
-    <%#= form_tag ({url:{action: @price.blank? ? :create : :update}}, :method => "post", :class => "form" ) do %>
     <%= form_tag(action: :saved, :method => "post", :class => "validate-settings") do %>
         <div class="panel-body">
 

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

@@ -30,7 +30,7 @@
 </div>
 
 <script>
-  run.push(function(){
+  jQuery(function(){
     jQuery( '#form-tax_rate' ).on( "change", '#options_rate', function() {setTimeout(function(){jQuery(this).val(Math.abs(jQuery(this).val()) || 0);}.bind(this), 60)});
   })
 </script>

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

@@ -1,59 +1,48 @@
-<%= render layout: 'plugins/ecommerce/layouts/ecommerce', locals: {} do %>
-<h2>Shopping Cart</h2>
-<%= form_tag(plugins_ecommerce_checkout_cart_update_path, :method => "post", :class => "form") do %>
-    <table id="table-shopping-cart" class="table">
-      <thead>
-      <tr>
-        <th id="item_col">Item</th>
-        <th id="price_col">Price</th>
-        <th id="price_col">Tax</th>
-        <th id="quantity_col">Quantity</th>
-        <th id="subtotal_col">Subtotal</th>
-        <th></th>
-      </tr>
-      </thead>
-      <tbody>
-      <%
-         total = 0
-         @products.each do |product|
-           product = product.decorate
-           product_options = @cart.get_option("product_#{product.id}")
-           price = product_options[:price].to_f
-           tax = product_options[:tax].to_f
-           qty = product_options[:qty].to_f
-           sub_total = (price + tax) * qty
-           total += sub_total
-      %>
+<div class="cart_view">
+  <%= render plugin_view('partials/cart_widget') %>
+  <h1><%= t('.title', default: 'Shopping Cart') %></h1>
+  <%= form_tag(plugins_ecommerce_checkout_cart_update_path, :method => "post", :class => "form") do %>
+      <table id="table-shopping-cart" class="table table-bordered">
+          <thead>
           <tr>
-            <td><a href="<%= product.the_url %>"><%= product.the_title %></a></td>
-            <td data-price="<%= price %>"><%= current_site.current_unit %> <%= price %></td>
-            <td data-tax="<%= tax %>"><%= current_site.current_unit %> <%= tax %></td>
-            <td data-qty="<%= qty %>">
-              <input name="products[][product_id]" type="hidden" value="<%= product.id %>"/>
-              <input class="text-qty" type="number" name="products[][qty]" value="<%= qty %>">
-            </td>
-            <td data-subtotal="<%= sub_total %>"><%= current_site.current_unit %> <%= sub_total.to_f.round(2) %></td>
-            <td>
-              <a rel="nofollow" data-method="delete" href="<%= plugins_ecommerce_checkout_cart_remove_path(product_id: product.id) %>">Remove</a>
-            </td>
+              <th id="item_col"><%= t('.item', default: 'Item') %></th>
+              <th id="price_col"><%= t('.price', default: 'Price') %></th>
+              <th id="price_col"><%= t('.tax', default: 'Tax') %></th>
+              <th id="quantity_col"><%= t('.quantity', default: 'Quantity') %></th>
+              <th id="subtotal_col"><%= t('.subtotal', default: 'Subtotal') %></th>
+              <th></th>
           </tr>
-      <% end  %>
-      </tbody>
-      <tfoot>
-      <tr>
-        <td colspan="4"></td>
-        <td>Subtotal</td>
-        <td id="total" ><%= current_site.current_unit %> <%= total.to_f.round(2) %></td>
-      </tr>
-      </tfoot>
-    </table>
-    <% if @products.size > 0 %>
-        <div class="text-right">
-            <button type="submit" class="btn btn-default"> Update </button>
-            <a class="btn btn-info" href="<%= plugins_ecommerce_checkout_path %>"><i class="fa fa-shopping-cart"></i> Proceed to Checkout</a>
-        </div>
-    <% end %>
-
-<% end %>
-
-<% end %>
+          </thead>
+          <tbody>
+          <% @products.each do |item| product = item.product.decorate %>
+              <tr>
+                  <td><a href="<%= product.the_url %>"><%= product.the_title %></a></td>
+                  <td><%= item.the_price %></td>
+                  <td><%= product.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 %>">
+                  </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>
+                  </td>
+              </tr>
+          <% end %>
+          </tbody>
+          <tfoot>
+          <tr>
+              <td colspan="4"></td>
+              <td><%= t('.subtotal', default: 'Subtotal') %></td>
+              <td><%= @cart.the_total_amount %></td>
+          </tr>
+          </tfoot>
+      </table>
+      <% if @products.size > 0 %>
+          <div class="text-right">
+              <button type="submit" class="btn btn-default"> <%= t('.update', default: 'Update') %> </button>
+              <a class="btn btn-info" href="<%= plugins_ecommerce_checkout_path %>"><i class="fa fa-shopping-cart"></i> <%= t('.proceed', default: 'Proceed to Checkout') %></a>
+          </div>
+      <% end %>
+  <% end %>
+</div>

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

@@ -1,166 +1,42 @@
-<%= render layout: 'plugins/ecommerce/layouts/ecommerce', locals: {} do %>
-<%
-   warning = []
-   warning << "Not Found Product" if @products.size == 0
-
-%>
-<div id="checkout" class="row">
-  <h1 class="col-md-12">Checkout</h1>
-
-  <%= form_tag(plugins_ecommerce_checkout_processing_path, :method => "post", :class => "form form-validate-ec") do %>
-
-    <div id="user_details" class="col-md-12">
-      <h3>User Details</h3>
-      <p><strong>Name: </strong> <%= current_user.fullname %></p>
-      <input class="form-control" type="hidden" name="order[details][customer]" value="<%= current_user.fullname %>">
-      <div class="form-group">
-        <label for="">Email</label>
-        <input class="form-control required" type="email" name="order[details][email]" id="">
-      </div>
-      <div class="form-group">
-        <label for="">Phone</label>
-        <input class="form-control required" type="text" name="order[details][phone]" id="">
-      </div>
+<% cama_load_custom_assets({"plugin_ecommerce"=>{css: [plugin_asset("checkout")] } }) %>
+<% if warning.present? %>
+    <div class="alert alert-danger"><%= raw warning.join("<br>") %></div>
+<% end %>
+<div id="cama_checkout_view" class="row checkout_view">
+    <%= render plugin_view('partials/cart_widget') %>
+    <h1>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>
+            </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>
+            </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>
+            </div>
+        </div>
     </div>
 
-    <%= render partial: 'plugins/ecommerce/partials/form_address' %>
-
-  <div class="clearfix"></div>
-
-    <div id="add_details" class="col-md-6">
-      <div id="coupon">
-        <h3>Coupon</h3>
-        <div id="e_coupon_apply_box" data-href="<%= plugins_ecommerce_res_coupon_path %>" data-token="<%= form_authenticity_token %>">
-          <div class="input-group">
-            <input type="text" class="form-control coupon-text" >
-            <span class="input-group-btn">
-              <button class="btn btn-default" type="button">Apply</button>
-            </span>
-          </div><!-- /input-group -->
-          <input type="hidden" name="order[payment][coupon_code]" id="coupon_code" value="">
-
+    <div class="steps_content">
+        <div class="row setup-content" id="step-1">
+            <%= form_tag(plugins_ecommerce_checkout_step_address_path, :method => "post", :class => "col-md-12", id: 'checkout_address_form') do %>
+                <%= render plugin_view('partials/checkout/user_info') %>
+                <div class="clearfix"></div>
+            <% end %>
         </div>
-
-
-      </div>
-      <div id="shipping" data-no-turbolink="">
-        <h3>Shipping Option</h3>
-
-        <div class="form-group">
-          <label for="">Shipping method</label>
-          <%
-             total_weight = 0
-             weight_price = 0
-             exist_shipping_method = false
-             @products.each do |product|
-               product_options = @cart.get_option("product_#{product.id}")
-               total_weight += product_options[:weight].to_f * product_options[:qty].to_f
-              end  %>
-          <select class="form-control" name="order[payment][shipping_method]" id="shipping_methods" >
-            <% current_site.shipping_methods.each do |m|
-              price = m.get_price_from_weight(total_weight)
-              if price.to_i >= 0
-                exist_shipping_method = true
-                weight_price = price unless weight_price.to_i > 0
-            %>
-                <option value="<%= m.id %>" data-price="<%= price %>"><%= m.name %> <%= current_site.current_unit %> <%= price %></option>
-            <% end
-               end %>
-          </select>
-          <% warning << "Not Found Shipping Methods by Products" unless exist_shipping_method  %>
-
+        <div class="row setup-content" id="step-2">
+            <%= form_tag(plugins_ecommerce_checkout_step_shipping_path, :method => "post", :class => "col-md-12", id: 'checkout_shipping_form') do %>
+                <%= render plugin_view('partials/checkout/details') %>
+            <% end %>
         </div>
-      </div>
+        <div class="row setup-content" id="step-3">
 
-      <% if warning.present? %>
-        <div class="alert alert-danger"><%= raw warning.join("<br>") %></div>
-      <% else %>
-        <div id="submit" class="text-right">
-          <input type="submit" name="commit" value="Create Order" class="btn btn-default">
         </div>
-      <% end %>
     </div>
-  <div id="totals_section" class="col-md-6">
-    <h3>Total</h3>
-    <table class="table table-bordered">
-      <tbody>
-      <tr>
-        <th id="quantity_col">Quantity</th>
-        <th id="item_col">Item</th>
-        <th id="price_col">Price</th>
-
-        <th id="tax_col">Tax</th>
-        <th id="subtotal_col">Subtotal</th>
-      </tr>
-
-      <%
-         total = 0
-         tax_total = 0
-
-         @products.each do |product|
-           product = product.decorate
-           product_options = @cart.get_option("product_#{product.id}")
-           price = product_options[:price].to_f
-           qty = product_options[:qty].to_f
-           tax_product = product_options[:tax].to_f
-           tax_total_product = tax_product * qty
-           tax_total += tax_total_product
-           sub_total = price * qty
-           total += sub_total
-      %>
-          <tr>
-            <td><%= qty.to_i %></td>
-            <td><%= product.the_title %></td>
-            <td><%= current_site.current_unit %> <%= price %></td>
-
-            <td><%= current_site.current_unit %> <%= tax_product %></td>
-            <td><%= current_site.current_unit %> <%= sub_total + tax_total_product %></td>
-          </tr>
-      <% end
-
-      %>
-
-
-
-      <tr>
-        <td colspan="2"></td>
-        <td colspan="2" class="text-right">Total (excluding Tax)</td>
-        <td id="subtotal_total" data-subtotal="<%= total %>">
-          <%= current_site.current_unit %> <%= total %>
-        </td>
-      </tr>
-      <tr >
-        <td colspan="2"></td>
-        <td colspan="2" class="text-right">Tax</td>
-        <td id="tax_total">
-          <%= current_site.current_unit %> <%= tax_total %>
-        </td>
-      </tr>
-      <% total += tax_total %>
-
-      <tr id="coupon_application_row" style="display:none;">
-        <td colspan="2"></td>
-        <td colspan="2" class="text-right">Discount</td>
-        <td class="extra_totals reduce_tax_subtotal" id="coupon_application_total" data-amount="0">
-          <span></span>
-        </td>
-      </tr>
-      <tr>
-        <td colspan="2"></td>
-        <td colspan="2" class="text-right">Shipping</td>
-        <td id="shipping_total"><%= current_site.current_unit %> <span><%= weight_price %></span></td>
-      </tr>
-      <tr>
-        <td colspan="2"></td>
-        <td colspan="2" class="text-right">Total</td>
-        <td id="order_total" data-total="<%= total %>">
-          <% total += weight_price %>
-          <%= current_site.current_unit %> <span><%= total %></span></td>
-      </tr>
-      </tbody>
-    </table>
-
-  </div>
-  <% end %>
 </div>
-<% end %>
+<script>jQuery(function(){ cama_checkout_actions(); <% if flash[:payment_error].present? %> setTimeout(function(){ $('#cama_checkout_view #checkout_shipping_form').submit(); }, 200); <% end %> })</script>

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

@@ -0,0 +1,67 @@
+<div class="container" id="ecommerce_login_panel">
+    <%= render 'camaleon_cms/flash_messages' %>
+    <div class="row">
+        <div class="col-md-6 col-md-offset-3">
+            <ul class="nav nav-tabs" role="tablist">
+                <li role="presentation" class="active"><a href="#login-form" role="tab" data-toggle="tab"><%= t('.login', default: 'Login') %></a></li>
+                <li role="presentation"><a href="#register-form" role="tab" data-toggle="tab"><%= t('.register', default: 'Register') %></a></li>
+            </ul>
+            <div class="tab-content">
+                <%= 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="">
+                    </div>
+                    <div class="form-group">
+                        <input type="password" name="password" id="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' %>
+                        <a href="<%= cama_admin_forgot_url(return_to: site_current_url) %>" tabindex="5" class="pull-right"><%= t('.forgot', default: 'Forgot Password?') %></a>
+                    </div>
+                    <div class="clearfix"></div>
+                <% end %>
+
+                <%= form_for @user, url: plugins_ecommerce_register_path, html: { id: 'register-form', class: 'tab-pane', role: 'tabpanel' } do |f| %>
+                    <%= render partial: 'layouts/camaleon_cms/admin/form_error', locals: {data: @user} %>
+                    <%= hidden_field_tag :kind_form, 'register-form' %>
+                    <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>
+                    <div class="form-group">
+                        <%= f.password_field :password, class: 'form-control required', tabindex: 4, placeholder: t('.password', default: 'Password') %>
+                    </div>
+                    <div class="form-group">
+                        <%= f.password_field :password_confirmation, class: 'form-control required', equalTo: '#camaleon_cms_user_password', tabindex: 5, placeholder: t('.confirm_pass', default: 'Confirm Password') %>
+                    </div>
+                    <div class="form-group">
+                        <%= submit_tag t('.create_account', default: 'Create account'), class: 'btn btn-default col-md-3' %>
+                    </div>
+                    <div class="clearfix"></div>
+                <% end %>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+  $(function() {
+    var panel = $('#ecommerce_login_panel');
+    <% if params[:kind_form].present? %>
+      $('#<%= params[:kind_form] %>-link', panel).click();
+    <% end %>
+
+    function do_validation(){
+      $("#register-form", panel).validate();
+      $("#login-form", panel).validate();
+    }
+
+    if(!$.fn.validator) $.getScript('<%= asset_url('camaleon_cms/admin/jquery.validate') %>', function(){ do_validation(); });
+    else do_validation();
+  });
+</script>

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

@@ -1,46 +1,38 @@
-<%= render layout: 'plugins/ecommerce/layouts/ecommerce', locals: {} do %>
-<h2>Orders</h2>
-    <table id="table-shopping-cart" class="table">
-      <thead>
+<%= render plugin_view('partials/cart_widget') %>
+<h2><%= t('.title', default: 'My Orders') %></h2>
+<table id="table-shopping-cart" class="table">
+  <thead>
+  <tr>
+    <th><%= t('.id', default: 'ID') %></th>
+    <th><%= t('.status', default: 'Status') %></th>
+    <th><%= t('.products', default: 'Products') %></th>
+    <th><%= t('.total_amount', default: 'Total Amount') %></th>
+    <th><%= t('.coupon', default: 'Coupon') %></th>
+    <th><%= t('.paid_amount', default: 'Paid Amount') %></th>
+    <th><%= t('.order_date', default: 'Order Date') %></th>
+    <th><%= t('.method', default: 'Payment Method') %></th>
+    <th style="width: 90px"></th>
+  </tr>
+  </thead>
+  <tbody>
+  <% @orders.each do |order| %>
       <tr>
-        <th id="">ID</th>
-        <th id="">Status</th>
-        <th id="">Products</th>
-        <th id="">Total Amount</th>
-        <th id="">Coupon</th>
-        <th id="">Pay Amount</th>
-        <th id="">Order Time</th>
-        <th>Payment Method</th>
-        <th style="width: 90px"></th>
+        <td><%= order.slug %></td>
+        <td><%= raw order.the_status  %></td>
+        <td>
+          <% order.product_items.each do |item| %>
+              <%= item.qty %> x <%= item.cache_the_title %> (<%= item.cache_the_price %>) <br>
+          <% end %>
+        </td>
+        <td><%= order.cache_the_sub_total  %></td>
+        <td><%= order.cache_the_discounts  %></td>
+        <td><%= order.cache_the_total  %></td>
+        <td><%= order.paid_at %></td>
+        <td><%= order.payment_method.name rescue '' %></td>
+        <td>
+          <a href="<%= plugins_ecommerce_order_show_path(order: order.slug) %>" class="btn btn-default btn-xs"><%= t('.view', default: 'View') %></a>
+        </td>
       </tr>
-      </thead>
-      <tbody>
-      <%
-         @orders.each do |order|
-           order = order.decorate
-           payment = order.get_meta("payment")
-      %>
-          <tr>
-            <td><%= order.slug %></td>
-            <td><%= raw order.the_status  %></td>
-            <td>
-              <% order.get_meta("products").each do |key, product| %>
-                  <%= product[:qty] %> x <%= product[:product_title] %> (<%= current_site.current_unit %> <%= product[:price] %>) <br>
-              <% end %>
-            </td>
-            <td><%= current_site.current_unit %> <%= payment[:total]  %></td>
-            <td><%= payment[:coupon]  %></td>
-            <td><%= current_site.current_unit %> <%= payment[:amount].to_f.round(2)  %></td>
-            <td><%= order.details.received_at %></td>
-            <td><%= order.payment_method.name rescue '' %></td>
-            <td>
-              <a href="<%= plugins_ecommerce_order_show_path(order: order.slug) %>" class="btn btn-info btn-xs">View</a>
-              <% if payment[:amount].to_f > 0 && order.unpaid? %>
-              <a href="<%= plugins_ecommerce_order_select_payment_path(order: order.slug) %>" class="btn btn-warning btn-xs">Pay</a>
-              <% end  %>
-            </td>
-          </tr>
-      <% end  %>
-      </tbody>
-    </table>
-<% end %>
+  <% end  %>
+  </tbody>
+</table>