camaleon_ecommerce 1.1 → 1.2

data/config/routes.rb

@@ -42,6 +42,8 @@ Rails.application.routes.draw do
     namespace 'plugins' do
       namespace 'ecommerce' do
         get 'index' => 'admin#index'
+        get 'product_attributes' => 'admin#product_attributes'
+        post 'product_attributes' => 'admin#save_product_attributes'
         resources :orders, controller: 'admin/orders' do
           get 'mark_accepted'
           get 'mark_bank_confirmed'

data/db/migrate/20160527184747_add_new_cart_structure.rb

@@ -1,11 +1,13 @@
 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 :name, :slug, :kind, :coupon, :the_coupon_amount
+      t.string :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.string :cache_the_total, :cache_the_sub_total, :cache_the_tax
+      t.string :cache_the_weight, :cache_the_discounts, :cache_the_shipping
       t.decimal :amount, :precision => 8, :scale => 2
       t.text :description
       t.timestamps null: false
@@ -13,9 +15,10 @@ class AddNewCartStructure < ActiveRecord::Migration
 
     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
+      t.string :cache_the_price, :cache_the_title, :cache_the_tax
+      t.string :cache_the_sub_total
     end
 
-    drop_table :plugins_order_details
+    #drop_table :plugins_order_details
   end
 end

data/db/migrate/20160620200501_add_product_attributes_structure.rb

@@ -0,0 +1,21 @@
+class AddProductAttributesStructure < ActiveRecord::Migration
+  def change
+    create_table :plugins_ecommerce_attributes do |t|
+      t.string :key, :label
+      t.integer :parent_id, index: true
+      t.integer :site_id, index: true
+      t.integer :position, default: 0
+    end
+
+    create_table :plugins_ecommerce_product_variations do |t|
+      t.decimal :amount, :precision => 8, :scale => 2
+      t.belongs_to :product, index: true
+      t.string :photo, :sku
+      t.integer :weight
+      t.integer :position, :qty, default: 0
+      t.string :attribute_ids
+    end
+
+    add_column :plugins_ecommerce_products, :variation_id, :integer
+  end
+end

data/db/migrate/20160825174848_set_cama_post_decorator_class.rb

@@ -0,0 +1,13 @@
+class SetCamaPostDecoratorClass < ActiveRecord::Migration
+  def change
+    CamaleonCms::Site.reset_column_information
+    CamaleonCms::PostType.reset_column_information
+    CamaleonCms::Site.find_each do |site|
+      post_type = site.post_types.where(slug: 'commerce').first
+      if post_type
+        post_type.set_options(cama_post_decorator_class: 'Plugins::Ecommerce::ProductDecorator')
+        post_type.save(validate: false)
+      end
+    end
+  end
+end

data/db/migrate/20160825232739_migrate_order_data.rb

@@ -0,0 +1,87 @@
+class MigrateOrderData < ActiveRecord::Migration
+  def change
+    if table_exists?('plugins_order_details') && Plugins::Ecommerce::LegacyOrder.count > 0
+      Plugins::Ecommerce::LegacyOrder.reset_column_information
+
+      CamaleonCms::Meta.where(object_class: 'Plugins::Ecommerce::Order').
+        update_all(object_class: 'Plugins::Ecommerce::LegacyOrder')
+
+      # Plugins::Ecommerce::Order.transaction { Plugins::Ecommerce::Order.destroy_all }
+
+      product_post_type = CamaleonCms::PostType.where(slug: 'commerce').first
+      raise 'Product post type must exist' unless product_post_type
+
+      Plugins::Ecommerce::LegacyOrder.order(:created_at).find_each do |legacy_order|
+        details = legacy_order.decorate.details
+        order = Plugins::Ecommerce::Order.new(
+          name: legacy_order.name,
+          description: legacy_order.description,
+          slug: legacy_order.slug,
+          status: legacy_order.status,
+          created_at: legacy_order.created_at,
+          updated_at: legacy_order.updated_at,
+          received_at: details.received_at,
+          accepted_at: details.accepted_at,
+          shipped_at: details.shipped_at,
+          closed_at: details.closed_at,
+          user_id: legacy_order.user_id,
+          # not 100% sure on parent_id -> site_id mapping
+          site_id: legacy_order.parent_id,
+          # not mapped fields because they are always nil in my orders:
+          # count, term_group, term_order
+        )
+        order.save(validate: false)
+
+        legacy_order.metas.each do |legacy_meta|
+          meta = CamaleonCms::Meta.new(
+            object_class: 'Plugins::Ecommerce::Cart',
+            objectid: order.id,
+            key: legacy_meta.key,
+            value: legacy_meta.value,
+          )
+          meta.save(validate: false)
+        end
+
+        order.reload
+        payment_meta = order.get_meta('payment')
+        if payment_meta
+          order.set_meta('payment_method_id', payment_meta['payment_id'])
+          order.payment_method_id = payment_meta['payment_id']
+          order.shipping_method_id = payment_meta['shipping_method']
+          order.coupon = payment_meta['coupon_code'],
+          order.the_coupon_amount = payment_meta['coupon_amount'],
+          order.save(validate: false)
+        end
+
+        if order.user
+          order.user.set_option('phone', details.phone)
+        end
+
+        order.get_meta('products').each do |key, product|
+          p = product_post_type.posts.where(id: product['product_id']).first
+          p = Plugins::Ecommerce::ProductDecorator.new(p)
+          order.product_items.create(
+            product_id: product['product_id'],
+            qty: product['qty'],
+            cache_the_price: p.the_price,
+            cache_the_title: p.title,
+            cache_the_tax: '$%.2f' % p.the_tax,
+            cache_the_sub_total: '$%.2f' % (product['price'].to_f*product['qty'].to_f),
+          )
+        end
+
+        order.reload
+        c = Plugins::Ecommerce::CartDecorator.new(order)
+        order.update_columns(
+          amount: order.total_amount,
+          cache_the_total: c.the_price,
+          cache_the_sub_total: c.the_sub_total,
+          cache_the_tax: c.the_tax_total,
+          cache_the_weight: c.the_weight_total,
+          cache_the_discounts: c.the_total_discounts,
+          cache_the_shipping: c.the_total_shipping,
+        )
+      end
+    end
+  end
+end

data/lib/ecommerce/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_ecommerce
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -90,9 +90,8 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- app/assets/javascripts/plugins/ecommerce/admin.js
+- app/assets/javascripts/plugins/ecommerce/admin_product.js.coffee
 - app/assets/javascripts/plugins/ecommerce/cart.js
-- 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
@@ -113,18 +112,31 @@ files:
 - app/decorators/plugins/ecommerce/order_decorator.rb
 - app/decorators/plugins/ecommerce/product_decorator.rb
 - app/decorators/plugins/ecommerce/product_item_decorator.rb
+- app/decorators/plugins/ecommerce/product_variation_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/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
 - app/models/plugins/ecommerce/payment_method.rb
 - app/models/plugins/ecommerce/product_item.rb
+- app/models/plugins/ecommerce/product_variation.rb
 - app/models/plugins/ecommerce/shipping_method.rb
 - 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
 - app/views/camaleon_cms/html_mailer/order_received.html.erb
@@ -142,6 +154,8 @@ files:
 - app/views/plugins/ecommerce/admin/prices/form.html.erb
 - app/views/plugins/ecommerce/admin/prices/index.html.erb
 - app/views/plugins/ecommerce/admin/prices/show.html.erb
+- app/views/plugins/ecommerce/admin/product_attributes.html.erb
+- app/views/plugins/ecommerce/admin/products/_variations.html.erb
 - app/views/plugins/ecommerce/admin/products/index.html.erb
 - app/views/plugins/ecommerce/admin/settings/index.html.erb
 - app/views/plugins/ecommerce/admin/shipping_methods/form.html.erb
@@ -165,8 +179,6 @@ files:
 - 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
@@ -175,6 +187,9 @@ files:
 - 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
+- db/migrate/20160620200501_add_product_attributes_structure.rb
+- db/migrate/20160825174848_set_cama_post_decorator_class.rb
+- db/migrate/20160825232739_migrate_order_data.rb
 - lib/camaleon_ecommerce.rb
 - lib/ecommerce.rb
 - lib/ecommerce/engine.rb
@@ -200,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: ": Summary of Ecommerce."

data/app/assets/javascripts/plugins/ecommerce/fix_form.js

@@ -1,7 +0,0 @@
-jQuery(function($){
-    $( '#form-post' ).on( "change", '.editor-custom-fields input[name="field_options[ecommerce_weight][values][]"], .editor-custom-fields .input-value.number', function() {
-        setTimeout(function(){
-            $(this).val(Math.abs($(this).val()) || 0);
-        }.bind(this), 60)
-    });
-});

data/config/currency_en.json

@@ -1,154 +0,0 @@
-{
-  "USD": {
-    "symbol": "$",
-    "name": "US Dollar",
-    "symbol_native": "$",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "USD",
-    "name_plural": "US dollars"
-  },
-  "CAD": {
-    "symbol": "CA$",
-    "name": "Canadian Dollar",
-    "symbol_native": "$",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "CAD",
-    "name_plural": "Canadian dollars"
-  },
-  "EUR": {
-    "symbol": "€",
-    "name": "Euro",
-    "symbol_native": "€",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "EUR",
-    "name_plural": "euros"
-  },
-    "AUD": {
-    "symbol": "AU$",
-    "name": "Australian Dollar",
-    "symbol_native": "$",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "AUD",
-    "name_plural": "Australian dollars"
-  },
-  "GBP": {
-    "symbol": "£",
-    "name": "British Pound Sterling",
-    "symbol_native": "£",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "GBP",
-    "name_plural": "British pounds sterling"
-  },
-  "CZK": {
-    "symbol": "Kč",
-    "name": "Czech Republic Koruna",
-    "symbol_native": "Kč",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "CZK",
-    "name_plural": "Czech Republic korunas"
-  },
-  "DKK": {
-    "symbol": "Dkr",
-    "name": "Danish Krone",
-    "symbol_native": "kr",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "DKK",
-    "name_plural": "Danish kroner"
-  },
-
-  "HKD": {
-    "symbol": "HK$",
-    "name": "Hong Kong Dollar",
-    "symbol_native": "$",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "HKD",
-    "name_plural": "Hong Kong dollars"
-  },
-
-  "HUF": {
-    "symbol": "Ft",
-    "name": "Hungarian Forint",
-    "symbol_native": "Ft",
-    "decimal_digits": 0,
-    "rounding": 0,
-    "code": "HUF",
-    "name_plural": "Hungarian forints"
-  },
-
-  "JPY": {
-    "symbol": "¥",
-    "name": "Japanese Yen",
-    "symbol_native": "￥",
-    "decimal_digits": 0,
-    "rounding": 0,
-    "code": "JPY",
-    "name_plural": "Japanese yen"
-  },
-
-  "NOK": {
-    "symbol": "Nkr",
-    "name": "Norwegian Krone",
-    "symbol_native": "kr",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "NOK",
-    "name_plural": "Norwegian kroner"
-  },
-
-  "NZD": {
-    "symbol": "NZ$",
-    "name": "New Zealand Dollar",
-    "symbol_native": "$",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "NZD",
-    "name_plural": "New Zealand dollars"
-  },
-
-  "PLN": {
-    "symbol": "zł",
-    "name": "Polish Zloty",
-    "symbol_native": "zł",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "PLN",
-    "name_plural": "Polish zlotys"
-  },
-
-  "SEK": {
-    "symbol": "Skr",
-    "name": "Swedish Krona",
-    "symbol_native": "kr",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "SEK",
-    "name_plural": "Swedish kronor"
-  },
-  "SGD": {
-    "symbol": "S$",
-    "name": "Singapore Dollar",
-    "symbol_native": "$",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "SGD",
-    "name_plural": "Singapore dollars"
-  },
-  "CHF": {
-    "symbol": "CHF",
-    "name": "Swiss Franc",
-    "symbol_native": "CHF",
-    "decimal_digits": 2,
-    "rounding": 0.05,
-    "code": "CHF",
-    "name_plural": "Swiss francs"
-  }
-
-}

data/config/currency_es.json

@@ -1,154 +0,0 @@
-{
-  "USD": {
-    "symbol": "$",
-    "name": "Dólar Americano",
-    "symbol_native": "$",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "USD",
-    "name_plural": "Dólares estadounidenses"
-  },
-  "CAD": {
-    "symbol": "CA$",
-    "name": "Dólar Canadiense",
-    "symbol_native": "$",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "CAD",
-    "name_plural": "Dólares canadienses"
-  },
-  "EUR": {
-    "symbol": "€",
-    "name": "Euro",
-    "symbol_native": "€",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "EUR",
-    "name_plural": "euros"
-  },
-    "AUD": {
-    "symbol": "AU$",
-    "name": "Dólar Australiano",
-    "symbol_native": "$",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "AUD",
-    "name_plural": "Dólares australianos"
-  },
-  "GBP": {
-    "symbol": "£",
-    "name": "Libra Esterlina Británica",
-    "symbol_native": "£",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "GBP",
-    "name_plural": "Libras esterlinas"
-  },
-  "CZK": {
-    "symbol": "Kč",
-    "name": "Corona Checa",
-    "symbol_native": "Kč",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "CZK",
-    "name_plural": "Coronas República Checa"
-  },
-  "DKK": {
-    "symbol": "Dkr",
-    "name": "Corona Danesa",
-    "symbol_native": "kr",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "DKK",
-    "name_plural": "Coronas danesas"
-  },
-
-  "HKD": {
-    "symbol": "HK$",
-    "name": "Dólar de Hong Kong",
-    "symbol_native": "$",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "HKD",
-    "name_plural": "Dólares de Hong Kong"
-  },
-
-  "HUF": {
-    "symbol": "Ft",
-    "name": "Florín Húngaro",
-    "symbol_native": "Ft",
-    "decimal_digits": 0,
-    "rounding": 0,
-    "code": "HUF",
-    "name_plural": "Florín húngaro"
-  },
-
-  "JPY": {
-    "symbol": "¥",
-    "name": "Yen Japonés",
-    "symbol_native": "￥",
-    "decimal_digits": 0,
-    "rounding": 0,
-    "code": "JPY",
-    "name_plural": "Yen Japonés"
-  },
-
-  "NOK": {
-    "symbol": "Nkr",
-    "name": "Corona Noruega",
-    "symbol_native": "kr",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "NOK",
-    "name_plural": "Coronas noruegas"
-  },
-
-  "NZD": {
-    "symbol": "NZ$",
-    "name": "Dólar de Nueva Zelanda",
-    "symbol_native": "$",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "NZD",
-    "name_plural": "Dólares de Nueva Zelanda"
-  },
-
-  "PLN": {
-    "symbol": "zł",
-    "name": "Zloty Polaco",
-    "symbol_native": "zł",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "PLN",
-    "name_plural": "Zlotys Polacos"
-  },
-
-  "SEK": {
-    "symbol": "Skr",
-    "name": "Corona Sueca",
-    "symbol_native": "kr",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "SEK",
-    "name_plural": "Coronas Suecas"
-  },
-  "SGD": {
-    "symbol": "S$",
-    "name": "Dólar de Singapur",
-    "symbol_native": "$",
-    "decimal_digits": 2,
-    "rounding": 0,
-    "code": "SGD",
-    "name_plural": "Dólares de Singapur"
-  },
-  "CHF": {
-    "symbol": "CHF",
-    "name": "Franco Suizo",
-    "symbol_native": "CHF",
-    "decimal_digits": 2,
-    "rounding": 0.05,
-    "code": "CHF",
-    "name_plural": "Francos Suizos"
-  }
-
-}