camaleon_ecommerce 1.2.1 → 2.0.0

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

@@ -1,3 +1,4 @@
+<%= content_tag :div, "<small><i>#{@cart.shipping_method.description.translate}</i></small>".html_safe, class: 'shipping_method_descr text-right' if @cart.shipping_method_id.present? %>
 <div id="totals_section">
     <h3><%= t('.total', default: 'Total') %></h3>
     <table class="table table-bordered">
@@ -10,10 +11,12 @@
             <th id="tax_col"><%= t('.tax', default: 'Tax') %></th>
             <th id="subtotal_col"><%= t('.subtotal', default: 'Sub Total') %></th>
         </tr>
-        <% @cart.product_items.decorate.each do |item| product = item.product.decorate %>
+        <% @cart.product_items.decorate.each do |item| %>
             <tr>
                 <td><%= item.qty %></td>
-                <td><%= link_to(item.the_title, product.the_url) %></td>
+                <td>
+                    <%= link_to(item.the_title, item.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

@@ -47,7 +47,6 @@
     <div id="shipping_address" class="col-md-6">
         <h3>
             <%= t('.shipping_address') %>
-            <small><a href="#" id="ec_copy">(<%= t('.copy_address', default: 'copy from billing') %>)</a></small>
         </h3>
 
         <div class="form-group">

data/app/views/plugins/ecommerce/partials/email/_billing_address.html.erb

@@ -0,0 +1,11 @@
+<% detail = order.get_meta("billing_address", {}) %>
+<ul class="ec-list-orders-address">
+    <li><strong><%= t('.address', default: 'Address') %>1:</strong> <%= detail[:address1] %></li>
+    <li><strong><%= t('.address', default: 'Address') %>2:</strong> <%= detail[:address2] %></li>
+    <li><strong><%= t('.city', default: 'City') %>:</strong> <%= detail[:city] %></li>
+    <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>

data/app/views/plugins/ecommerce/partials/email/_product_table.html.erb

@@ -0,0 +1,46 @@
+<table style="width: 100%;">
+    <tbody>
+    <tr>
+        <th><%= t('.qty', default: 'Quantity') %></th>
+        <th><%= t('.item', default: 'Item') %></th>
+        <th><%= t('.price', default: 'Price') %></th>
+
+        <th><%= t('.tax', default: 'Tax') %></th>
+        <th><%= t('.subtotal', default: 'Sub Total') %></th>
+    </tr>
+    <% order.product_items.decorate.each do |item| %>
+        <tr>
+            <td><%= item.qty %></td>
+            <td><%= link_to(item.cache_the_title, item.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 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>

data/app/views/plugins/ecommerce/partials/email/_shipping_address.html.erb

@@ -0,0 +1,11 @@
+<% detail = order.get_meta("shipping_address", {}) %>
+<ul class="ec-list-orders-address">
+    <li><strong><%= t('.address', default: 'Address') %>1:</strong> <%= detail[:address1] %></li>
+    <li><strong><%= t('.address', default: 'Address') %>2:</strong> <%= detail[:address2] %></li>
+    <li><strong><%= t('.city', default: 'City') %>:</strong> <%= detail[:city] %></li>
+    <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>

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

@@ -7,39 +7,37 @@
 <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 %>
+<%= 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 params[:variation_id].to_s == variation.id.to_s %> <%= 'data-disabled="true"' if !product.in_stock?(variation.id) %> 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'));
+                    panel.find('#e_add_to_cart_field_group input, button').prop('disabled', !!op.attr('data-disabled'))
+                    panel.find('#ecommerce-product-slider .carousel-indicators li:eq('+$(this).children().index(op)+')').click();
+                }).trigger('change');
+            });
+        </script>
+    <% end %>
+    <% if product.in_stock? %>
+        <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 %>
+            <%= 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>
     <% 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,20 +1,16 @@
-<% 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 %>
+<% args={custom_slider: nil, custom_footer: nil, extra_footer: nil, custom_sidebar: nil, product: @post}; hooks_run('ecommerce_product_page', args) # permit custom footer %>
+<%= render 'post_types/commerce/cart_widget' %>
 <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">
                     <% unless args[:custom_slider].present? %>
-                        <div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
+                        <div id="ecommerce-product-slider" class="carousel slide" data-ride="carousel" data-interval="false">
                             <!-- 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>
+                                    <li data-target="#ecommerce-product-slider" data-slide-to="<%= index %>" class="<%= 'active' if index == 0 %>"></li>
                                 <% end %>
                             </ol>
 
@@ -28,11 +24,11 @@
                             </div>
 
                             <!-- Controls -->
-                            <a class="left carousel-control" href="#carousel-example-generic" role="button" data-slide="prev">
+                            <a class="left carousel-control" href="#ecommerce-product-slider" 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">
+                            <a class="right carousel-control" href="#ecommerce-product-slider" 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>
@@ -49,14 +45,14 @@
 
             <% unless args[:custom_footer].present? %>
                 <div class="row">
-                    <div class="col-md-6">
+                    <div class="col-md-12">
                         <h3><%= t('plugins.ecommerce.single.descr', default: 'Description') %></h3>
                         <div class="item-content">
                             <%= raw @post.the_content %>
                         </div>
                     </div>
-                    <% if (attrs = @post.the_attribute_fields('ecommerce_attrs').to_a).present? %>
-                        <div class="col-md-6">
+                    <% if (attrs = @post.the_attribute_fields('ecommerce_attrs').to_a).present? && attrs.map{|k,v| v.present? }.any? %>
+                        <div class="col-md-12">
                             <h3><%= t('plugins.ecommerce.single.attrs', default: 'Attributes') %></h3>
                             <table class="table table-bordered">
                                 <% attrs.each_with_index do |attr, index| %>

data/config/camaleon_plugin.json

@@ -30,6 +30,7 @@
     ],
     "post_form_custom_html": ["ecommerce_admin_product_form"],
     "created_post": ["ecommerce_admin_product_saved"],
-    "updated_post": ["ecommerce_admin_product_saved"]
+    "updated_post": ["ecommerce_admin_product_saved"],
+    "email_late": ["ecommerce_admin_before_email_send"]
   }
 }

data/config/custom_models.rb

@@ -24,6 +24,49 @@ Rails.application.config.to_prepare do
       end
       payment_method
     end
+
+    # return the invoice number to start
+    def e_invoice_number_from
+      (e_settings[:invoice_number_from] || 1000000000).to_s.to_i
+    end
+
+    # return the invoice number to end
+    def e_invoice_number_to
+      (e_settings[:invoice_number_to] || 9999999999).to_s.to_i
+    end
+
+    # set a new value for of a ecommerce setting
+    def e_set_setting(key, value)
+      set_option(key, value, '_setting_ecommerce')
+    end
+
+    # return the settings for ecommerce
+    def e_settings(new_settings = nil)
+      set_meta('_setting_ecommerce', new_settings) if new_settings.present?
+      get_meta("_setting_ecommerce", {})
+    end
+
+    # return the email template for ecommerce events
+    def e_email_for(key = 'email_order_paid')
+      (e_settings[key]) || case key.to_s
+                                  when 'email_order_received'
+                                    '<h1>ORDER SUMMARY {number}</h1> Dear {name}, please review and retain the following order information for your records.<br>{order_table}'
+                                  when 'email_order_confirmed'
+                                    '<h1>ORDER CONFIRMED {number}</h1> Dear {name}, your order has been confirmed. Please retain the following order information for your records<br>{order_table}'
+                                  when 'email_order_shipped'
+                                    '<h1>SHIPMENT SUMMARY</h1> Dear {name}, your order {number} has been shipped. Shipped method: {shipping_name} <br>{order_table}<br>{tracking_url}'
+                                  when 'email_order_cancelled'
+                                    '<h1>ORDER {number} CANCELLED</h1> Dear {name}, your order has been cancelled. Please retain this cancellation information for your records. <br>{order_table}'
+                                  when 'email_order_invoice'
+                                    '<table style="width: 100%;"><tr><td><h1>INVOICE #{invoice_number}</h1> <h4>Order #{number}</h4><div>{current_date}</div></td><td style="text-align: center;"><img src="http://camaleon.tuzitio.com/media/132/logo2.png"></td></tr></table> <table style="width: 100%;"><tr><td><strong>Billing Address</strong><br>{billing_info}</td><td><strong>Shipping Address</strong><br>{shipping_info}</td></tr><tr><td colspan="2">{order_table}</td></tr></table>'
+                                end
+    end
+
+    # return all keys accepted to replace in ecommerce emails
+    def e_email_keys
+      '{root_url} => site url, {date} => order date, {number} => order number, {name} => client first name, {full_name}, {order_table} => table of products of the order, {shipping_name} => shipping method name, {tracking_url} => the url of tracking, {shipping_info} => Shipping info, {billing_info} => Billing info, {invoice_number} => Sequential Invoice Number, {url} => Order Url'
+    end
+
   end
 
   CamaleonCms::User.class_eval do

data/config/locales/en.yml

@@ -14,7 +14,6 @@
       accepted: 'Accepted'
       coupons: 'Coupons'
       e_commerce: 'E-Commerce'
-      e_commerce_settings: 'E-commerce Settings'
       e_mail_address: 'E-Mail Address'
       edit_tax_rate: 'Edit Tax Rate'
       edit_shipping_methods: 'Edit Shipping Method'

data/config/locales/es.yml

@@ -54,6 +54,8 @@ es:
       list_payment_methods: "Lista Métodos de Pago"
       list_coupons: "Lista Cupones"
       mark_Shipped: "Marcar como enviado"
+      variations:
+        not_deletable_product_variations: 'Algunos variaciones de producto no pueden ser eliminados'
       message:
         consignment_number: "Use {{numero_envio}} para insertar el no."
         error_paypal_values: "Error Valores Paypal"
@@ -68,6 +70,7 @@ es:
         order_accepted: 'Orden aceptado'
         order_shipped: 'Orden enviado'
         order_canceled: 'Orden cancelado'
+        order_email_resent: 'Correo Re-Enviado'
         order_updated: 'Orden actualizado'
         not_deletable_product_variations: 'Algunas variaciones de producto no pueden ser eliminados.'
         not_deletable_product: 'El Producto no puede ser eliminado porque existen órdenes referenciadas.'
@@ -228,14 +231,45 @@ es:
           message: 'Tu orden %{order} a sido cancelado por la siguiente razon: %{message}'
 
       email:
-        order_received:
-          subject: "Gracias por su compra"
-        recovery_cart:
-          subject: "Hemos observado que usted a dejado pendiente una compra."
-        order_received_admin:
-          subject: "Nueva Compra"
+        invoice_number_exceeded_subject: 'Número de factura excedido.'
+        invoice_number_exceeded_body: 'El número de factura %{number} fué excedido. Por favor revise las configuraciones de comercio electrónico.'
+        order_received_label: 'Orden Recibido'
+        order_confirmed_label: 'Orden Confirmado'
+        order_bank_confirmed_label: 'Orden Confirmado Por Banco'
+        order_on_delivery_confirmed_label: 'Orden Confirmado Contra Entrega'
+        order_shipped_label: 'Orden Enviado'
+        order_cancelled_label: 'Orden Cancelado'
 
       admin:
+        settings:
+          index:
+            title: 'Configuración de Comercio Clectrónico'
+            keywords_to_use: 'Palabras Clave para usar'
+            email_settings: 'Email Settings'
+            system_currency_unit: 'Tipo de Moneda para el administrador'
+            currency_weight: 'Unidad de Peso'
+            invoice_number_from: 'Número de Inicio de facturación'
+            invoice_number_to: 'Número Final de facturación'
+            shipping_countries: 'Paises para envío'
+            available_currencies_unit: 'Unidades de Moneda disponibles para visitantes'
+            email_order_received: 'Orden Recibido'
+            email_order_confirmed: 'Orden Confirmado'
+            email_order_shipped: 'Orden Enviado'
+            email_order_cancelled: 'Orden Cancelado'
+            email_order_invoice: 'Formato de Factura'
+            select_all: 'Seleccionar todo'
+            deselect_all: 'Des seleccionar todo'
+
+
+        orders:
+          index:
+            search_field: 'Correo, Código o Cupón'
+            created_after: 'Creado despues de'
+            created_before: 'Creado antes de'
+            search_status: 'Estado'
+            search_user: 'Usuario'
+            resend_email: 'Reenviar Correo'
+
         product_attributes:
           group_label: 'Etiqueta de Grupo'
           label: 'Etiqueta'
@@ -354,7 +388,8 @@ es:
             details: 'Detalles'
             shipping_address: 'Dirección de envío'
             created_at: 'Fecha de Creación'
-            received_at: 'Received At'
+            received_at: 'Fecha de Recepción'
+            invoice_number: 'Número de Factura'
             shipped_at: 'Enviado En'
             city: 'Ciudad'
             state: 'Estado'
@@ -394,6 +429,33 @@ es:
 
 
       partials:
+        email:
+          billing_address:
+            address: 'Dirección'
+            city: 'Ciudad'
+            state: 'Estado'
+            zip_code: 'Código Zip'
+            country: 'País'
+            phone_number: 'Número de Teléfono'
+          shipping_address:
+            address: 'Dirección'
+            city: 'Ciudad'
+            state: 'Estado'
+            zip_code: 'Código Zip'
+            country: 'País'
+            phone_number: 'Número de Teléfono'
+
+          product_table:
+            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'
+
         checkout:
           user_info:
             firstname: 'Nombre(s)'

data/config/routes.rb

@@ -47,6 +47,7 @@ Rails.application.routes.draw do
         post 'product_attributes' => 'admin#save_product_attributes'
         resources :orders, controller: 'admin/orders' do
           get 'mark_accepted'
+          get 'resend_email'
           get 'mark_bank_confirmed'
           post 'mark_shipped'
           post 'mark_canceled'

data/db/migrate/20161213222142_add_invoice_number.rb

@@ -0,0 +1,6 @@
+class AddInvoiceNumber < ActiveRecord::Migration
+  def change
+    add_column :plugins_ecommerce_orders, :invoice_number, :string, default: ''
+    add_column :plugins_ecommerce_orders, :invoice_path, :string, default: ''
+  end
+end

data/db/migrate/20161214224919_remove_ecommerce_stock_field.rb

@@ -0,0 +1,7 @@
+class RemoveEcommerceStockField < ActiveRecord::Migration
+  def change
+    Cama::PostType.where(slug: 'commerce').each do |pt|
+      pt.get_field_object('ecommerce_stock').try(:destroy)
+    end
+  end
+end

data/lib/ecommerce/engine.rb

@@ -1,5 +1,7 @@
-require "country_select"
-require "activemerchant"
+require 'country_select'
+require 'ransack'
+require 'wicked_pdf'
+require 'activemerchant'
 module Ecommerce
   class Engine < ::Rails::Engine
   end

data/lib/ecommerce/version.rb

@@ -1,3 +1,3 @@
 module Ecommerce
-  VERSION = '1.2.1'
+  VERSION = '2.0.0'
 end