comable-core 0.7.0.beta1 → 0.7.0.beta2

data/app/models/comable/product.rb

@@ -5,7 +5,6 @@ module Comable
     include Comable::Liquidable
     include Comable::Product::Search
     include Comable::Product::Csvable
-    include Comable::Linkable
 
     has_many :variants, class_name: Comable::Variant.name, inverse_of: :product, dependent: :destroy
     has_many :images, class_name: Comable::Image.name, dependent: :destroy
@@ -15,6 +14,7 @@ module Comable
     accepts_nested_attributes_for :images, allow_destroy: true
 
     scope :published, -> (published_at = nil) { where('published_at <= ?', published_at || Time.now) }
+    scope :by_newest, -> { reorder(created_at: :desc) }
 
     validates :name, presence: true, length: { maximum: 255 }
 
@@ -22,8 +22,6 @@ module Comable
 
     ransack_options attribute_select: { associations: [:variants, :stocks, :option_types] }
 
-    linkable_columns_keys use_index: true
-
     PREVIEW_SESSION_KEY = :preview_product
 
     # Add conditions for the images association.
@@ -39,7 +37,7 @@ module Comable
     end
 
     def stocked?
-      stocks.stocked.exists?
+      variants.any?(&:can_supply?)
     end
 
     def unstocked?
@@ -58,6 +56,10 @@ module Comable
       option_types.empty?
     end
 
+    def as_json(options = nil)
+      super (options || {}).merge(methods: [:variants])
+    end
+
     def sku_h_item_name
       option_types.first.try(:name)
     end
@@ -85,22 +87,24 @@ module Comable
     has_many :stocks, class_name: Comable::Stock.name, through: :variants
 
     def stocks=(stocks)
-      stocks.map { |stock| variants.build(stock: stock) }
-    end
-
-    def build_option_type
-      Comable::OptionType.new
+      stocks.map { |stock| variants.build(stocks: [stock]) }
     end
 
     def option_types
-      option_types = variants.map { |variant| variant.option_values.map(&:option_type) }.flatten.uniq
-      option_types.singleton_class.send(:define_method, :build, -> { Comable::OptionType.new })
-      option_types
+      variants.map { |variant| variant.option_values.map(&:option_type) }.flatten.uniq
     end
 
     def option_types_attributes=(_option_types_attributes)
     end
 
+    def properties
+      parse_property = JSON.parse(property) # propertyに不正な値が入っていた場合に例外発生する
+      return [] unless parse_property.is_a?(Array) && parse_property.all? { |prop| prop.is_a?(Hash) }
+      parse_property
+    rescue
+      []
+    end
+
     #
     # Deprecated methods
     #

data/app/models/comable/shipment.rb

@@ -2,18 +2,18 @@ module Comable
   class Shipment < ActiveRecord::Base
     include Comable::Ransackable
 
-    belongs_to :order, class_name: Comable::Order.name, inverse_of: :shipment
+    belongs_to :order, class_name: Comable::Order.name, inverse_of: :shipments
     belongs_to :shipment_method, class_name: Comable::ShipmentMethod.name
+    belongs_to :stock_location, class_name: Comable::StockLocation.name
+    has_many :shipment_items, class_name: Comable::ShipmentItem.name, inverse_of: :shipment
 
     before_validation :copy_attributes_from_shipment_method, unless: :order_completed?
 
     validates :order, presence: true
-    validates :shipment_method, presence: true
+    validates :shipment_method, presence: true, if: -> { stated?(:pending) && Comable::ShipmentMethod.activated.exists? }
     validates :fee, presence: true, numericality: { greater_than_or_equal_to: 0 }
     validates :tracking_number, length: { maximum: 255 }
 
-    delegate :name, to: :shipment_method
-
     ransack_options ransackable_attributes: { except: [:order_id, :shipment_method_id] }
 
     # The #state attribute assigns the following values:
@@ -47,6 +47,7 @@ module Comable
         transition :canceled => :resumed
       end
 
+      before_transition to: :ready, do: -> (s) { s.ready! }
       before_transition to: :completed, do: -> (s) { s.complete! }
     end
 
@@ -66,10 +67,30 @@ module Comable
       completed_at?
     end
 
+    def ready!
+      shipment_items.each(&:ready!)
+    end
+
     def complete!
       touch :completed_at
     end
 
+    def restock!
+      shipment_items.each(&:restock!)
+    end
+
+    def unstock!
+      shipment_items.each(&:unstock!)
+    end
+
+    def can_ship?
+      ready? && order.paid? && order.completed?
+    end
+
+    def name
+      shipment_method.try(:name) || Comable.t(:normal_shipment)
+    end
+
     private
 
     def order_completed?
@@ -78,7 +99,7 @@ module Comable
 
     def copy_attributes_from_shipment_method
       self.attributes = {
-        fee: shipment_method.fee
+        fee: shipment_method.try(:fee) || 0
       }
     end
   end

data/app/models/comable/shipment_item.rb

@@ -0,0 +1,47 @@
+module Comable
+  class ShipmentItem < ActiveRecord::Base
+    belongs_to :shipment, class_name: Comable::Shipment.name, inverse_of: :shipment_items
+    belongs_to :stock, class_name: Comable::Stock.name
+
+    validates :shipment, presence: true
+    validates :stock, presence: true
+
+    attr_accessor :variant
+
+    def ready!
+      decrement_stock!
+    end
+
+    def restock!
+      increment_stock!
+    end
+
+    def unstock!
+      decrement_stock!
+    end
+
+    private
+
+    def decrement_stock!
+      change_stock!(-1)
+    end
+
+    def increment_stock!
+      change_stock!(+1)
+    end
+
+    def change_stock!(required)
+      stock.lock!
+      stock.quantity += required
+      stock_save!
+    end
+
+    # Add the error to Order when fails #save! for compatibility
+    def stock_save!
+      stock.save!
+    rescue ActiveRecord::RecordInvalid => e
+      shipment.order.errors.add 'order_items.quantity', Comable.t('errors.messages.out_of_stock', name: stock.name_with_sku)
+      raise e, Comable.t('errors.messages.out_of_stock', name: stock.name_with_sku)
+    end
+  end
+end

data/app/models/comable/shipment_method.rb

@@ -5,5 +5,6 @@ module Comable
     validates :traking_url, length: { maximum: 255 }
 
     scope :activated, -> { where(activated_flag: true) }
+    scope :by_newest, -> { reorder(created_at: :desc) }
   end
 end

data/app/models/comable/stock.rb

@@ -10,7 +10,8 @@ module Comable
     include Comable::Liquidable
     include Comable::Stock::Csvable
 
-    belongs_to :variant, class_name: Comable::Variant.name, inverse_of: :stock
+    belongs_to :variant, class_name: Comable::Variant.name, inverse_of: :stocks
+    belongs_to :stock_location, class_name: Comable::StockLocation.name
 
     #
     # @!group Scope
@@ -24,6 +25,10 @@ module Comable
     # 品切れの在庫インスタンスを返す
     scope :unstocked, -> { where('quantity <= ?', 0) }
 
+    # @!scope class
+    # returns sorted records by newest.
+    scope :by_newest, -> { reorder(created_at: :desc) }
+
     #
     # @!endgroup
     #
@@ -34,11 +39,14 @@ module Comable
     # TODO: Remove the columns for compatible
     delegate :product, to: :variant
     delegate :price, to: :variant
+    delegate :name, to: :variant
     delegate :sku_h_item_name, to: :product
     delegate :sku_v_item_name, to: :product
 
     ransack_options attribute_select: { associations: :variant }, ransackable_attributes: { only: :quantity }
 
+    before_validation :set_default_stock_location, unless: :stock_location
+
     # 在庫の有無を取得する
     #
     # @example
@@ -65,14 +73,6 @@ module Comable
       !stocked?(quantity: quantity)
     end
 
-    def name
-      if variant.options.any?
-        "#{variant.product.name} (#{variant.options.map(&:value).join('/')})"
-      else
-        variant.product.name
-      end
-    end
-
     def sku_h_choice_name
       variant.option_values.first.try(:name)
     end
@@ -93,6 +93,10 @@ module Comable
       end
     end
 
+    def set_default_stock_location
+      self.stock_location = Comable::StockLocation.default
+    end
+
     #
     # Deprecated methods
     #

data/app/models/comable/stock_location.rb

@@ -0,0 +1,29 @@
+module Comable
+  class StockLocation < ActiveRecord::Base
+    has_many :shipments, class_name: Comable::Shipment.name
+    has_many :stocks, class_name: Comable::Stock.name, dependent: :destroy
+    belongs_to :address, class_name: Comable::Address.name
+
+    accepts_nested_attributes_for :address
+
+    validates :name, presence: true, length: { maximum: 255 }
+
+    scope :active, -> { where(active: true) }
+
+    class << self
+      def default
+        where(default: true).first_or_initialize do |stock_location|
+          stock_location.name = Comable.t(:deafult)
+        end
+      end
+    end
+
+    def as_json(_options = {})
+      { id: id, text: name }
+    end
+
+    def find_stock_item(variant)
+      stocks.find_by(variant: variant)
+    end
+  end
+end

data/app/models/comable/theme.rb

@@ -10,6 +10,8 @@ module Comable
     validates :homepage, length: { maximum: 255 }
     validates :author, length: { maximum: 255 }
 
+    scope :by_newest, -> { reorder(created_at: :desc) }
+
     class << self
       def dir
         Rails.root.join('themes')

data/app/models/comable/tracker.rb

@@ -7,11 +7,12 @@ module Comable
     validates :code, presence: true
     validates :place, presence: true, length: { maximum: 255 }
 
-    scope :activated, -> { where(activated_flag: true) }
-
     enumerize :place, in: %i(
       everywhere
       checkout
     ), scope: true
+
+    scope :activated, -> { where(activated_flag: true) }
+    scope :by_newest, -> { reorder(created_at: :desc) }
   end
 end

data/app/models/comable/user.rb

@@ -17,6 +17,7 @@ module Comable
     scope :this_month, -> { where(created_at: Time.now.beginning_of_month..Time.now.end_of_month) }
     scope :this_week, -> { where(created_at: Time.now.beginning_of_week..Time.now.end_of_week) }
     scope :last_week, -> { where(created_at: 1.week.ago.beginning_of_week..1.week.ago.end_of_week) }
+    scope :by_newest, -> { reorder(created_at: :desc) }
 
     validates :email, presence: true, length: { maximum: 255 }
 

data/app/models/comable/variant/quantifier.rb

@@ -0,0 +1,27 @@
+module Comable
+  class Variant < ActiveRecord::Base
+    module Quantifier
+      def total_quantity
+        if track_inventory?
+          stocks.to_a.sum(&:quantity)
+        else
+          Float::INFINITY
+        end
+      end
+
+      def can_supply?(required = 1)
+        quantity >= required || backorderable?
+      end
+
+      # TODO: Implement
+      def track_inventory?
+        true
+      end
+
+      # TODO: Implement
+      def backorderable?
+        false
+      end
+    end
+  end
+end

data/app/models/comable/variant.rb

@@ -1,31 +1,29 @@
 module Comable
   class Variant < ActiveRecord::Base
     include Comable::Ransackable
+    include Comable::Variant::Quantifier
 
     belongs_to :product, class_name: Comable::Product.name, inverse_of: :variants
-    has_one :stock, class_name: Comable::Stock.name, inverse_of: :variant, dependent: :destroy, autosave: true
+    has_many :stocks, class_name: Comable::Stock.name, inverse_of: :variant, dependent: :destroy
 
-    has_and_belongs_to_many :option_values, class_name: Comable::OptionValue.name, join_table: :comable_variants_option_values
+    has_and_belongs_to_many :option_values, -> { order(:option_type_id, :created_at, :id) }, class_name: Comable::OptionValue.name, join_table: :comable_variants_option_values
 
+    accepts_nested_attributes_for :stocks, allow_destroy: true
     accepts_nested_attributes_for :option_values, allow_destroy: true
-    accepts_nested_attributes_for :stock
 
     validates :product, presence: { message: Comable.t('admin.is_not_exists') }
     validates :price, presence: true, numericality: { greater_than_or_equal_to: 0 }
     validates :sku, length: { maximum: 255 }
 
-    ransack_options attribute_select: { associations: [:product, :stock, :option_values] }, ransackable_attributes: { except: :product_id }
+    ransack_options attribute_select: { associations: [:product, :stocks, :option_values] }, ransackable_attributes: { except: :product_id }
 
-    def quantity
-      stock.try(:quantity) || build_stock.quantity
-    end
+    scope :by_newest, -> { reorder(created_at: :desc) }
+
+    alias_method :quantity, :total_quantity
 
     def quantity=(quantity)
-      if stock
-        stock.quantity = quantity
-      else
-        build_stock(quantity: quantity)
-      end
+      fail 'Stocks are already exists!' if stocks.any?
+      stocks.build(quantity: quantity)
     end
 
     def options
@@ -42,5 +40,20 @@ module Comable
         Comable::OptionValue.where(name: hash[:value], option_type: option_type).first_or_initialize(&:save!)
       end
     end
+
+    def name
+      if options.any?
+        "#{product.name} (#{options.map(&:value).join('/')})"
+      else
+        product.name
+      end
+    end
+
+    def as_json(options = nil)
+      super.merge(
+        'quantity' => quantity,
+        'options' => option_values.map(&:name)
+      )
+    end
   end
 end

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

@@ -51,22 +51,18 @@ module Comable
 
     private
 
-    # rubocop:disable Metrics/MethodLength
     def process_cart_item(obj)
       case obj
-      when Comable::Product
+      when Comable::Product, Comable::Variant
         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)

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

@@ -36,6 +36,7 @@ module Comable
           transition to: :resumed, from: :canceled
         end
 
+        before_transition to: :shipment, do: :assign_inventory_units_to_shipments
         before_transition to: :completed, do: :complete!
         before_transition to: :canceled, do: [:payment_cancel!, :restock!]
         before_transition to: :resumed, do: [:payment_resume!, :unstock!]
@@ -67,19 +68,15 @@ module Comable
     end
 
     def shipment_required?
-      Comable::ShipmentMethod.activated.exists? && shipment.nil?
+      Comable::ShipmentMethod.activated.exists? && shipments.empty?
     end
 
     def allow_cancel?
-      # TODO: Implement shipments
-      # !shipments.exists?
-      true
+      !shipments.with_state(:completed).exists?
     end
 
     def allow_return?
-      # TODO: Implement shipments
-      # shipments.exists?
-      false
+      !allow_cancel?
     end
   end
 end

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

@@ -3,33 +3,22 @@ module Comable
     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
+      private
 
-      def linkable_id_options
+      def calc_linkable_id_options(klass, column_options = {})
+        return [[]] unless klass
         # 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
+        # options = klass.pluck(*linkable_columns(column_options))
+        select_columns = linkable_columns(column_options)
+        records = klass.select(select_columns)
+        options = records.map(&select_columns.first).zip(records.map(&select_columns.last))
 
-      def linkable_exists?
-        @use_index || exists?
+        column_options[:use_index] ? options.unshift(index_option) : options
       end
 
-      private
+      def linkable_columns(column_keys)
+        default_columns_key.merge(column_keys).slice(:name, :id).values
+      end
 
       def default_columns_key
         {

data/app/models/concerns/comable/product/search.rb

@@ -3,7 +3,7 @@ module Comable
     module Search
       extend ActiveSupport::Concern
 
-      SEARCH_COLUMNS = %i( code name caption )
+      SEARCH_COLUMNS = %i( name caption )
 
       module ClassMethods
         def search(query)

data/app/views/comable/order_mailer/complete.text.erb

@@ -6,9 +6,8 @@
 
 <%= Comable.t('order_mailer.complete.introductions', store_name: current_store.name) %>
 
-    <%- shipment = @order.shipment %>
-    <%- if shipment %>
-    <%= @order.class.human_attribute_name(:shipment_method) %>:
+    <%- @order.shipments.select(&:shipment_method).each.with_index(1) do |shipment, index| %>
+    <%= "#{@order.class.human_attribute_name(:shipment_method)} ##{index}" %>:
             <%= shipment.name %>
     <%- end %>
 

data/config/locales/en.yml

@@ -40,6 +40,8 @@ en:
     sample_subheader: 'This is sample text.'
     sample_text: 'Please write your message here.'
     default_store_name: 'K&B style'
+    default: 'Default'
+    normal_shipment: 'Normal shipment'
 
     price: &price
       'Price'
@@ -170,6 +172,7 @@ en:
       view: 'View'
       add_variants: 'Add variants'
       size: 'Size'
+      add_stocks: 'Add stocks'
       nav:
         dashboard: 'Dashboard'
         order: 'Orders'
@@ -185,12 +188,15 @@ en:
         payment_method: 'Payment methods'
         tracker: 'Tracker'
         theme: 'Theme'
+        stock_location: 'Stock locations'
         products:
           detail: 'Product details'
           list: 'Product list'
           visibility: 'publishing/closed'
           published: 'Published'
           unpublished: 'Unpublished'
+          property: 'Property'
+          add_property: 'Add Property'
         orders:
           detail: 'Order details'
           cart: 'Cart infomation'
@@ -358,6 +364,7 @@ en:
         name: 'Name'
         price: 'Price'
         caption: 'Caption'
+        property: 'Property'
         categories: 'Categories'
         sku_h_item_name: 'SKU Horizontal item name'
         sku_v_item_name: 'SKU Vertical item name'
@@ -461,6 +468,13 @@ en:
         id: 'ID'
         name: 'Name'
         <<: *timestamps
+      comable/stock_location:
+        id: 'ID'
+        name: 'Name'
+        address: 'Address'
+        active: 'Active'
+        default: 'Default'
+        <<: *timestamps
 
   enumerize:
     comable/user:

data/config/locales/ja.yml

@@ -40,6 +40,8 @@ ja:
     sample_subheader: 'これはサンプルテキストです。'
     sample_text: 'ここにあなたのお好きなメッセージを埋め込むことができます。'
     default_store_name: 'K&B style'
+    default: 'デフォルト'
+    normal_shipment: '通常配送'
 
     price: &price
       '価格'
@@ -170,6 +172,7 @@ ja:
       view: '確認する'
       add_variants: 'バリエーションを追加する'
       size: 'サイズ'
+      add_stocks: '在庫を追加する'
       nav:
         dashboard: ダッシュボード
         order: 注文管理
@@ -185,12 +188,15 @@ ja:
         payment_method: 決済管理
         tracker: トラッキング情報
         theme: 'テーマ'
+        stock_location: '倉庫管理'
         products:
           detail: 商品詳細
           list: '商品一覧'
           visibility: 公開/非公開
           published: 公開
           unpublished: 非公開
+          property: プロパティ
+          add_property: プロパティ追加
         orders:
           detail: 注文明細
           cart: カート情報
@@ -358,6 +364,7 @@ ja:
         name: 商品名
         price: 価格
         caption: キャプション
+        property: プロパティ
         categories: カテゴリ
         sku_h_item_name: SKU横軸項目名
         sku_v_item_name: SKU縦軸項目名
@@ -461,6 +468,13 @@ ja:
         id: 'ID'
         name: '名称'
         <<: *timestamps
+      comable/stock_location:
+        id: 'ID'
+        name: '倉庫名'
+        address: '住所'
+        active: '有効'
+        default: 'デフォルト'
+        <<: *timestamps
 
   enumerize:
     comable/user:

data/db/migrate/20150918065115_add_property_to_comable_products.rb

@@ -0,0 +1,5 @@
+class AddPropertyToComableProducts < ActiveRecord::Migration
+  def change
+    add_column :comable_products, :property, :text, after: :caption
+  end
+end

data/db/migrate/20150924010143_create_comable_stock_locations.rb

@@ -0,0 +1,11 @@
+class CreateComableStockLocations < ActiveRecord::Migration
+  def change
+    create_table :comable_stock_locations do |t|
+      t.string :name, null: false
+      t.boolean :default, null: false, default: false
+      t.boolean :active, null: false, default: true
+      t.references :address
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20150924102640_add_stock_location_id_to_comable_stocks.rb

@@ -0,0 +1,10 @@
+class AddStockLocationIdToComableStocks < ActiveRecord::Migration
+  def change
+    change_table :comable_stocks do |t|
+      t.references :stock_location
+    end
+
+    add_index :comable_stocks, :stock_location_id
+    add_index :comable_stocks, [:stock_location_id, :variant_id]
+  end
+end