camaleon_ecommerce 1.1 → 1.2

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

@@ -1,12 +1,12 @@
 <div class="row" style="min-height: 64px">
     <div class="col-md-9">
         <ol class="breadcrumb" style="margin: 0;">
-            <% @ecommerce_bredcrumb.each_with_index do |m, index| %>
+            <% @ecommerce_breadcrumb.each_with_index do |m, index| %>
                 <% if m[1].present? %>
-                    <li class="<%= "active" if @ecommerce_bredcrumb.size == index+1 %>">
+                    <li class="<%= "active" if @ecommerce_breadcrumb.size == index+1 %>">
                         <a href="<%= m[1] %>"><%= m[0] %></a></li>
                 <% else %>
-                    <li class="<%= "active" if @ecommerce_bredcrumb.size == index+1 %>"><span><%= m[0] %></span></li>
+                    <li class="<%= "active" if @ecommerce_breadcrumb.size == index+1 %>"><span><%= m[0] %></span></li>
                 <% end %>
             <% end %>
         </ol>

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

@@ -31,5 +31,5 @@
     <%= render plugin_view('partials/checkout/products_detail') %>
 </div>
 <div class="text-right">
-    <button type="submit" class="btn btn-primary">Next</button>
+    <button type="submit" class="btn btn-primary"><%= t('.next', default: 'Next') %></button>
 </div>

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

@@ -1,6 +1,6 @@
 <% if @cart.free_cart? %>
     <div class="free_order text-center col-md-12">
-        <%= link_to('Complete Order', plugins_ecommerce_checkout_complete_free_order_url, class: 'btn btn-primary col-md-4 col-md-offset-4') %>
+        <%= link_to(t('.complete_order', default: 'Complete Order'), plugins_ecommerce_checkout_complete_free_order_url, class: 'btn btn-primary col-md-4 col-md-offset-4') %>
     </div>
 <% else %>
     <div id="e-payments-types" role="tabpanel">
@@ -114,6 +114,11 @@
                                     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>
             <% end %>
             <%= content_tag(:div, 'No Payment Methods Defined', class: 'alert alert-danger') unless payment_methods.any? %>

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

@@ -13,7 +13,7 @@
         <% @cart.product_items.decorate.each do |item| product = item.product.decorate %>
             <tr>
                 <td><%= item.qty %></td>
-                <td><%= product.the_title %></td>
+                <td><%= link_to(item.the_title, product.the_url) %></td>
                 <td><%= item.the_price %></td>
                 <td><%= item.the_tax %></td>
                 <td><%= item.the_sub_total %></td>

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

@@ -5,42 +5,43 @@
 %>
 <div class="row">
     <div id="billing_address" class="col-md-6">
-        <h3><%= t('plugin.ecommerce.billing_address') %></h3>
-
+        <h3><%= t('.billing_address') %></h3>
         <div class="form-group">
-            <label for=""><%= t('.firstname', default: 'First Name') %></label>
+            <label><%= t('.firstname', default: 'First Name') %></label>
             <%= text_field_tag 'order[billing_address][first_name]', billing_address[:first_name], class: 'form-control required' %>
-
         </div>
         <div class="form-group">
-            <label for=""><%= t('.lastname', default: 'Last Name') %></label>
+            <label><%= t('.lastname', default: 'Last Name') %></label>
             <%= text_field_tag 'order[billing_address][last_name]',billing_address[:last_name], class: 'form-control required' %>
         </div>
         <div class="form-group">
-            <label for=""><%= t('.address', default: 'Address') %></label>
+            <label><%= t('.address', default: 'Address') %></label>
             <%= text_field_tag 'order[billing_address][address1]',billing_address[:address1], class: 'form-control required' %>
         </div>
         <div class="form-group">
-            <label for=""><%= t('.address', default: 'Address') %> 2</label>
+            <label><%= t('.address', default: 'Address') %> 2</label>
             <%= text_field_tag 'order[billing_address][address2]',billing_address[:address2], class: 'form-control' %>
         </div>
         <div class="form-group">
-            <label for=""><%= t('.city', default: 'City') %></label>
+            <label><%= t('.city', default: 'City') %></label>
             <%= text_field_tag 'order[billing_address][city]',billing_address[:city], class: 'form-control required' %>
         </div>
         <div class="form-group">
-            <label for=""><%= t('.country', default: 'Country') %></label>
+            <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' } %>
         </div>
         <div class="form-group">
-            <label for=""><%= t('.state', default: 'State') %></label>
+            <label><%= t('.state', default: 'State') %></label>
             <%= text_field_tag 'order[billing_address][state]',billing_address[:state], class: 'form-control' %>
         </div>
         <div class="form-group">
-            <label for=""><%= t('.code_zip', default: 'Zip code') %></label>
+            <label><%= t('.code_zip', default: 'Zip code') %></label>
             <%= text_field_tag 'order[billing_address][zip]',billing_address[:zip], class: 'form-control' %>
         </div>
-
+        <div class="form-group">
+            <label><%= t('.phone_number', default: 'Phone Number') %></label>
+            <%= text_field_tag 'order[billing_address][phone_number]',billing_address[:phone_number], class: 'form-control' %>
+        </div>
     </div>
 
     <div id="shipping_address" class="col-md-6">
@@ -50,43 +51,46 @@
         </h3>
 
         <div class="form-group">
-            <label for=""><%= t('.firstname') %></label>
+            <label><%= t('.firstname', default: 'First Name') %></label>
             <%= text_field_tag 'order[shipping_address][first_name]', shipping_address[:first_name], class: 'form-control required' %>
-
         </div>
         <div class="form-group">
-            <label for=""><%= t('.lastname') %></label>
+            <label><%= t('.lastname', default: 'Last Name') %></label>
             <%= text_field_tag 'order[shipping_address][last_name]', shipping_address[:last_name], class: 'form-control required' %>
         </div>
         <div class="form-group">
-            <label for=""><%= t('.address') %></label>
+            <label><%= t('.address', default: 'Address') %></label>
             <%= text_field_tag 'order[shipping_address][address1]', shipping_address[:address1], class: 'form-control required' %>
         </div>
         <div class="form-group">
-            <label for=""><%= t('.address') %> 2</label>
+            <label><%= t('.address', default: 'Address') %> 2</label>
             <%= text_field_tag 'order[shipping_address][address2]', shipping_address[:address2], class: 'form-control' %>
         </div>
         <div class="form-group">
-            <label for=""><%= t('.city') %></label>
+            <label><%= t('.city', default: 'City') %></label>
             <%= text_field_tag 'order[shipping_address][city]', shipping_address[:city], class: 'form-control required' %>
         </div>
         <div class="form-group">
-            <label for=""><%= t('.country') %></label>
+            <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' } %>
         </div>
         <div class="form-group">
-            <label for=""><%= t('.state') %></label>
+            <label><%= t('.state', default: 'State') %></label>
             <%= text_field_tag 'order[shipping_address][state]', shipping_address[:state], class: 'form-control' %>
         </div>
         <div class="form-group">
-            <label for=""><%= t('.code_zip') %></label>
+            <label><%= t('.code_zip', default: 'Zip code') %></label>
             <%= text_field_tag 'order[shipping_address][zip]', shipping_address[:zip], class: 'form-control' %>
         </div>
+        <div class="form-group">
+            <label><%= t('.phone_number', default: 'Phone Number') %></label>
+            <%= text_field_tag 'order[shipping_address][phone_number]', shipping_address[:phone_number], class: 'form-control' %>
+        </div>
     </div>
     <div class="clearfix"></div>
     <% unless defined?(as_partial) %>
         <div class="text-right col-md-12">
-            <button type="submit" class="btn btn-primary">Next</button>
+            <button type="submit" class="btn btn-primary"><%= t('.next', default: 'Next') %></button>
         </div>
     <% end %>
 </div>

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

@@ -1,8 +1,7 @@
 <%= render plugin_view('partials/cart_widget') %>
-<% @field_values = @post.get_field_values_hash %>
 <div class="row">
     <div class="col-md-9 post-view">
-        <article class="post-content">
+        <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">
@@ -36,16 +35,27 @@
 
                 <div class="col-md-6">
                     <h1><%= @post.the_title %></h1>
-                    <h3><%= t('plugins.ecommerce.single.sku', default: 'SKU') %>: <%= @post.the_sku %>
-                        <span class="pull-right"><%= raw @post.the_featured_status %></span></h3>
-                    <h4><%= @post.the_price %> <span class="pull-right"><%= raw @post.the_stock_status %></span></h4>
+                    <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? %>
-                        <p><%= t('plugins.ecommerce.single.available_items', default: 'Items available') %>: <%= @post.the_qty_real %></p>
                         <% 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>
+                                    </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 %>
@@ -67,22 +77,28 @@
                         <%= raw @post.the_content %>
                     </div>
                 </div>
-
-                <% attrs = []; @field_values[:ecommerce_attrs].to_a.each { |attr| attrs << JSON.parse(attr) rescue {} } %>
-                <% if attrs.present? %>
+                <% 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 do |data| %>
+                            <% attrs.each_with_index do |attr, index| %>
                                 <tr>
-                                    <td><strong><%= data['attr'].to_s.translate %></strong></td>
-                                    <td><%= data['value'].to_s.translate %></td>
+                                    <td><strong><%= attr['attr'].to_s.translate %></strong></td>
+                                    <td><%= attr['value'].to_s.translate %></td>
                                 </tr>
                             <% end %>
                         </table>
                     </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>
+            <% end %>
         </article>
     </div>
     <div class="col-md-3">

data/config/camaleon_plugin.json

@@ -26,23 +26,15 @@
     "admin_before_load": [
       "ecommerce_admin_before_load"
     ],
-    "on_render_post": [
-      "ecommerce_on_render_post"
-    ],
-    "on_render_post_type": [
-      "ecommerce_on_render_post_type"
-    ],
     "list_post": [
       "ecommerce_admin_list_post"
     ],
     "app_before_load": [
       "ecommerce_app_before_load"
     ],
-    "edit_post": [
-      "ecommerce_form_post"
-    ],
-    "new_post": [
-      "ecommerce_form_post"
-    ]
+    "post_form_custom_html": ["ecommerce_admin_product_form"],
+    "created_post": ["ecommerce_admin_product_created"],
+    "updated_post": ["ecommerce_admin_product_created"]
+
   }
 }

data/config/custom_models.rb

@@ -7,10 +7,20 @@ Rails.application.config.to_prepare do
     has_many :shipping_methods, :class_name => "Plugins::Ecommerce::ShippingMethod", foreign_key: :parent_id, dependent: :destroy
     has_many :coupons, :class_name => "Plugins::Ecommerce::Coupon", foreign_key: :parent_id, dependent: :destroy
     has_many :tax_rates, :class_name => "Plugins::Ecommerce::TaxRate", foreign_key: :parent_id, dependent: :destroy
+    has_many :product_attributes, :class_name => "Plugins::Ecommerce::Attribute", foreign_key: :site_id, dependent: :destroy
     def products
       post_types.where(slug: 'commerce').first.try(:posts)
     end
   end
+  
+  CamaleonCms::User.class_eval do
+    has_many :carts, class_name: 'Plugins::Ecommerce::Cart', foreign_key: :user_id
+    has_many :orders, class_name: 'Plugins::Ecommerce::Order', foreign_key: :user_id
+  end
+
+  CamaleonCms::Post.class_eval do
+    has_many :product_variations, class_name: 'Plugins::Ecommerce::ProductVariation', foreign_key: :product_id, dependent: :destroy
+  end
 
   CamaleonCms::SiteDecorator.class_eval do
     def current_unit

data/config/locales/en.yml

@@ -190,3 +190,6 @@
         order_received_admin:
           subject: "New purchase"
 
+
+
+

data/config/locales/es.yml

@@ -17,6 +17,7 @@ es:
       edit_coupon: "Editar Cupón"
       edit_order: "Editar Pedido"
       all_products: "Todos los Productos"
+      product_attributes: 'Atributos de Productos'
       add_new: "Agregar Nuevo"
       add_tax_rate: "Agregar Tasa de Impuesto"
       add_price: "Agregar Precio"
@@ -218,6 +219,38 @@ es:
         order_received_admin:
           subject: "Nueva Compra"
 
+  plugins:
+      ecommerce:
+        admin:
+          product_attributes:
+            group_label: 'Etiqueta de Grupo'
+            label: 'Etiqueta'
+            value: 'Valor'
+            title: 'Atributos de Producto'
+            add_attr_group: 'Agregar nuevo grupo'
+            add_new_value: 'Agregar valor'
+            values: 'Valores'
+            code: 'Código'
+            confirm_delete: 'Esta seguro de eliminar?'
+
+          save_product_attributes:
+            saved_product_attributes: 'Atributos guardados'
+
+
+          products:
+            variations:
+              title: 'Variaciones de Producto'
+              attributes: 'Atributos'
+              add_new_variation: 'Agregar Variación'
+              add_new_value: 'Agregar nuevo valor'
+              photo: 'Foto'
+              sku: 'SKU'
+              price: 'Precio'
+              weight: 'Peso'
+              qty: 'Cantidad'
+              confirm_del: 'Esta seguro de eliminar esta variación?'
+
+
   # frontend
   plugins:
     ecommerce:
@@ -225,7 +258,8 @@ es:
         cart_no_products: 'No existen productos en su carro'
         checkout: 'Pago'
         saved_order: 'Orden guardado'
-        not_enough_product_qty: 'No existen suficientes productos "%{product}" (%{qty})'
+        not_enough_product_qty: 'No existen suficientes productos "%{product}" (Disponible %{qty})'
+        missing_variation: 'Variación de producto no válido'
         added_product_in_cart: 'Producto agregado al carrito'
         cart_updated: 'Carro de compras actualizado'
         cart_deleted: 'Producto eliminado de su carro de compras'
@@ -274,50 +308,7 @@ es:
           cart_update:
             updated_products: 'Carro de compras actualizado'
 
-          index:
-            title: 'Información de Pedido'
-            user_details: 'Detalles de Comprador'
-            name: 'Nombre'
-            email: 'Correo Electrónico'
-            phone: 'Teléfono'
-            coupon: 'Cupón de descuento'
-            coupon_msg: 'Ingrese aquí su código'
-            apply: 'Aplicar'
-            shipping_options: 'Opciones de Envío'
-            shipping_method: 'Método de envío'
-            no_shipping_methods: 'No se han definido los métodos de envío'
-            create_order: 'Crear Orden de Compra'
-            total: 'Total'
-            qty: 'Cantidad'
-            item: 'Item'
-            price: 'Precio'
-            tax: 'Impuestos'
-            subtotal: 'Sub Total'
-            total_excl: 'Total (excluyendo impuestos)'
-            discount: 'Descuento'
-            total_shipping: 'Total envío'
-            total_price: 'Precio Total'
         orders:
-          select_payment:
-            title: 'Método de Pago'
-            paypal: 'Paypal'
-            bank_transfer: 'Transferencia Bancaria'
-            account_number: 'Número de Cuenta'
-            details_transfer: 'Detalles'
-            credit_card: 'Tarjeta de Crédito'
-            authorize_net: 'Authorize.net'
-            stripe: 'Stripe'
-            order_now: 'Comprar'
-            order_details: 'Detalles de Orden'
-            first_name: 'Nombre'
-            last_name: 'Apellidos'
-            card_number: 'Tarjeta de Crédito'
-            exp_date: 'Fecha de expiración'
-            cvv: 'Código CVV'
-            code_key: 'Código / ID / KEY / TICKET'
-            bank_owner: 'Nombre de Cuenta en el banco'
-            bank_name: 'Nombre del banco'
-            descr: 'Descripción'
           index:
             title: 'Mis Ordenes'
             id: 'ID'
@@ -354,6 +345,18 @@ es:
             track_url: 'Url de seguimiento'
             no_shipping: 'Metodo de envío no asignado'
             no_shipped: 'No enviado'
+            phone_number: 'Número de Teléfono'
+            total: 'Total'
+            qty: 'Cantidad'
+            item: 'Item'
+            price: 'Precio'
+            tax: 'Impuestos'
+            subtotal: 'Sub Total'
+            total_excl: 'Total (excluyendo impuestos)'
+            discount: 'Descuento'
+            total_shipping: 'Total envío'
+            total_price: 'Precio Total'
+
         login:
           login: 'Acceder'
           register: 'Registro'
@@ -367,16 +370,71 @@ es:
 
 
       partials:
-        form_address:
-          firstname: 'Nombre(s)'
-          lastname: 'Apellido'
-          address: 'Dirección'
-          city: 'Ciudad'
-          country: 'País'
-          state: 'Estado'
-          code_zip: 'Código Zip'
-          shipping_address: 'Dirección de envío'
-          copy_address: 'Copiar mis datos de envío'
+        checkout:
+          user_info:
+            firstname: 'Nombre(s)'
+            lastname: 'Apellido'
+            address: 'Dirección'
+            city: 'Ciudad'
+            country: 'País'
+            state: 'Estado'
+            code_zip: 'Código Zip'
+            billing_address: "Dirección de facturación"
+            shipping_address: 'Dirección de envío'
+            copy_address: 'Copiar mis datos de envío'
+            phone_number: 'Número de Teléfono'
+            next: 'Siguiente'
+
+          payments:
+            title: 'Método de Pago'
+            paypal: 'Paypal'
+            bank_transfer: 'Transferencia Bancaria'
+            account_number: 'Número de Cuenta'
+            details_transfer: 'Detalles'
+            credit_card: 'Tarjeta de Crédito'
+            authorize_net: 'Authorize.net'
+            stripe: 'Stripe'
+            order_now: 'Comprar'
+            order_details: 'Detalles de Orden'
+            first_name: 'Nombre'
+            last_name: 'Apellidos'
+            card_number: 'Tarjeta de Crédito'
+            exp_date: 'Fecha de expiración'
+            cvv: 'Código CVV'
+            code_key: 'Código / ID / KEY / TICKET'
+            bank_owner: 'Nombre de Cuenta en el banco'
+            bank_name: 'Nombre del banco'
+            descr: 'Descripción'
+
+          products_details:
+            title: 'Información de Pedido'
+            user_details: 'Detalles de Comprador'
+            name: 'Nombre'
+            email: 'Correo Electrónico'
+            phone: 'Teléfono'
+
+            shipping_options: 'Opciones de Envío'
+            shipping_method: 'Método de envío'
+            no_shipping_methods: 'No se han definido los métodos de envío'
+            create_order: 'Crear Orden de Compra'
+            total: 'Total'
+            qty: 'Cantidad'
+            item: 'Item'
+            price: 'Precio'
+            tax: 'Impuestos'
+            subtotal: 'Sub Total'
+            total_excl: 'Total (excluyendo impuestos)'
+            discount: 'Descuento'
+            total_shipping: 'Total envío'
+            total_price: 'Precio Total'
+
+          details:
+            coupon: 'Cupón de descuento'
+            coupon_msg: 'Ingrese aquí su código'
+            apply: 'Aplicar'
+            shipping_options: 'Opciones de Envío'
+            next: 'Siguiente'
+
         cart_widget:
           shopping_cart: 'Carro de compras'
           products_list: 'Lista de productos'