camaleon_ecommerce 0.0.4 → 1.1

data/config/routes.rb

@@ -3,26 +3,36 @@ Rails.application.routes.draw do
     # frontend
     namespace :plugins do
       namespace 'ecommerce' do
-        get 'index' => 'front#index'
+        controller :front do
+          get 'login'
+          post 'login' => :do_login
+          get 'register'
+          post 'register' => :do_register
+        end
+
+        scope :checkout, as: :checkout do
+          controller 'front/checkout' do
+            get 'success_paypal'
+            get 'cancel_paypal'
+            post 'pay_by_bank_transfer'
+            post 'pay_by_credit_card'
+            post 'pay_by_authorize_net'
+            post 'pay_by_stripe'
+            post 'pay_by_paypal'
+          end
+        end
 
         get 'checkout' => 'front/checkout#index'
-        post 'checkout/processing' => 'front/checkout#processing'
+        post 'checkout/step_address' => 'front/checkout#step_address'
+        post 'checkout/step_shipping' => 'front/checkout#step_shipping'
         get 'checkout/cart' => 'front/checkout#cart_index'
+        get 'checkout/complete_free_order' => 'front/checkout#complete_free_order'
         post 'checkout/cart/add' => 'front/checkout#cart_add'
         post 'checkout/cart/update' => 'front/checkout#cart_update'
         get 'checkout/cart/remove' => 'front/checkout#cart_remove'
-        post 'res_coupon' => 'front/orders#res_coupon'
+        post 'res_coupon' => 'front/checkout#res_coupon'
         get 'orders' => 'front/orders#index'
         get 'orders/:order/show' => 'front/orders#show', as: :order_show
-        get 'orders/:order/select_payment' => 'front/orders#select_payment', as: :order_select_payment
-        post 'orders/:order/select_payment' => 'front/orders#set_select_payment', as: :order_set_select_payment
-        get 'orders/:order/pay' => 'front/orders#pay', as: :order_pay
-        get 'orders/:order/success' => 'front/orders#success', as: :order_success
-        get 'orders/:order/cancel' => 'front/orders#cancel', as: :order_cancel
-        post 'orders/:order/pay_by_bank_transfer' => 'front/orders#pay_by_bank_transfer', as: :order_pay_by_bank_transfer
-        post 'orders/:order/pay_by_credit_card' => 'front/orders#pay_by_credit_card', as: :order_pay_by_credit_card
-        post 'orders/:order/pay_by_credit_card_authorize_net' => 'front/orders#pay_by_credit_card_authorize_net', as: :order_pay_by_credit_card_authorize_net
-        post 'orders/:order/pay_by_authorize_net' => 'front/orders#pay_by_authorize_net', as: :order_pay_by_authorize_net
       end
     end
   end
@@ -33,10 +43,10 @@ Rails.application.routes.draw do
       namespace 'ecommerce' do
         get 'index' => 'admin#index'
         resources :orders, controller: 'admin/orders' do
-          post 'accepted'
-          post 'shipped'
-          post 'closed'
-          get 'canceled'
+          get 'mark_accepted'
+          get 'mark_bank_confirmed'
+          post 'mark_shipped'
+          post 'mark_canceled'
         end
         resources :payment_methods, controller: 'admin/payment_methods'
         resources :shipping_methods, controller: 'admin/shipping_methods' do

data/db/migrate/20160502221327_add_cama_ecommerce_structure_plugin.rb

@@ -0,0 +1,12 @@
+class AddCamaEcommerceStructurePlugin < ActiveRecord::Migration
+  def change
+    unless table_exists? 'plugins_order_details'
+      create_table :plugins_order_details do |t|
+        t.integer :order_id
+        t.string :customer, :email, :phone
+        t.datetime :received_at, :accepted_at, :shipped_at, :closed_at
+        t.timestamps
+      end
+    end
+  end
+end

data/db/migrate/20160504162311_move_featured_attribute_of_products.rb

@@ -0,0 +1,15 @@
+class MoveFeaturedAttributeOfProducts < ActiveRecord::Migration
+  def change
+    Cama::Site.all.each do |site|
+      ptype = site.post_types.where(slug: 'commerce').first
+      if ptype.present?
+        ptype.posts.filter_by_field('ecommerce_featured', value: '1').each do |post|
+          post.update_column(:is_feature, true)
+        end
+        field = ptype.get_field_object('ecommerce_featured')
+        field.destroy if field.present?
+        ptype.set_option('has_featured', true)
+      end
+    end
+  end
+end

data/db/migrate/20160527184747_add_new_cart_structure.rb

@@ -0,0 +1,21 @@
+class AddNewCartStructure < ActiveRecord::Migration
+  def change
+    create_table :plugins_ecommerce_orders do |t|
+      t.string :name, :slug, :kind, :coupon, :the_coupon_amount, :currency_code, :payment_data
+      t.string :status, default: 'unpaid'
+      t.integer :shipping_method_id, :user_id, :site_id, :payment_method_id, index: true
+      t.timestamp :paid_at, :received_at, :accepted_at, :shipped_at, :closed_at
+      t.string :cache_the_total, :cache_the_sub_total, :cache_the_tax, :cache_the_weight, :cache_the_discounts, :cache_the_shipping
+      t.decimal :amount, :precision => 8, :scale => 2
+      t.text :description
+      t.timestamps null: false
+    end
+
+    create_table :plugins_ecommerce_products do |t|
+      t.integer :qty, :product_id, :order_id, index: true
+      t.string :cache_the_price, :cache_the_title, :cache_the_tax, :cache_the_sub_total
+    end
+
+    drop_table :plugins_order_details
+  end
+end

data/lib/ecommerce/version.rb

@@ -1,3 +1,3 @@
 module Ecommerce
-  VERSION = '0.0.4'
+  VERSION = '1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_ecommerce
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: '1.1'
 platform: ruby
 authors:
 - Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.54'
+- !ruby/object:Gem::Dependency
+  name: stripe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +95,7 @@ files:
 - app/assets/javascripts/plugins/ecommerce/fix_form.js
 - app/assets/javascripts/plugins/ecommerce/jquery.creditCardValidator.js
 - app/assets/stylesheets/plugins/ecommerce/admin.scss
+- app/assets/stylesheets/plugins/ecommerce/checkout.css.scss
 - app/assets/stylesheets/plugins/ecommerce/front.scss
 - app/controllers/plugins/ecommerce/admin/coupons_controller.rb
 - app/controllers/plugins/ecommerce/admin/orders_controller.rb
@@ -93,27 +108,31 @@ files:
 - app/controllers/plugins/ecommerce/front/checkout_controller.rb
 - app/controllers/plugins/ecommerce/front/orders_controller.rb
 - app/controllers/plugins/ecommerce/front_controller.rb
+- app/decorators/plugins/ecommerce/cart_decorator.rb
+- app/decorators/plugins/ecommerce/coupon_decorator.rb
+- app/decorators/plugins/ecommerce/order_decorator.rb
+- app/decorators/plugins/ecommerce/product_decorator.rb
+- app/decorators/plugins/ecommerce/product_item_decorator.rb
 - 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/cart.rb
 - app/models/plugins/ecommerce/coupon.rb
-- app/models/plugins/ecommerce/coupon_decorator.rb
 - app/models/plugins/ecommerce/order.rb
-- app/models/plugins/ecommerce/order_decorator.rb
 - app/models/plugins/ecommerce/order_detail.rb
 - app/models/plugins/ecommerce/payment_method.rb
-- app/models/plugins/ecommerce/product.rb
+- app/models/plugins/ecommerce/product_item.rb
 - app/models/plugins/ecommerce/shipping_method.rb
 - app/models/plugins/ecommerce/tax_rate.rb
+- app/views/camaleon_cms/html_mailer/order_canceled.html.erb
+- app/views/camaleon_cms/html_mailer/order_confirmed.html.erb
 - app/views/camaleon_cms/html_mailer/order_received.html.erb
 - app/views/camaleon_cms/html_mailer/order_received_admin.html.erb
+- app/views/camaleon_cms/html_mailer/order_shipped.html.erb
 - app/views/camaleon_cms/html_mailer/recovery_cart.html.erb
-- app/views/layouts/plugins/ecommerce/mailer.html.erb
 - app/views/plugins/ecommerce/admin/coupons/form.html.erb
 - app/views/plugins/ecommerce/admin/coupons/index.html.erb
-- app/views/plugins/ecommerce/admin/index.html.erb
 - app/views/plugins/ecommerce/admin/orders/form.html.erb
 - app/views/plugins/ecommerce/admin/orders/index.html.erb
 - app/views/plugins/ecommerce/admin/orders/show.html.erb
@@ -130,29 +149,32 @@ files:
 - app/views/plugins/ecommerce/admin/shipping_methods/show.html.erb
 - app/views/plugins/ecommerce/admin/tax_rates/form.html.erb
 - app/views/plugins/ecommerce/admin/tax_rates/index.html.erb
-- app/views/plugins/ecommerce/front/_post_list_item.html.erb
 - app/views/plugins/ecommerce/front/checkout/cart_index.html.erb
 - app/views/plugins/ecommerce/front/checkout/index.html.erb
-- app/views/plugins/ecommerce/front/index.html.erb
-- app/views/plugins/ecommerce/front/list_products.html.erb
+- app/views/plugins/ecommerce/front/login.html.erb
 - app/views/plugins/ecommerce/front/orders/index.html.erb
-- app/views/plugins/ecommerce/front/orders/pay_by_bank_transfer.html.erb
-- app/views/plugins/ecommerce/front/orders/pay_by_credit_card.html.erb
-- app/views/plugins/ecommerce/front/orders/pay_by_credit_card_authorize_net.erb
-- app/views/plugins/ecommerce/front/orders/select_payment.html.erb
 - app/views/plugins/ecommerce/front/orders/show.html.erb
-- app/views/plugins/ecommerce/front/product.html.erb
-- app/views/plugins/ecommerce/layouts/_ecommerce.html.erb
-- app/views/plugins/ecommerce/partials/_form_address.html.erb
-- app/views/plugins/ecommerce/partials/_table_order_products.html.erb
+- app/views/plugins/ecommerce/partials/_cart_widget.html.erb
+- app/views/plugins/ecommerce/partials/checkout/_details.html.erb
+- 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/single.html.erb
 - config/camaleon_plugin.json
 - config/currency.json
 - config/currency_en.json
 - config/currency_es.json
 - config/custom_models.rb
+- config/locales/en.yml
+- config/locales/es.yml
 - config/locales/readme.txt
-- config/locales/translation.yml
 - config/routes.rb
+- db/migrate/20160502221327_add_cama_ecommerce_structure_plugin.rb
+- db/migrate/20160504162311_move_featured_attribute_of_products.rb
+- db/migrate/20160527184747_add_new_cart_structure.rb
 - lib/camaleon_ecommerce.rb
 - lib/ecommerce.rb
 - lib/ecommerce/engine.rb
@@ -183,3 +205,4 @@ signing_key:
 specification_version: 4
 summary: ": Summary of Ecommerce."
 test_files: []
+has_rdoc: 

data/app/models/plugins/ecommerce/order_decorator.rb

@@ -1,54 +0,0 @@
-=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::OrderDecorator < CamaleonCms::TermTaxonomyDecorator
-  delegate_all
-
-  # Define presentation-specific methods here. Helpers are accessed through
-  # `helpers` (aka `h`). You can override attributes, for example:
-  #
-  #   def created_at
-  #     helpers.content_tag :span, class: 'time' do
-  #       object.created_at.strftime("%a %m/%d/%y")
-  #     end
-  #   end
-
-  def the_status
-    case self.status
-      when 'unpaid'
-        "<span class='label label-danger'>#{I18n.t('plugin.ecommerce.select.unpaid')}</span>"
-      when 'accepted'
-        "<span class='label label-info'>#{I18n.t('plugin.ecommerce.select.accepted')}</span>"
-      when 'shipped'
-        "<span class='label label-primary'>#{I18n.t('plugin.ecommerce.select.shipped')}</span>"
-      when 'closed'
-        "<span class='label label-default'>#{I18n.t('plugin.ecommerce.select.closed')}</span>"
-      when 'canceled'
-        "<span class='label label-default'>#{I18n.t('plugin.ecommerce.select.canceled')}</span>"
-      else
-        "<span class='label label-success'>#{I18n.t('plugin.ecommerce.select.received')}</span>"
-    end
-  end
-
-  def the_pay_status
-    if object.paid?
-      "<span class='label label-success'>#{I18n.t('plugin.ecommerce.select.received')}</span>"
-    elsif object.canceled?
-      "<span class='label label-default'>#{I18n.t('plugin.ecommerce.select.canceled')}</span>"
-    elsif object.get_meta("payment", {})[:coupon].to_s.parameterize == 'free'
-      "<span class='label label-success'>Free</span>"
-    else
-      "<span class='label label-danger'>#{I18n.t('plugin.ecommerce.select.unpaid')}</span>"
-    end
-  end
-
-  def the_url_tracking
-    consignment_number = object.get_meta("payment")[:consignment_number] rescue 'none'
-    object.shipping_method.options[:url_tracking].gsub("{{consignment_number}}", consignment_number) rescue "#{I18n.t('plugin.ecommerce.message.not_shipped')}"
-  end
-end

data/app/views/layouts/plugins/ecommerce/mailer.html.erb

@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8">
-    <title></title>
-  </head>
-  <body>
-    <table style="width: 100%">
-      <tr>
-        <td style="text-align: center; background-color: #fe5e00; padding: 10px;"><img src="http://camaleon.tuzitio.com/media/132/logo2.png"></td>
-      </tr>
-      <tr>
-        <td>
-          <%= yield %>
-        </td>
-      </tr>
-      <tr>
-        <td style="text-align: center; background-color: #fe5e00;"><a href="<%= @url_base %>" style="color: #ffffff;">Visit Site</a></td>
-      </tr>
-    </table>
-  </body>
-</html>

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

@@ -1,2 +0,0 @@
-<!--<script src="<%#= plugin_asset_path("<my_plugin>", "js/front.js") %>"></script>-->
-Plugin ready to use in admin panel!.

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

@@ -1,18 +0,0 @@
-<div class="col-sm-6 col-md-4 post-list-item">
-    <div class="thumbnail">
-        <span style="position: absolute; top: 5px; right: 22px"><%= raw post.the_featured_status %></span>
-        <%= raw post.the_link_thumb({}, {style: "height: 200px; width: 100%; display: block;"}) %>
-        <div class="caption">
-            <h4 id="thumbnail-label">
-                <a href="<%= post.the_url %>"><%= post.the_title %></a>
-            </h4>
-          <small>SKU: <%= post.the_sku %></small><br>
-          <strong><%= post.the_price %> <span class="pull-right"><%= raw post.the_stock_status %></span></strong><br>
-          <hr/>
-            <p><%= raw post.the_excerpt %></p>
-        </div>
-    </div>
-
-  <%#= debug post.get_field_values_hash %>
-</div>
-

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

@@ -1,2 +0,0 @@
-<!--<script src="<%#= plugin_asset_path("my_plugin", "js/admin.js") %>"></script>-->
-Plugin ready to use! in frontend.

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

@@ -1,34 +0,0 @@
-<%= render layout: 'plugins/ecommerce/layouts/ecommerce', locals: {} do %>
-
-<article id="post_type-view" class="post_type_<%= @post_type.slug %>" style="position: relative">
-    <h1><%= @post_type.the_title %></h1>
-
-    <div class="content">
-        <%= raw @post_type.the_content %>
-    </div><br><br>
-
-    <% if @categories.present? %>
-        <div class="panel panel-primary no-line">
-            <div class="panel-heading">Categories</div>
-            <div class="panel-body">
-                <%= render partial: "partials/categories_list", locals: {categories: @categories} %>
-            </div>
-        </div>
-    <% end %>
-
-    <div class="panel panel-primary post_list no-line">
-        <div class="panel-heading">Products</div>
-        <div class="panel-body">
-            <div class="row">
-                <% @posts.each_with_index do |post, index| %>
-                    <%= raw "<div class='clearfix'></div>" if index%3 == 0 && index > 0 %>
-                    <%= render partial: 'plugins/ecommerce/front/post_list_item', locals: {post: post.decorate} %>
-                <% end %>
-            </div>
-            <%= content_tag("div", raw(ct('no_contents_found')), class: "alert alert-warning") if @posts.empty? %>
-            <%= will_paginate @posts, renderer: BootstrapPagination::Rails if @posts.present? %>
-        </div>
-    </div>
-
-</article>
-<% end %>

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

@@ -1,67 +0,0 @@
-<%= render layout: 'plugins/ecommerce/layouts/ecommerce', locals: {} do %>
-<%= form_tag(plugins_ecommerce_order_pay_by_bank_transfer_path(order: @order.slug), :method => "post", :class => "form") do %>
-
-    <div class="row">
-      <h3 class="text-center">Details Ticket Bank Transfer (order: <%= @order.slug %>)</h3>
-      <div id="user_details" class="col-md-6 col-md-offset-1">
-
-
-
-        <div class="panel panel-default">
-          <div class="panel-heading">
-            <h3 class="panel-title">Payment Details</h3>
-          </div>
-          <div class="panel-body">
-
-            <div class="form-group">
-              <label for="">Bank name</label>
-              <input class="form-control" type="text" name="details[bank_name]" id="">
-            </div>
-            <div class="form-group">
-              <label for="">Owner name of bank account</label>
-              <input class="form-control" type="text" name="details[owner_name]" id="">
-            </div>
-            <div class="form-group">
-              <label for="">CODE / ID / KEY / TICKET</label>
-              <input class="form-control" type="text" name="details[code]" id="">
-            </div>
-            <div class="form-group">
-              <label for="">Description</label>
-              <textarea name="details[description]" rows="4" class="form-control" ></textarea>
-            </div>
-
-            <div class="row">
-              <div class="col-xs-12">
-                <button class="btn btn-success btn-lg btn-block" type="submit">Send Information</button>
-              </div>
-            </div>
-            <div class="row" style="display:none;">
-              <div class="col-xs-12">
-                <p class="payment-errors"></p>
-              </div>
-            </div>
-          </div>
-        </div>
-
-
-
-
-
-      </div>
-      <div class="col-md-4">
-        <label for="">Details Bank Transfer</label>
-        <div class="well">
-            <h4><%= @payment_methods.name %></h4>
-          <p><%= @payment_methods.description %></p>
-          <ul class="ec-list-orders-address">
-            <li><strong>Amount:</strong> <span><%= current_site.current_unit %> <%= @order.get_meta("payment")[:amount] %></span></li>
-            <li><strong>Number Account:</strong> <span> <%= @payment_methods.options[:bank_transfer_number_account] %></span></li>
-            <li><strong>Details:</strong> <span> <%= @payment_methods.options[:bank_transfer_detail]  %></span></li>
-          </ul>
-        </div>
-      </div>
-    </div>
-
-<% end %>
-
-<% end %>