comable-core 0.6.0 → 0.7.0.beta1

data/app/models/concerns/comable/cart_owner.rb

@@ -51,18 +51,22 @@ module Comable
 
     private
 
+    # rubocop:disable Metrics/MethodLength
     def process_cart_item(obj)
       case obj
       when Comable::Product
         yield obj.stocks.first
       when Comable::Stock
         yield obj
+      when Comable::Variant
+        yield obj.stock
       when Array
         obj.map { |item| yield item }
       else
         fail
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     def add_stock_to_cart(stock, quantity)
       cart_item = find_cart_item_by(stock)
@@ -70,7 +74,7 @@ module Comable
         cart_item.quantity += quantity
         (cart_item.quantity > 0) ? cart_item.save : cart_item.destroy
       else
-        cart_items.build(stock_id: stock.id, quantity: quantity).save
+        cart_items.build(variant: stock.variant, quantity: quantity).save
       end
     end
 
@@ -88,7 +92,7 @@ module Comable
     def find_cart_item_by(stock)
       # TODO: Refactoring
       fail unless stock.is_a?(Comable::Stock)
-      cart_items.find { |cart_item| cart_item.stock.id == stock.id }
+      cart_items.find { |cart_item| cart_item.stock == stock }
     end
   end
 end

data/app/models/concerns/comable/checkout.rb

@@ -37,8 +37,8 @@ module Comable
         end
 
         before_transition to: :completed, do: :complete!
-        after_transition to: :canceled, do: :restock!
-        after_transition to: :resumed, do: :unstock!
+        before_transition to: :canceled, do: [:payment_cancel!, :restock!]
+        before_transition to: :resumed, do: [:payment_resume!, :unstock!]
       end
     end
 

data/app/models/concerns/comable/linkable.rb

@@ -0,0 +1,46 @@
+module Comable
+  module Linkable
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def linkable_columns_keys(options = {})
+        if options.present?
+          @_linkable_columns = default_columns_key.merge(options.slice(:name, :id))
+          @use_index = options[:use_index]
+        else
+          @_linkable_columns
+        end
+      end
+
+      def linkable_columns(*key)
+        (@_linkable_columns || default_columns_key).slice(*key).values
+      end
+
+      def linkable_id_options
+        # HACK: Rails3系のpluckでは複数フィールドを指定できないためselectとmapでカラムを取得する
+        # options = pluck(*linkable_columns(:name, :id))
+        columns = linkable_columns(:name, :id)
+        records = select(columns)
+        options = records.map(&columns.first).zip(records.map(&columns.last))
+        @use_index ? options.unshift(index_option) : options
+      end
+
+      def linkable_exists?
+        @use_index || exists?
+      end
+
+      private
+
+      def default_columns_key
+        {
+          id: :id,
+          name: :name
+        }
+      end
+
+      def index_option
+        [Comable.t('admin.actions.index'), nil]
+      end
+    end
+  end
+end

data/app/models/concerns/comable/sku_choice.rb

@@ -5,15 +5,7 @@ module Comable
   #
   module SkuChoice
     def name_with_sku
-      return name unless sku?
-      name + "(#{sku_name})"
-    end
-
-    def sku_name
-      return unless sku?
-      sku_name = sku_h_choice_name
-      sku_name += '/' + sku_v_choice_name if sku_v_choice_name.present?
-      sku_name
+      name
     end
   end
 end

data/app/uploaders/comable/image_uploader.rb

@@ -0,0 +1,9 @@
+module Comable
+  class ImageUploader < CarrierWave::Uploader::Base
+    storage :file
+
+    def store_dir
+      "uploads/#{model.class.to_s.underscore}/#{model.id}"
+    end
+  end
+end

data/config/locales/en.yml

@@ -33,6 +33,7 @@ en:
     failure: 'Failure'
     products: 'Products'
     pages: 'Pages'
+    navigations: 'Navigations'
     home: 'Home'
     support: 'Support'
     sample_header: 'Sample text'
@@ -110,6 +111,7 @@ en:
       confirmation_to_remove_product: 'This operation cannot be undone. Would you like to proceed?'
       confirmation_to_remove_stock: 'This operation cannot be undone. Would you like to proceed?'
       confirmation_to_remove_page: 'This operation cannot be undone. Would you like to proceed?'
+      confirmation_to_remove_navigation: 'This operation cannot be undone. Would you like to proceed?'
       you_can_drag_and_drop: 'Edit the category tree by drag-and-drop.'
       you_can_right_click: 'Open the context menu by right click.'
       link_to_add_new_node: 'Add a new category from the following link: '
@@ -163,6 +165,11 @@ en:
       please_see_following_page_for_syntax: 'Please see the following page for the syntax:'
       please_select_file_form_directory_tree_to_edit: 'Please select a file form the directory tree to edit.'
       here_editor_will_be_displayed_and_you_can_edit_file: 'Here the editor will be displayed, you can edit file.'
+      variants: 'Variants'
+      pricing: 'Pricing'
+      view: 'View'
+      add_variants: 'Add variants'
+      size: 'Size'
       nav:
         dashboard: 'Dashboard'
         order: 'Orders'
@@ -170,6 +177,7 @@ en:
         stock: 'Stocks'
         category: 'Categories'
         page: 'Pages'
+        navigation: 'Navigations'
         user: 'Users'
         general_settings: 'General settings'
         store: 'Store'
@@ -180,6 +188,9 @@ en:
         products:
           detail: 'Product details'
           list: 'Product list'
+          visibility: 'publishing/closed'
+          published: 'Published'
+          unpublished: 'Unpublished'
         orders:
           detail: 'Order details'
           cart: 'Cart infomation'
@@ -196,6 +207,12 @@ en:
           visibility: 'publishing/closed'
           published: 'Published'
           unpublished: 'Unpublished'
+        navigations:
+          general: 'General'
+          navigation_items: 'Navigation items'
+        navigation_items:
+          web_address: 'Web Address'
+          add_link: 'Add Link'
         stores:
           edit: 'Editing store'
         shipment_methods:
@@ -264,8 +281,13 @@ en:
     models:
       comable/order: 'Orders'
       comable/order_items: 'Order items'
+      comable/navigation: 'Navigation'
+      comable/navigation_item: 'Navigation item'
 
     attributes:
+      timestamps: &timestamps
+        created_at: 'Created at'
+        updated_at: 'Updated at'
       comable/user:
         id: 'ID'
         email: 'Email address'
@@ -282,6 +304,7 @@ en:
         last_sign_in_at: 'Last sign in at'
         current_sign_in_ip: 'Current sign in ip'
         last_sign_in_ip: 'Last sign in ip'
+        <<: *timestamps
       comable/order:
         id: 'ID'
         code: 'Order number'
@@ -305,6 +328,7 @@ en:
         guest_token: 'Guest token'
         payment_state: 'Payment state'
         shipment_state: 'Shipment state'
+        <<: *timestamps
       comable/order_item: &comable_order_item
         quantity: *quantity
         price: *price
@@ -317,6 +341,7 @@ en:
         sku_h_choice_name: 'SKU Horizontal choice name'
         sku_v_choice_name: 'SKU Vertical choice name'
         order: 'Order'
+        <<: *timestamps
       comable/address: &comable_address
         full_name: 'Full name'
         family_name: 'Last name'
@@ -326,6 +351,7 @@ en:
         city: 'City'
         detail: 'Detail'
         phone_number: 'Phone number'
+        <<: *timestamps
       comable/product:
         id: 'ID'
         code: 'Code'
@@ -335,6 +361,8 @@ en:
         categories: 'Categories'
         sku_h_item_name: 'SKU Horizontal item name'
         sku_v_item_name: 'SKU Vertical item name'
+        published_at: 'Published at'
+        <<: *timestamps
       comable/stock:
         id: 'ID'
         code: 'SKU Code'
@@ -343,27 +371,34 @@ en:
         sku_v_choice_name: 'SKU Vertical choice name'
         product: 'Product'
         product_code: 'Product code'
+        name: 'Product name'
+        sku: 'SKU'
+        <<: *timestamps
       comable/store:
         name: 'Name'
         meta_keywords: 'Meta keywords'
         meta_description: 'Meta description'
         email: 'Email'
+        <<: *timestamps
       comable/shipment_method:
         name: 'Name'
         fee: 'Fee'
         activated_flag: 'Activated'
         traking_url: 'Tracking URL'
+        <<: *timestamps
       comable/payment_method:
         name: 'Name'
         payment_provider: 'Oayment provider'
         fee: 'Fee'
         enable_price: 'Enable price range'
+        <<: *timestamps
       comable/tracker:
         activated_flag: 'Activated'
         name: 'Name'
         tracker_id: 'Tracker ID'
         code: 'Code'
         place: 'Place'
+        <<: *timestamps
       comable/order/order_items:
         <<: *comable_order_item
       comable/order/bill_address:
@@ -377,6 +412,7 @@ en:
         fee: 'Fee'
         state: 'Status'
         completed_at: 'Completed at'
+        <<: *timestamps
       comable/shipment:
         id: 'ID'
         order_id: 'Order ID'
@@ -385,6 +421,7 @@ en:
         state: 'Status'
         tracking_number: 'Tracking number'
         completed_at: 'Completed at'
+        <<: *timestamps
       comable/page:
         id: 'ID'
         title: 'Title'
@@ -395,8 +432,36 @@ en:
         meta_keywords: 'Meta Keywords'
         slug: 'Slug'
         published_at: 'Published at'
-        created_at: 'Created at'
-        updated_at: 'Updated at'
+        <<: *timestamps
+      comable/navigation: &comable_navigation_item
+        id: 'ID'
+        name: 'Name'
+        <<: *timestamps
+      comable/navigation_item:
+        id: 'ID'
+        name:  'Name'
+        linkable_type: 'Link to'
+        linkable_id: ''
+        url:  'Name'
+        <<: *timestamps
+      comable/navigation/navigation_items:
+        <<: *comable_navigation_item
+      comable/variant:
+        id: 'ID'
+        sku: 'SKU'
+        price: 'Price'
+        product: 'Product'
+        quantity: 'Quantity'
+        <<: *timestamps
+      comable/option_type:
+        id: 'ID'
+        name: 'Name'
+        <<: *timestamps
+      comable/option_value:
+        id: 'ID'
+        name: 'Name'
+        <<: *timestamps
+
   enumerize:
     comable/user:
       role:

data/config/locales/ja.yml

@@ -33,6 +33,7 @@ ja:
     failure: 失敗しました
     products: '商品'
     pages: 'ページ'
+    navigations: 'ナビゲーション'
     home: 'ホーム'
     support: 'サポート'
     sample_header: 'サンプルテキスト'
@@ -110,6 +111,7 @@ ja:
       confirmation_to_remove_product: この操作は元に戻せません。商品を削除してもよろしいですか？
       confirmation_to_remove_stock: この操作は元に戻せません。在庫を削除してもよろしいですか？
       confirmation_to_remove_page: この操作は元に戻せません。ページを削除してもよろしいですか？
+      confirmation_to_remove_navigation: この操作は元に戻せません。ナビゲーションを削除してもよろしいですか？
       you_can_drag_and_drop: ドラッグ＆ドロップの操作でツリーを編集できます。
       you_can_right_click: 右クリックでメニューを表示できます。
       link_to_add_new_node: '次のリンクから新しいカテゴリを追加できます: '
@@ -163,6 +165,11 @@ ja:
       please_see_following_page_for_syntax: '構文については次のページを参照してください:'
       please_select_file_form_directory_tree_to_edit: 'ディレクトリーツリーから編集したいファイルを選択してください。'
       here_editor_will_be_displayed_and_you_can_edit_file: 'ここにエディタが表示されてファイルの内容を編集できます。'
+      variants: 'バリエーション'
+      pricing: '価格'
+      view: '確認する'
+      add_variants: 'バリエーションを追加する'
+      size: 'サイズ'
       nav:
         dashboard: ダッシュボード
         order: 注文管理
@@ -170,6 +177,7 @@ ja:
         stock: 在庫管理
         category: カテゴリ
         page: ページ
+        navigation: ナビゲーション
         user: ユーザー
         general_settings: 一般設定
         store: ストア設定
@@ -180,6 +188,9 @@ ja:
         products:
           detail: 商品詳細
           list: '商品一覧'
+          visibility: 公開/非公開
+          published: 公開
+          unpublished: 非公開
         orders:
           detail: 注文明細
           cart: カート情報
@@ -196,6 +207,12 @@ ja:
           visibility: 公開/非公開
           published: 公開
           unpublished: 非公開
+        navigations:
+          general: 一般
+          navigation_items: ナビゲーション項目
+        navigation_items:
+          web_address: アドレス入力
+          add_link: リンク追加
         stores:
           edit: 編集
         shipment_methods:
@@ -264,8 +281,13 @@ ja:
     models:
       comable/order: ご注文
       comable/order_items: ご注文明細
+      comable/navigation: 'ナビゲーション'
+      comable/navigation_item: 'ナビゲーション項目'
 
     attributes:
+      timestamps: &timestamps
+        created_at: '作成日'
+        updated_at: '更新日'
       comable/user:
         id: ID
         email: メールアドレス
@@ -282,6 +304,7 @@ ja:
         last_sign_in_at: 最終ログイン日時
         current_sign_in_ip: ログインIP
         last_sign_in_ip: 最終ログインIP
+        <<: *timestamps
       comable/order:
         id: ID
         code: 注文番号
@@ -305,6 +328,7 @@ ja:
         guest_token: ゲストトークン
         payment_state: '決済ステータス'
         shipment_state: '配送ステータス'
+        <<: *timestamps
       comable/order_item: &comable_order_item
         quantity: *quantity
         price: *price
@@ -317,6 +341,7 @@ ja:
         sku_h_choice_name: SKU横軸選択肢名
         sku_v_choice_name: SKU縦軸選択肢名
         order: 注文
+        <<: *timestamps
       comable/address: &comable_address
         full_name: お名前
         family_name: 姓
@@ -326,6 +351,7 @@ ja:
         city: 市町村
         detail: その他
         phone_number: 電話番号
+        <<: *timestamps
       comable/product:
         id: ID
         code: 商品コード
@@ -335,6 +361,8 @@ ja:
         categories: カテゴリ
         sku_h_item_name: SKU横軸項目名
         sku_v_item_name: SKU縦軸項目名
+        published_at: '公開日'
+        <<: *timestamps
       comable/stock:
         id: ID
         code: SKU商品コード
@@ -343,27 +371,34 @@ ja:
         sku_v_choice_name: SKU縦軸選択肢名
         product: 商品
         product_code: 商品コード
+        name: '商品名'
+        sku: 'SKUコード'
+        <<: *timestamps
       comable/store:
         name: ストア名
         meta_keywords: メタキーワード
         meta_description: メタディスクリプション
         email: メールアドレス
+        <<: *timestamps
       comable/shipment_method:
         name: 発送方法名
         fee: 手数料
         activated_flag: この発送方法を有効にする
         traking_url: トラッキングURL
+        <<: *timestamps
       comable/payment_method:
         name: 決済方法名
         payment_provider: 決済プロバイダ
         fee: '手数料'
         enable_price: 利用可能な価格範囲
+        <<: *timestamps
       comable/tracker:
         activated_flag: 'このトラッキング情報を有効にする'
         name: 'トラッキング名'
         tracker_id: 'トラッキングID'
         code: 'トラッキングコード'
         place: '設置場所'
+        <<: *timestamps
       comable/order/order_items:
         <<: *comable_order_item
       comable/order/bill_address:
@@ -377,6 +412,7 @@ ja:
         fee: '手数料'
         state: 'ステータス'
         completed_at: '決済日時'
+        <<: *timestamps
       comable/shipment:
         id: 'ID'
         order_id: '注文ID'
@@ -385,6 +421,7 @@ ja:
         state: 'ステータス'
         tracking_number: 'トラッキング番号'
         completed_at: '発送日時'
+        <<: *timestamps
       comable/page:
         id: ID
         title: タイトル
@@ -395,8 +432,35 @@ ja:
         meta_keywords: メタキーワード
         slug: スラッグ
         published_at: 公開日
-        created_at: 作成日
-        updated_at: 更新日
+        <<: *timestamps
+      comable/navigation:
+        id: ID
+        name: 名前
+        <<: *timestamps
+      comable/navigation_item: &comable_navigation_item
+        id: ID
+        name: 名前
+        linkable_type: リンク先
+        linkable_id: ''
+        url: URL
+        <<: *timestamps
+      comable/navigation/navigation_items:
+        <<: *comable_navigation_item
+      comable/variant:
+        id: 'ID'
+        sku: 'SKUコード'
+        price: '価格'
+        product: '商品'
+        quantity: '個数'
+        <<: *timestamps
+      comable/option_type:
+        id: 'ID'
+        name: '名称'
+        <<: *timestamps
+      comable/option_value:
+        id: 'ID'
+        name: '名称'
+        <<: *timestamps
 
   enumerize:
     comable/user:

data/db/migrate/20150701094210_create_comable_navigation.rb

@@ -0,0 +1,8 @@
+class CreateComableNavigation < ActiveRecord::Migration
+  def change
+    create_table :comable_navigations do |t|
+      t.string :name, null: false
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20150706085056_create_comable_navigation_item.rb

@@ -0,0 +1,15 @@
+class CreateComableNavigationItem < ActiveRecord::Migration
+  def change
+    create_table :comable_navigation_items do |t|
+      t.references :navigation, null: false
+      t.integer :linkable_id
+      t.string :linkable_type
+      t.integer :position, null: false
+      t.string :name, null: false
+      t.string :url
+      t.timestamps null: false
+    end
+
+    add_index :comable_navigation_items, [:position, :navigation_id]
+  end
+end

data/db/migrate/20150805074914_add_published_at_to_comable_products.rb

@@ -0,0 +1,9 @@
+class AddPublishedAtToComableProducts < ActiveRecord::Migration
+  def change
+    change_table :comable_products do |t|
+      t.datetime :published_at
+    end
+
+    Comable::Product.update_all(published_at: (Rails::VERSION::MAJOR == 3) ? Date.today.to_time_in_current_zone : Date.today.in_time_zone) unless reverting?
+  end
+end

data/db/migrate/20150823071425_create_comable_variants.rb

@@ -0,0 +1,10 @@
+class CreateComableVariants < ActiveRecord::Migration
+  def change
+    create_table :comable_variants do |t|
+      t.references :product, null: false
+      t.integer :price, null: false, default: 0
+      t.string :sku
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20150823072622_create_comable_option_types.rb

@@ -0,0 +1,10 @@
+class CreateComableOptionTypes < ActiveRecord::Migration
+  def change
+    create_table :comable_option_types do |t|
+      t.string :name, null: false
+      t.timestamps null: false
+    end
+
+    add_index :comable_option_types, :name, unique: true
+  end
+end

data/db/migrate/20150823072955_create_comable_option_values.rb

@@ -0,0 +1,11 @@
+class CreateComableOptionValues < ActiveRecord::Migration
+  def change
+    create_table :comable_option_values do |t|
+      t.references :option_type, null: false
+      t.string :name, null: false
+      t.timestamps null: false
+    end
+
+    add_index :comable_option_values, [:option_type_id, :name], unique: true
+  end
+end

data/db/migrate/20150823073250_create_comable_variants_option_values.rb

@@ -0,0 +1,8 @@
+class CreateComableVariantsOptionValues < ActiveRecord::Migration
+  def change
+    create_table :comable_variants_option_values do |t|
+      t.references :variant, null: false, index: true
+      t.references :option_value, null: false, index: true
+    end
+  end
+end

data/db/migrate/20150823073809_change_comable_products_and_comable_stocks.rb

@@ -0,0 +1,82 @@
+class ChangeComableProductsAndComableStocks < ActiveRecord::Migration
+  def change
+    reversible do |dir|
+      change_table :comable_stocks do |t|
+        dir.up   { t.references :variant }
+        dir.down { t.remove :variant_id }
+      end
+
+      dir.up   { up_records }
+      dir.down { down_records }
+
+      dir.up   { remove_index :comable_products, :code }
+      dir.down { add_index :comable_products, :code, unique: true }
+
+      change_table :comable_products do |t|
+        dir.up   { t.remove :code }
+        dir.down { t.string :code, null: false }
+
+        dir.up   { t.remove :price }
+        dir.down { t.string :price, null: false }
+
+        dir.up   { t.remove :sku_h_item_name }
+        dir.down { t.string :sku_h_item_name }
+
+        dir.up   { t.remove :sku_v_item_name }
+        dir.down { t.string :sku_v_item_name }
+      end
+
+      dir.up   { remove_index :comable_stocks, :code }
+      dir.down { add_index :comable_stocks, :code, unique: true }
+
+      change_table :comable_stocks do |t|
+        dir.up   { t.remove :product_id }
+        dir.down { t.references :product, null: false }
+
+        dir.up   { t.remove :code }
+        dir.down { t.string :code, null: false }
+
+        dir.up   { t.remove :sku_h_choice_name }
+        dir.down { t.string :sku_h_choice_name }
+
+        dir.up   { t.remove :sku_v_choice_name }
+        dir.down { t.string :sku_v_choice_name }
+
+        dir.up   { t.change :quantity, :integer, default: 0 }
+        dir.down { t.change :quantity, :integer, default: nil }
+
+        dir.up   { t.change :variant_id, :integer, null: false }
+      end
+    end
+  end
+
+  private
+
+  def up_records
+    Comable::Product.all.each do |product|
+      if product[:sku_h_item_name].present? || product[:sku_v_item_name].present?
+        create_variants_for(product)
+      else
+        create_variant_for(product)
+      end
+    end
+  end
+
+  def down_records
+    # TODO: Implement
+  end
+
+  def create_variant_for(product)
+    stock = Comable::Stock.find_by(product_id: product.id)
+    product.variants.create!(stock: stock, price: product[:price], sku: product[:code])
+  end
+
+  def create_variants_for(product)
+    Comable::Stock.where(product_id: product.id).each do |stock|
+      options = []
+      options << { name: product[:sku_h_item_name], value: stock[:sku_h_choice_name] } if product[:sku_h_item_name].present?
+      options << { name: product[:sku_v_item_name], value: stock[:sku_v_choice_name] } if product[:sku_v_item_name].present?
+      product.variants.create!(stock: stock, price: product[:price], sku: stock[:code], options: options)
+    end
+  end
+end