camaleon_ecommerce 1.1 → 1.2

data/app/controllers/plugins/ecommerce/front/orders_controller.rb

@@ -1,11 +1,3 @@
-=begin
-  Camaleon CMS is a content management system
-  Copyright (C) 2015 by Owen Peredo Diaz
-  Email: owenperedo@gmail.com
-  This program is free software: you can redistribute it and/or modify   it under the terms of the GNU Affero General Public License as  published by the Free Software Foundation, either version 3 of the  License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the  GNU Affero General Public License (GPLv3) for more details.
-=end
 class Plugins::Ecommerce::Front::OrdersController < Plugins::Ecommerce::FrontController
   before_action :commerce_authenticate
   before_action :set_bread
@@ -16,13 +8,13 @@ class Plugins::Ecommerce::Front::OrdersController < Plugins::Ecommerce::FrontCon
 
   def show
     @order = current_site.orders.find_by_slug(params[:order]).decorate
-    @ecommerce_bredcrumb << [t('plugins.ecommerce.messages.detail_order', default: "Detail order: #%{order}", order: params[:order])]
+    @ecommerce_breadcrumb << [t('plugins.ecommerce.messages.detail_order', default: "Detail order: #%{order}", order: params[:order])]
   end
 
 
 
   private
   def set_bread
-    @ecommerce_bredcrumb << [t('plugins.ecommerce.messages.my_orders', default: 'My Orders'), url_for(action: :index)]
+    @ecommerce_breadcrumb << [t('plugins.ecommerce.messages.my_orders', default: 'My Orders'), url_for(action: :index)]
   end
 end

data/app/controllers/plugins/ecommerce/front_controller.rb

@@ -1,11 +1,3 @@
-=begin
-  Camaleon CMS is a content management system
-  Copyright (C) 2015 by Owen Peredo Diaz
-  Email: owenperedo@gmail.com
-  This program is free software: you can redistribute it and/or modify   it under the terms of the GNU Affero General Public License as  published by the Free Software Foundation, either version 3 of the  License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the  GNU Affero General Public License (GPLv3) for more details.
-=end
 class Plugins::Ecommerce::FrontController < CamaleonCms::Apps::PluginsFrontController
   include Plugins::Ecommerce::EcommercePaymentHelper
   before_action :ecommerce_add_assets_in_front

data/app/decorators/plugins/ecommerce/coupon_decorator.rb

@@ -1,11 +1,3 @@
-=begin
-  Camaleon CMS is a content management system
-  Copyright (C) 2015 by Owen Peredo Diaz
-  Email: owenperedo@gmail.com
-  This program is free software: you can redistribute it and/or modify   it under the terms of the GNU Affero General Public License as  published by the Free Software Foundation, either version 3 of the  License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the  GNU Affero General Public License (GPLv3) for more details.
-=end
 class Plugins::Ecommerce::CouponDecorator < CamaleonCms::TermTaxonomyDecorator
   delegate_all
 

data/app/decorators/plugins/ecommerce/product_decorator.rb

@@ -1,46 +1,89 @@
 class Plugins::Ecommerce::ProductDecorator < CamaleonCms::PostDecorator
-  def the_sku
-    object.get_field_value('ecommerce_sku').to_s
+
+  def the_sku(variation_id = nil)
+    sku(variation_id)
   end
-  def the_price
-    "#{h.current_site.current_unit}#{sprintf('%.2f', price)}"
+
+  def sku(variation_id = nil)
+    if variation_id.present?
+      get_variation(variation_id).sku
+    else
+      object.get_field_value('ecommerce_sku').to_s
+    end
   end
-  def the_weight
-    "#{h.current_site.current_weight} #{weight}"
+
+  def the_price(variation_id = nil)
+    "#{h.current_site.current_unit}#{sprintf('%.2f', price(variation_id))}"
   end
-  def weight
-    object.get_field_value('ecommerce_weight').to_f || 0
+
+  def the_weight(variation_id = nil)
+    "#{h.current_site.current_weight} #{weight(variation_id)}"
   end
-  def the_qty
-    object.get_field_value('ecommerce_qty') || 0
+
+  def weight(variation_id = nil)
+    if variation_id.present?
+      get_variation(variation_id).weight || 0
+    else
+      object.get_field_value('ecommerce_weight').to_f || 0
+    end
   end
+
+  def the_qty(variation_id = nil)
+    if variation_id.present?
+      get_variation(variation_id).qty || 0
+    else
+      object.get_field_value('ecommerce_qty') || 0
+    end
+  end
+
   def the_photos
     object.get_field_values('ecommerce_photos') || []
   end
-  def in_stock?
-    object.get_field_value('ecommerce_stock').to_s.to_bool
+
+  def in_stock?(variation_id = nil)
+    if variation_id.present?
+      get_variation(variation_id).qty > 0
+    else
+      object.get_field_value('ecommerce_stock').to_s.to_bool
+    end
+  end
+
+  def price(variation_id = nil)
+    if variation_id.present?
+      get_variation(variation_id).amount || 0
+    else
+      object.get_field_value(:ecommerce_price).to_f || 0
+    end
   end
 
-  def price
-    object.get_field_value(:ecommerce_price).to_f || 0
+  # return the title for variation prefixed with the title of the product
+  def the_variation_title(variation_id = nil)
+    "#{the_title}#{" - #{get_variation(variation_id).attribute_values.pluck(:label).join(', ').translate.presence || 'Not defined'}" if variation_id.present? }"
   end
 
-  def the_tax
-    tax
+  # return a product variation by id
+  def get_variation(variation_id)
+    object.cama_fetch_cache("_get_variation_#{variation_id}") do
+      self.product_variations.find(variation_id)
+    end
   end
 
-  def tax
+  def the_tax(variation_id = nil)
+    tax(variation_id)
+  end
+
+  def tax(variation_id = nil)
     tax_rate_id = object.get_field_value(:ecommerce_tax)
     if tax_rate_id.present?
       percent = h.current_site.tax_rates.find(tax_rate_id).options[:rate].to_f  rescue 0
-      price * percent / 100
+      price(variation_id) * percent / 100
     else # tax not defined
       0
     end
   end
 
-  def the_stock_status
-    if in_stock? && the_qty_real.to_i > 0
+  def the_stock_status(variation_id = nil)
+    if in_stock?(variation_id) && the_qty_real.to_i > 0
       "<span class='label label-success'>#{I18n.t('plugin.ecommerce.product.in_stock')}</span>"
     else
       "<span class='label label-danger'>#{I18n.t('plugin.ecommerce.product.not_in_tock')}</span>"
@@ -60,29 +103,37 @@ class Plugins::Ecommerce::ProductDecorator < CamaleonCms::PostDecorator
   end
 
   # return the total of products available to sell
-  def the_qty_real
-    object.get_field_value('ecommerce_qty').to_f || 0
-  end
-
-  # decrement products quantity
-  # return false if the quantity is not enough to be decremented
-  def decrement_qty(qty)
-    val = (the_qty_real - qty).to_i
-    if val >= 0
-      object.update_field_value('ecommerce_qty', val)
-      true
+  def the_qty_real(variation_id = nil)
+    if h.current_user
+      Plugins::Ecommerce::UserProductService.new(
+        h.current_site, h.current_user, object, variation_id).available_qty
     else
-      false
+      Plugins::Ecommerce::ProductService.new(
+        h.current_site, object, variation_id).available_qty
     end
   end
 
   # check if there are enough products to be purchased
-  def can_added?(qty)
-    val = (the_qty_real - qty).to_i
-    val >= 0
+  def can_added?(qty, variation_id = nil)
+    (the_qty_real(variation_id) - qty).to_i >= 0
   end
 
   def self.object_class_name
     'CamaleonCms::Post'
   end
+
+  # verify if current product needs a variation id to be purchased
+  # return true/false
+  def valid_variation?(variation_id = nil)
+    if self.product_variations.any?
+      self.product_variations.where(id: variation_id).any?
+    else
+      true
+    end
+  end
+
+  # check if current product is a variation product
+  def is_variation_product?
+    @_cache_is_variation_product ||= self.product_variations.any?
+  end
 end

data/app/decorators/plugins/ecommerce/product_item_decorator.rb

@@ -1,18 +1,42 @@
 class Plugins::Ecommerce::ProductItemDecorator < Draper::Decorator
   delegate_all
+  def the_title
+    get_product.the_variation_title(object.variation_id)
+  end
+
   def the_sub_total
     "#{h.current_site.current_unit}#{sprintf('%.2f', object.sub_total)}"
   end
 
   def the_price
-    product.decorate.the_price
+    get_product.the_price(object.variation_id)
   end
 
   def the_tax
-    product.decorate.the_tax
+    get_product.the_tax(object.variation_id)
   end
 
   def price
-    product.decorate.price
+    get_product.price(object.variation_id)
+  end
+
+  def get_product
+    @_get_product ||= object.product.decorate
+  end
+
+  # return a product variation by id
+  def get_variation
+    @_get_variation ||= self.product_variation.decorate
+  end
+
+  # update quantity of product or product variation used in current cart item
+  def decrement_qty!
+    Plugins::Ecommerce::ProductItemService.new(object.cart.site, object).decrement_qty!
+  end
+
+  # verify if the quantity of the cart item is avilable
+  # return true if quantity is available
+  def is_valid_qty?
+    (get_product.the_qty_real(object.variation_id) - object.qty).to_i >= 0
   end
 end

data/app/decorators/plugins/ecommerce/product_variation_decorator.rb

@@ -0,0 +1,18 @@
+class Plugins::Ecommerce::ProductVariationDecorator < Draper::Decorator
+  delegate_all
+  def the_price
+    "#{h.current_site.current_unit}#{sprintf('%.2f', object.amount)}"
+  end
+
+  def the_title
+    get_product.the_variation_title(object.id)
+  end
+
+  def the_weight
+    "#{h.current_site.current_weight} #{object.weight}"
+  end
+
+  def get_product
+    @_cache_get_product ||= object.product.decorate
+  end
+end

data/app/helpers/plugins/ecommerce/ecommerce_email_helper.rb

@@ -2,7 +2,8 @@ module Plugins::Ecommerce::EcommerceEmailHelper
   include CamaleonCms::EmailHelper
 
   def mark_order_like_received(cart, status = 'paid')
-    order = cart.make_paid!(status)
+    cart_service = Plugins::Ecommerce::CartService.new(current_site, cart)
+    order = cart_service.convert_to_order(status)
 
     # send email to buyer
     commerce_send_order_received_email(order)
@@ -12,6 +13,8 @@ module Plugins::Ecommerce::EcommerceEmailHelper
 
     flash[:notice] = t('plugins.ecommerce.messages.payment_completed', default: "Payment completed successfully")
     args = {order: order}; hooks_run("commerce_after_payment_completed", args)
+    
+    order
   end
 
   def commerce_send_order_received_email(order, is_after_bank_confirmation = false)
@@ -64,10 +67,10 @@ module Plugins::Ecommerce::EcommerceEmailHelper
   def ecommerce_verify_cart_errors(cart)
     errors = []
     # products verification
-    cart.product_items.each do |item|
-      product = item.product.decorate
-      unless product.decrement_qty(item.qty)
-        errors << t('plugins.ecommerce.messages.not_enough_product_qty', product: product.the_title, qty: product.the_qty_real, default: 'There is not enough products "%{product}" (%{qty})')
+    cart.product_items.decorate.each do |item|
+      unless item.is_valid_qty?
+        product = item.product.decorate
+        errors << t('plugins.ecommerce.messages.not_enough_product_qty', product: product.the_title, qty: product.the_qty_real, default: 'There is not enough products "%{product}" (Available %{qty})')
       end
     end
 
@@ -95,14 +98,9 @@ module Plugins::Ecommerce::EcommerceEmailHelper
       :total_cost => order.cache_the_total,
       :order => order
     }
-    files = []
-    owners = []
-    order.products.each do |product|
-      files += product.get_fields('ecommerce_files').map{|f| CamaleonCmsLocalUploader::private_file_path(f, current_site) }
-      owners << product.owner if product.owner.present?
-    end
-    data[:owners] = owners.uniq
-    data[:files] = files.uniq
+    order_service = Plugins::Ecommerce::OrderService.new(current_site, order)
+    data[:owners] = order_service.product_owners
+    data[:files] = order_service.product_files
     data
   end
 

data/app/helpers/plugins/ecommerce/ecommerce_functions_helper.rb

@@ -1,15 +1,7 @@
-=begin
-  Camaleon CMS is a content management system
-  Copyright (C) 2015 by Owen Peredo Diaz
-  Email: owenperedo@gmail.com
-  This program is free software: you can redistribute it and/or modify   it under the terms of the GNU Affero General Public License as  published by the Free Software Foundation, either version 3 of the  License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the  GNU Affero General Public License (GPLv3) for more details.
-=end
 #encoding: utf-8
 module Plugins::Ecommerce::EcommerceFunctionsHelper
   def self.included(klass)
-    klass.helper_method [:e_get_currency_units, :e_get_currency_weight, :e_symbol_by_code] rescue ""
+    klass.helper_method [:e_get_currency_units, :e_get_currency_weight, :e_symbol_by_code, :ecommerce_custom_payment_methods] rescue ""
   end
   def e_get_currency_weight
     r = {}
@@ -21,8 +13,11 @@ module Plugins::Ecommerce::EcommerceFunctionsHelper
   end
 
   def e_get_currency_units
-    file = File.read("#{File.dirname(__FILE__)}/../../../../config/currency_#{I18n.locale.to_s}.json")
-    @e_get_currency_units ||= JSON.parse(file)
+    @e_get_currency_units ||= lambda{
+      file = File.read("#{File.dirname(__FILE__)}/../../../../config/currency.json")
+      args = {currencies: JSON.parse(file)}; hooks_run("ecommerce_currencies", args)
+      args[:currencies]
+    }.call
   end
 
   def e_symbol_by_code(unit)
@@ -46,4 +41,23 @@ module Plugins::Ecommerce::EcommerceFunctionsHelper
     post.metas.map{|m| metas[m.key] = m.value }
     data.merge(post: attributes, fields: post.get_field_values_hash, meta: metas)
   end
+
+  def ecommerce_custom_payment_methods
+    @_ecommerce_custom_payment_methods ||= lambda{
+      args = {custom_payment_methods: {}}; hooks_run("ecommerce_custom_payment_methods", args)
+      # Sample:
+      # def my_callback(args)
+      #   args[:custom_payment_methods][:pay_u] = {
+          # title: 'Pay U',
+          # settings_view_path: '/my_plugin/views/payu/settings', # view must be like this: <div class="form-group"> <label>Key</label><br> <%= text_field_tag('options[payu_key]', options[:payu_key], class: 'form-control required') %> </div>
+          # payment_form_view_path: '/my_plugin/views/payu/payment_form',
+            # # view must include the payment form with your custom routes to process the payment,
+            # # sample: https://github.com/owen2345/camaleon-ecommerce/blob/master/app/controllers/plugins/ecommerce/front/checkout_controller.rb#L120
+            # #         https://github.com/owen2345/camaleon-ecommerce/blob/master/app/views/plugins/ecommerce/partials/checkout/_payments.html.erb#L104
+      #   }
+      # end
+      args[:custom_payment_methods]
+    }.call
+  end
+
 end

data/app/helpers/plugins/ecommerce/ecommerce_helper.rb

@@ -1,35 +1,19 @@
-=begin
-  Camaleon CMS is a content management system
-  Copyright (C) 2015 by Owen Peredo Diaz
-  Email: owenperedo@gmail.com
-  This program is free software: you can redistribute it and/or modify   it under the terms of the GNU Affero General Public License as  published by the Free Software Foundation, either version 3 of the  License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the  GNU Affero General Public License (GPLv3) for more details.
-=end
 module Plugins::Ecommerce::EcommerceHelper
   include Plugins::Ecommerce::EcommerceEmailHelper
 
-  def ecommerce_on_render_post(d)
-
-  end
-
-  def ecommerce_on_render_post_type(d)
-
-  end
-
   def ecommerce_admin_list_post(d)
-
   end
 
-  def ecommerce_form_post(d)
-    if d[:post_type].slug == 'commerce'
-      append_asset_libraries({ecommerce: {css: [], js: [plugin_gem_asset('fix_form')]}})
+  def ecommerce_admin_product_form(args)
+    if args[:post_type].slug == 'commerce'
+      append_asset_libraries({ecommerce: {css: [], js: [plugin_asset_path('admin_product')]}})
+      args[:html] = render partial: plugin_view('admin/products/variations'), locals:{post_type: args[:post_type], product: args[:post] }
     end
   end
 
   def ecommerce_front_before_load
     @ecommerce_post_type = current_site.post_types.where(slug: 'commerce').first.decorate
-    @ecommerce_bredcrumb = [].push(["Home", cama_root_url])
+    @ecommerce_breadcrumb = [].push(["Home", cama_root_url])
   end
 
   def ecommerce_admin_before_load
@@ -52,24 +36,19 @@ module Plugins::Ecommerce::EcommerceHelper
         items_i << {icon: "credit-card", title: t('plugin.ecommerce.payment_methods', default: 'Payment Methods'), url: admin_plugins_ecommerce_payment_methods_path}
         items_i << {icon: "tag", title: t('plugin.ecommerce.coupons', default: 'Coupons'), url: admin_plugins_ecommerce_coupons_path}
         items_i << {icon: "cogs", title: t('camaleon_cms.admin.button.settings', default: 'Settings'), url: admin_plugins_ecommerce_settings_path}
+        items_i << {icon: "cubes", title: t('plugin.ecommerce.product_attributes', default: 'Product Attributes'), url: admin_plugins_ecommerce_product_attributes_path}
       end
 
       admin_menu_insert_menu_after("content", "e-commerce", {icon: "shopping-cart", title: t('plugin.ecommerce.e_commerce', default: 'E-commerce'), url: "", items: items_i}) if items_i.present?
     end
-
-    # add assets admin
-    append_asset_libraries({ecommerce: {css: [plugin_gem_asset('admin')], js: []}})
-
   end
 
   def ecommerce_app_before_load
-
   end
 
   # here all actions on plugin destroying
   # plugin: plugin model
   def ecommerce_on_destroy(plugin)
-
   end
 
   # here all actions on going to active
@@ -86,6 +65,22 @@ module Plugins::Ecommerce::EcommerceHelper
     current_site.post_types.hidden_menu.where(slug: "commerce").first.destroy
   end
 
+  # callback after create/update
+  def ecommerce_admin_product_created(args)
+    if args[:post_type].slug == 'commerce'
+      params[:product_variation] ||= {}
+      args[:post].product_variations.where.not(id: params[:product_variation].keys).delete_all
+      params[:product_variation].each do |p_key, p_var|
+        data = {amount: p_var[:price], photo: p_var[:photo], sku: p_var[:sku], weight: p_var[:weight], qty: p_var[:qty], attribute_ids: p_var[:attributes].map{|at| at[:value] }.join(',')}
+        if p_key.include?('new_') # new variation
+          args[:post].product_variations.create(data)
+        else
+          args[:post].product_variations.find(p_key).update(data)
+        end
+      end
+    end
+  end
+
   def get_commerce_post_type
     @ecommerce = current_site.post_types.hidden_menu.where(slug: "commerce").first
     unless @ecommerce.present?