camaleon_ecommerce 1.2 → 1.2.1

data/config/camaleon_plugin.json

@@ -5,8 +5,7 @@
   "key": "ecommerce",
   "helpers": [
     "Plugins::Ecommerce::EcommerceHelper",
-    "Plugins::Ecommerce::EcommerceFunctionsHelper",
-    "Plugins::Ecommerce::EcommercePaymentHelper"
+    "Plugins::Ecommerce::EcommerceFunctionsHelper"
   ],
   "options": [
   ],
@@ -26,15 +25,11 @@
     "admin_before_load": [
       "ecommerce_admin_before_load"
     ],
-    "list_post": [
-      "ecommerce_admin_list_post"
-    ],
     "app_before_load": [
       "ecommerce_app_before_load"
     ],
     "post_form_custom_html": ["ecommerce_admin_product_form"],
-    "created_post": ["ecommerce_admin_product_created"],
-    "updated_post": ["ecommerce_admin_product_created"]
-
+    "created_post": ["ecommerce_admin_product_saved"],
+    "updated_post": ["ecommerce_admin_product_saved"]
   }
 }

data/config/custom_models.rb

@@ -8,11 +8,24 @@ Rails.application.config.to_prepare do
     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
+
+    # return all the products for current site
     def products
       post_types.where(slug: 'commerce').first.try(:posts)
     end
+
+    # return the payment (PaymentMethod) method with type = type
+    def payment_method(type)
+      payment_method = payment_methods.actives.detect do |payment_method|
+        payment_method.get_option('type') == type
+      end
+      if payment_method.nil?
+        raise ArgumentError, "Payment method #{type} is not found"
+      end
+      payment_method
+    end
   end
-  
+
   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
@@ -20,17 +33,28 @@ Rails.application.config.to_prepare do
 
   CamaleonCms::Post.class_eval do
     has_many :product_variations, class_name: 'Plugins::Ecommerce::ProductVariation', foreign_key: :product_id, dependent: :destroy
+    before_destroy :e_validate_related_orders
+
+    private
+    # verify if there are orders related to this product
+    def e_validate_related_orders
+      errors.add(:base, I18n.t('plugins.ecommerce.message.not_deletable_product')) if Plugins::Ecommerce::ProductItem.where(product_id: id).any?
+    end
   end
 
   CamaleonCms::SiteDecorator.class_eval do
+    # return the current system currency unit
     def current_unit
-      @current_unit ||= h.e_get_currency_units[object.meta[:_setting_ecommerce][:current_unit]]['symbol'] rescue '$'
+      h.e_system_currency
     end
+
+    # return the current system currency
     def currency_code
-      @currency_code ||= h.e_get_currency_units[object.meta[:_setting_ecommerce][:current_unit]]['code'] rescue 'USD'
+      h.e_system_currency
     end
+
     def current_weight
-      @current_weight ||= h.e_get_currency_weight[object.meta[:_setting_ecommerce][:current_weight]]['code'] rescue 'kg'
+      object.get_meta('_setting_ecommerce', {})[:current_weight].to_s.capitalize.presence || 'Kg'
     end
 
     # return all visible products fo current user in current site

data/config/locales/en.yml

@@ -1,6 +1,13 @@
 en:
-  plugin:
+  plugins:
     ecommerce:
+      currencies:
+        usd: 'US dollars'
+        eur: 'Euro'
+        gbp: 'British Pound Sterling'
+        jpy: 'Japanese Yen'
+        aud: 'Australian Dollar'
+
       active: 'Active'
       add_shipping_methods: 'Add Shipping Method'
       not_active: 'Not Active'
@@ -27,6 +34,7 @@
       by_paypal: 'By Paypal'
       by_credit_card: 'By credit card (with paypal)'
       by_authorize_net: 'By credit card (Authorize.net)'
+      by_on_delivery: 'Payment on delivery'
       details_shipping_methods: 'Shipping Method Details'
       details_payment_methods: 'Payment Methods Details'
       details_order: 'Details Order'
@@ -61,6 +69,9 @@
         accepted: 'Accepted'
         shipped: 'Shipped'
         updated: 'Updated'
+        not_deletable_product_variations: 'Some Product variations can not be deleted.'
+        not_deletable_product: 'The product can not be deleted because there are orders related.'
+
       method_paypal: 'Method by Paypal'
       method_credit_card: 'Method by Credit Card'
       method_bank_transfer: 'Method Bank Transfer'
@@ -102,19 +113,21 @@
       select:
         received: 'Received'
         unpaid: 'Unpaid'
+        paid: 'Paid'
         accepted: 'Accepted'
         shipped: 'Shipped'
         closed: 'Closed'
         canceled: 'Canceled'
-        kilogram: 'kilogram'
-        pound: 'pound'
-        dram: 'dram'
-        grain: 'grain'
-        gram: 'gram'
-        hundredweight: 'hundredweight'
-        milligram: 'milligram'
-        ounce: 'ounce'
-        tonne: 'tonne'
+        pending: 'Pending'
+        kilogram: 'Kilogram'
+        pound: 'Pound'
+        dram: 'Dram'
+        grain: 'Grain'
+        gram: 'Gram'
+        hundredweight: 'Hundredweight'
+        milligram: 'Milligram'
+        ounce: 'Ounce'
+        tonne: 'Tonne'
       table:
         address: 'Address'
         actions: 'Actions'
@@ -123,6 +136,9 @@
         city: 'City'
         code: 'Code'
         country: 'Country'
+        shipping_countries: 'Shipping Countries'
+        system_currency_unit: 'System Currency Unit'
+        available_currencies_unit: 'Visitor Available Currencies'
         currency_unit: 'Currency Unit'
         currency_weight: 'Currency Weight'
         customer: 'Customer'
@@ -156,6 +172,7 @@
         products: 'Products'
         rate: 'Rate'
         received_time: 'Received Time'
+        created_at: 'Created At'
         sandbox: 'Sandbox'
         shipping: 'Shipping'
         signature: 'Signature'
@@ -172,8 +189,6 @@
         transaction_key: 'Transaction key'
       tax_rates: 'Tax Rates'
       add_to_cart: 'Add to cart'
-      msg:
-        added_product_in_cart: 'Added product successfully in Cart.'
       mail:
         order_received:
           welcome: "Hi"

data/config/locales/es.yml

@@ -1,6 +1,5 @@
 es:
-  # backend
-  plugin:
+  plugins:
     ecommerce:
       accepted: "Aceptado"
       active: "Activo"
@@ -28,6 +27,8 @@ es:
       by_paypal: "Por Paypal"
       by_credit_card: "Tarjeta Crédito (PayPal)"
       by_authorize_net: "Tarjeta Crédito (Authorize.net)"
+      by_on_delivery: 'Pago Contra Entrega'
+      advanced_search: 'Búsqueda Avanzada'
       details_shipping_methods: "Detalle Método de Envío"
       details_payment_methods: "Detalle Método de Pago"
       details_order: "Detalle Pedido"
@@ -63,10 +64,14 @@ es:
         shipped: "Enviado"
         updated: "Actualizado"
         order_bank_confirmed: 'Pago Bancario Confirmado'
+        order_on_delivery_confirmed: 'Pago Contra Entrega Confirmado'
         order_accepted: 'Orden aceptado'
         order_shipped: 'Orden enviado'
         order_canceled: 'Orden cancelado'
         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.'
+
       method_paypal: "Método por Paypal"
       method_credit_card: "Método por Tarjeta de Credito"
       method_bank_transfer: "Método Transferencia Bancaria"
@@ -111,15 +116,23 @@ es:
       shipped_date: "Fecha de Envío"
       search_order_number: "Buscar número de pedido"
       select:
-        kilogram: "kilogramo"
-        pound: "libra"
-        dram: "dracma"
-        grain: "grano"
-        gram: "gramo"
-        hundredweight: "quintal"
-        milligram: "miligramo"
-        ounce: "onza"
-        tonne: "tonelada"
+        received: 'Recibido'
+        unpaid: 'No Pagado'
+        paid: 'Pagado'
+        accepted: 'Aceptado'
+        shipped: 'Enviado'
+        closed: 'Cerrado'
+        canceled: 'Cancelado'
+        pending: 'Pendiente'
+        kilogram: "Kilogramo"
+        pound: "Libra"
+        dram: "Dracma"
+        grain: "Grano"
+        gram: "Gramo"
+        hundredweight: "Quintal"
+        milligram: "Miligramo"
+        ounce: "Onza"
+        tonne: "Tonelada"
       table:
         address: "Dirección"
         actions: "Acciones"
@@ -129,6 +142,9 @@ es:
         code: "CÓDIGO"
         country: "País"
         currency_unit: "Unidad de Moneda"
+        system_currency_unit: 'Unidad de Moneda Administrador'
+        available_currencies_unit: 'Unidades de Moneda para Visitantes'
+        shipping_countries: 'Paises Para Envío'
         currency_weight: "Unidad de Peso"
         customer: "Cliente"
         customer_info: "Información del cliente"
@@ -167,6 +183,7 @@ es:
         products: "Productos"
         rate: "Tarifa"
         received_time: "Tiempo Recibido"
+        created_at: 'Fecha de Creación'
         sandbox: "Cuentas de Prueba"
         shipping: "Envío"
         signature: "Firma"
@@ -187,8 +204,7 @@ es:
 
       tax_rates: "Tasas de Impuesto"
       add_to_cart: "Añadir al carro"
-      msg:
-        added_product_in_cart: "Producto añadido al carro correctamente."
+
       shipping_prices: "Precios de envío"
       mark_shipped: "Marcar como enviado"
       mail:
@@ -219,41 +235,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'
+      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?'
+        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:
+  #plugins:
+  #  ecommerce:
       messages:
         cart_no_products: 'No existen productos en su carro'
         checkout: 'Pago'
@@ -267,6 +280,7 @@ es:
         invalid_access: 'Acceso no válido'
         created_account: 'Cuenta creada satisfactoriamente'
         my_orders: 'Mis Ordenes'
+        order_not_found: 'Orden no encontrado'
         detail_order: 'Detalles de orden: #%{order}'
         coupon_not_found: 'Cupón no encontrado'
         coupon_expired: 'Cupón expirado'
@@ -278,6 +292,7 @@ es:
         required_minimum_price: 'El monto de tu compra debe ser superior a %{min_amount}'
         order_status:
           bank_pending: 'Pendiente de confirmación'
+          on_delivery: 'Pendiente de confirmación'
           canceled: 'Cancelado'
           paid: 'Pagado'
           shipped: 'Enviado'
@@ -292,9 +307,15 @@ es:
         attrs: 'Atributos'
         sku: 'SKU'
         noavailable_items: 'No hay items disponibles'
+        no_stock: 'Producto fuera de stock'
 
       front:
+        breadcrumb:
+          home: 'Inicio'
         checkout:
+          index:
+            check_out_process: 'Proceso de Pago'
+            step: 'Paso'
           cart_index:
             item: 'Item'
             tax: 'Impuesto'
@@ -332,6 +353,9 @@ es:
             address: 'Dirección'
             details: 'Detalles'
             shipping_address: 'Dirección de envío'
+            created_at: 'Fecha de Creación'
+            received_at: 'Received At'
+            shipped_at: 'Enviado En'
             city: 'Ciudad'
             state: 'Estado'
             zip_code: 'Código zip'
@@ -365,8 +389,8 @@ es:
           pass: 'Password'
           email: 'Correo Electrónico'
           full_name: 'Nombre Completo'
-          confirm_pass: 'Confirme Password'
-          create_account: 'Create cuenta'
+          confirm_pass: 'Repetir Password'
+          create_account: 'Crear cuenta'
 
 
       partials:
@@ -406,7 +430,7 @@ es:
             bank_name: 'Nombre del banco'
             descr: 'Descripción'
 
-          products_details:
+          products_detail:
             title: 'Información de Pedido'
             user_details: 'Detalles de Comprador'
             name: 'Nombre'
@@ -444,17 +468,6 @@ es:
           total: 'Total'
 
 
-        table_order_products:
-          qty: 'Cantidad'
-          item: 'Item'
-          price: 'Precio'
-          tax: 'Impuesto'
-          sub_total: 'Sub Total'
-          total_excluding_tax: 'Total (excluyendo impuestos)'
-          shipping: 'Total Envio'
-          total_price: 'Precio Total'
-          discounts: 'Descuentos'
-          sub_total: 'Sub Total'
 
 
 

data/config/routes.rb

@@ -19,6 +19,7 @@ Rails.application.routes.draw do
             post 'pay_by_authorize_net'
             post 'pay_by_stripe'
             post 'pay_by_paypal'
+            post 'pay_by_on_delivery'
           end
         end
 

data/db/migrate/20161202182552_add_cookie_key_to_cart.rb

@@ -0,0 +1,5 @@
+class AddCookieKeyToCart < ActiveRecord::Migration
+  def change
+    add_column :plugins_ecommerce_orders, :visitor_key, :string
+  end
+end

data/lib/ecommerce/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_ecommerce
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: 1.2.1
 platform: ruby
 authors:
 - Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-31 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: country_select
   requirement: !ruby/object:Gem::Requirement
@@ -116,11 +116,9 @@ files:
 - app/helpers/plugins/ecommerce/ecommerce_email_helper.rb
 - app/helpers/plugins/ecommerce/ecommerce_functions_helper.rb
 - app/helpers/plugins/ecommerce/ecommerce_helper.rb
-- app/helpers/plugins/ecommerce/ecommerce_payment_helper.rb
 - app/models/plugins/ecommerce/attribute.rb
 - app/models/plugins/ecommerce/cart.rb
 - app/models/plugins/ecommerce/coupon.rb
-- app/models/plugins/ecommerce/legacy_cart.rb
 - app/models/plugins/ecommerce/legacy_order.rb
 - app/models/plugins/ecommerce/order.rb
 - app/models/plugins/ecommerce/order_detail.rb
@@ -131,11 +129,6 @@ files:
 - app/models/plugins/ecommerce/tax_rate.rb
 - app/services/plugins/ecommerce/cart_service.rb
 - app/services/plugins/ecommerce/order_service.rb
-- app/services/plugins/ecommerce/product_item_service.rb
-- app/services/plugins/ecommerce/product_service.rb
-- app/services/plugins/ecommerce/site_service.rb
-- app/services/plugins/ecommerce/user_cart_service.rb
-- app/services/plugins/ecommerce/user_product_service.rb
 - app/services/plugins/ecommerce/util_service.rb
 - app/views/camaleon_cms/html_mailer/order_canceled.html.erb
 - app/views/camaleon_cms/html_mailer/order_confirmed.html.erb
@@ -173,9 +166,8 @@ files:
 - app/views/plugins/ecommerce/partials/checkout/_payments.html.erb
 - app/views/plugins/ecommerce/partials/checkout/_products_detail.html.erb
 - app/views/plugins/ecommerce/partials/checkout/_user_info.html.erb
-- app/views/post_types/commerce.html.erb
-- app/views/post_types/commerce/_product_widget.html.erb
-- app/views/post_types/commerce/category.html.erb
+- app/views/post_types/commerce/_post_list_item.html.erb
+- app/views/post_types/commerce/_product_info.html.erb
 - app/views/post_types/commerce/single.html.erb
 - config/camaleon_plugin.json
 - config/currency.json
@@ -190,6 +182,7 @@ files:
 - db/migrate/20160620200501_add_product_attributes_structure.rb
 - db/migrate/20160825174848_set_cama_post_decorator_class.rb
 - db/migrate/20160825232739_migrate_order_data.rb
+- db/migrate/20161202182552_add_cookie_key_to_cart.rb
 - lib/camaleon_ecommerce.rb
 - lib/ecommerce.rb
 - lib/ecommerce/engine.rb