comable-core 0.7.0.beta2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 324ed7d3cdee480e0d7b0529fd7a90195cc69a37
-  data.tar.gz: 487980666fa2ccbfc92028700433a741eb610afb
+  metadata.gz: 7b21105a8f6d073d7b66ee2dba182428b5008d78
+  data.tar.gz: c3c2f4c865dab49b010d16b658f14d1c0b5605b2
 SHA512:
-  metadata.gz: 24bb175945a7065c8589e02f665e420ae56823c69bea0472ac27194a9abcc70675acfcbfa20eb3028f3e4826c814080bde8d85a97f5b226f544b094a81d235b6
-  data.tar.gz: 8e6a2a6ca8dc65d329c985ed4f01415da7b6fe5a01d4e78c4688aa2122b9a5252f8e3cb0f1244d9a5dd439172408de351b43e97cdfb15479e968ad412bf4916b
+  metadata.gz: da54c6caa5b324b720030516906dbd355f3375bbc54a385f21c3e8fe9ee157e43c2455043132ba71d1a048a48e0f3ad5bbf326c1962193d2550123a3ae152039
+  data.tar.gz: d2a46b412f7182914adf3abca17fcb2b1626f0cca649e255387c342660f5c7a62d548ed4902fb2e8d75bc874f135ad99a8198f28a359eb99e9270f8fcfc25c3e

data/app/models/comable/address.rb

@@ -10,6 +10,12 @@ module Comable
     validates :detail, length: { maximum: 255 }
     validates :phone_number, length: { maximum: 255 }
 
+    # for Search by ransack
+    # https://github.com/activerecord-hackery/ransack/wiki/using-ransackers#5-search-on-a-concatenated-full-name-from-first_name-and-last_name-several-examples
+    ransacker :full_name do |parent|
+      Arel::Nodes::InfixOperation.new('||', parent.table[:first_name], parent.table[:family_name])
+    end
+
     class << self
       def find_or_clone(address)
         all.to_a.find { |obj| obj.same_as? address } || address.clone

data/app/models/comable/draft_order.rb

@@ -0,0 +1,11 @@
+module Comable
+  class DraftOrder
+    class << self
+      delegate :find, to: Comable::Order.name
+
+      def new(attributes = {})
+        Comable::Order.where(draft: true).new(attributes)
+      end
+    end
+  end
+end

data/app/models/comable/order.rb

@@ -26,6 +26,8 @@ module Comable
     delegate :state, :human_state_name, to: :payment, allow_nil: true, prefix: true
     delegate :cancel!, :resume!, to: :payment, allow_nil: true, prefix: true
 
+    attr_writer :same_as_bill_address
+
     def complete!
       ActiveRecord::Base.transaction do
         run_callbacks :complete do
@@ -79,12 +81,12 @@ module Comable
 
     # 時価送料を取得
     def current_shipment_fee
-      shipments.to_a.sum(&:fee)
+      shipments.to_a.sum(&:current_fee)
     end
 
     # Get the current payment fee
     def current_payment_fee
-      payment.try(:fee) || 0
+      payment.try(:current_fee) || 0
     end
 
     # 時価合計を取得
@@ -106,6 +108,10 @@ module Comable
       completed_at?
     end
 
+    def draft?
+      read_attribute(:draft)
+    end
+
     def paid?
       payment ? payment.completed? : true
     end
@@ -123,6 +129,10 @@ module Comable
       shipments.with_state(:ready).each(&:ship!)
     end
 
+    def same_as_bill_address
+      @same_as_bill_address.nil? ? bill_address == ship_address : @same_as_bill_address
+    end
+
     private
 
     def current_attributes

data/app/models/comable/order/associations.rb

@@ -12,7 +12,7 @@ module Comable
         has_many :shipments, dependent: :destroy, class_name: Comable::Shipment.name, inverse_of: :order
 
         accepts_nested_attributes_for :bill_address
-        accepts_nested_attributes_for :ship_address
+        accepts_nested_attributes_for :ship_address, reject_if: :same_as_bill_address
         accepts_nested_attributes_for :order_items
         accepts_nested_attributes_for :payment
         accepts_nested_attributes_for :shipments

data/app/models/comable/order/callbacks.rb

@@ -6,9 +6,10 @@ module Comable
       included do
         define_model_callbacks :complete
 
+        before_validation :copy_ship_address_from_bill_address, if: :same_as_bill_address
+        before_validation :generate_code, on: :create
         before_validation :generate_guest_token, on: :create
         before_validation :clone_addresses_from_user, on: :create
-        before_complete :generate_code
         after_complete :clone_addresses_to_user
       end
 
@@ -38,6 +39,10 @@ module Comable
         user.update_bill_address_by bill_address
         user.update_ship_address_by ship_address
       end
+
+      def copy_ship_address_from_bill_address
+        self.ship_address = bill_address
+      end
     end
   end
 end

data/app/models/comable/order/scopes.rb

@@ -5,12 +5,13 @@ module Comable
 
       included do
         scope :complete, -> { where.not(completed_at: nil) }
-        scope :incomplete, -> { where(completed_at: nil) }
+        scope :incomplete, -> { where(completed_at: nil).where(draft: false) }
         scope :by_user, -> (user) { where(user_id: user) }
+        scope :draft, -> { where(draft: true) }
         scope :this_month, -> { where(completed_at: Time.now.beginning_of_month..Time.now.end_of_month) }
         scope :this_week, -> { where(completed_at: Time.now.beginning_of_week..Time.now.end_of_week) }
         scope :last_week, -> { where(completed_at: 1.week.ago.beginning_of_week..1.week.ago.end_of_week) }
-        scope :recent, -> { order('completed_at DESC, id DESC') }
+        scope :recent, -> { order('completed_at DESC, created_at DESC, id DESC') }
       end
     end
   end

data/app/models/comable/order/validations.rb

@@ -4,31 +4,31 @@ module Comable
       extend ActiveSupport::Concern
 
       included do
-        validates :user_id, uniqueness: { scope: :completed_at }, if: :user
+        validates :code, presence: true
+        validates :user_id, uniqueness: { scope: :completed_at }, if: -> { user && !draft }
         validates :guest_token, presence: true, uniqueness: { scope: :completed_at }, unless: :user
 
-        with_options if: -> { stated?(:cart) } do |context|
+        with_options if: -> { stated?(:cart) || draft? } do |context|
           context.validates :email, presence: true, length: { maximum: 255 }
         end
 
-        with_options if: -> { stated?(:orderer) } do |context|
+        with_options if: -> { stated?(:orderer) || draft? } do |context|
           context.validates :bill_address, presence: true
         end
 
-        with_options if: -> { stated?(:delivery) } do |context|
+        with_options if: -> { stated?(:delivery) || draft? } do |context|
           context.validates :ship_address, presence: true
         end
 
-        with_options if: -> { stated?(:shipment) && shipment_required? } do |context|
+        with_options if: -> { (stated?(:shipment) || draft?) && shipment_required? } do |context|
           context.validates :shipments, presence: true
         end
 
-        with_options if: -> { stated?(:payment) && payment_required? } do |context|
+        with_options if: -> { (stated?(:payment) || draft?) && payment_required? } do |context|
           context.validates :payment, presence: true
         end
 
         with_options if: -> { stated?(:confirm) } do |context|
-          context.validates :code, presence: true
           context.validates :payment_fee, presence: true
           context.validates :shipment_fee, presence: true
           context.validates :total_price, presence: true

data/app/models/comable/order_item.rb

@@ -14,8 +14,8 @@ module Comable
 
     liquid_methods :name, :name_with_sku, :code, :quantity, :price, :subtotal_price
 
-    delegate :product, to: :variant
-    delegate :image_url, to: :product
+    delegate :product, to: :variant, allow_nil: true
+    delegate :image_url, to: :product, allow_nil: true
     delegate :guest_token, to: :order
     delegate :completed?, to: :order, allow_nil: true
 
@@ -42,7 +42,7 @@ module Comable
 
     # 売価小計を取得
     def subtotal_price
-      price * quantity
+      price * quantity if price
     end
 
     def unstocked?

data/app/models/comable/payment.rb

@@ -72,6 +72,10 @@ module Comable
       touch :completed_at
     end
 
+    def current_fee
+      payment_method.try(:fee) || 0
+    end
+
     private
 
     def order_completed?
@@ -80,7 +84,7 @@ module Comable
 
     def copy_attributes_from_payment_method
       self.attributes = {
-        fee: payment_method.fee
+        fee: current_fee
       }
     end
   end

data/app/models/comable/product.rb

@@ -7,7 +7,7 @@ module Comable
     include Comable::Product::Csvable
 
     has_many :variants, class_name: Comable::Variant.name, inverse_of: :product, dependent: :destroy
-    has_many :images, class_name: Comable::Image.name, dependent: :destroy
+    has_many :images, -> { order(:id) }, class_name: Comable::Image.name, dependent: :destroy
     has_and_belongs_to_many :categories, class_name: Comable::Category.name, join_table: :comable_products_categories
 
     accepts_nested_attributes_for :variants, allow_destroy: true
@@ -24,12 +24,6 @@ module Comable
 
     PREVIEW_SESSION_KEY = :preview_product
 
-    # Add conditions for the images association.
-    # Override method of the images association to support Rails 3.x.
-    def images
-      super.order(:id)
-    end
-
     def image_url
       image = images.first
       return image.url if image
@@ -56,8 +50,9 @@ module Comable
       option_types.empty?
     end
 
-    def as_json(options = nil)
-      super (options || {}).merge(methods: [:variants])
+    def as_json(options = {})
+      options[:include] = { variants: { except: :product, methods: [:quantity, :option_names] } }
+      super
     end
 
     def sku_h_item_name

data/app/models/comable/shipment.rb

@@ -91,6 +91,10 @@ module Comable
       shipment_method.try(:name) || Comable.t(:normal_shipment)
     end
 
+    def current_fee
+      shipment_method.try(:fee) || 0
+    end
+
     private
 
     def order_completed?
@@ -99,7 +103,7 @@ module Comable
 
     def copy_attributes_from_shipment_method
       self.attributes = {
-        fee: shipment_method.try(:fee) || 0
+        fee: current_fee
       }
     end
   end

data/app/models/comable/user.rb

@@ -57,10 +57,6 @@ module Comable
       !new_record?
     end
 
-    def not_signed_in?
-      !signed_in?
-    end
-
     # TODO: Add a test case
     def reload(*_)
       super.tap do
@@ -92,6 +88,14 @@ module Comable
       "##{id}"
     end
 
+    def text
+      bill_address ? "#{bill_full_name} (#{email})" : email
+    end
+
+    def as_json(options = {})
+      super options.merge(include: [:bill_address, :ship_address], methods: [:text])
+    end
+
     private
 
     def current_guest_token

data/app/models/comable/variant.rb

@@ -20,6 +20,7 @@ module Comable
     scope :by_newest, -> { reorder(created_at: :desc) }
 
     alias_method :quantity, :total_quantity
+    delegate :image_url, to: :product
 
     def quantity=(quantity)
       fail 'Stocks are already exists!' if stocks.any?
@@ -49,11 +50,18 @@ module Comable
       end
     end
 
-    def as_json(options = nil)
-      super.merge(
-        'quantity' => quantity,
-        'options' => option_values.map(&:name)
-      )
+    alias_method :text, :name
+
+    def option_names
+      option_values.map(&:name)
+    end
+
+    def as_json(options = {})
+      options = {
+        include: { product: { except: :variants } },
+        methods: [:text, :quantity, :option_names, :image_url]
+      }
+      super
     end
   end
 end

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

@@ -3,7 +3,11 @@ module Comable
     extend ActiveSupport::Concern
 
     included do
-      state_machine initial: :cart do
+      state_machine initial: -> (order) { order.draft? ? :draft : :cart } do
+        # for Draft Order
+        state :draft
+
+        # for Normal Order
         state :cart
         state :orderer
         state :delivery
@@ -24,6 +28,11 @@ module Comable
           transition :confirm => :completed
         end
 
+        event :next_draft_state do
+          transition :draft => :shipment, if: :shipment_required?
+          transition all => :completed
+        end
+
         event :cancel do
           transition to: :canceled, from: [:completed, :resumed], if: :allow_cancel?
         end

data/config/locales/en.yml

@@ -173,9 +173,11 @@ en:
       add_variants: 'Add variants'
       size: 'Size'
       add_stocks: 'Add stocks'
+      user: 'User'
       nav:
         dashboard: 'Dashboard'
         order: 'Orders'
+        draft_order: 'Draft Orders'
         product: 'Products'
         stock: 'Stocks'
         category: 'Categories'
@@ -334,6 +336,7 @@ en:
         guest_token: 'Guest token'
         payment_state: 'Payment state'
         shipment_state: 'Shipment state'
+        same_as_bill_address: 'Same as the billing address'
         <<: *timestamps
       comable/order_item: &comable_order_item
         quantity: *quantity

data/config/locales/ja.yml

@@ -173,9 +173,11 @@ ja:
       add_variants: 'バリエーションを追加する'
       size: 'サイズ'
       add_stocks: '在庫を追加する'
+      user: 'ユーザー'
       nav:
         dashboard: ダッシュボード
         order: 注文管理
+        draft_order: '下書き注文'
         product: 商品管理
         stock: 在庫管理
         category: カテゴリ
@@ -334,6 +336,7 @@ ja:
         guest_token: ゲストトークン
         payment_state: '決済ステータス'
         shipment_state: '配送ステータス'
+        same_as_bill_address: '請求先と同じ住所を利用する'
         <<: *timestamps
       comable/order_item: &comable_order_item
         quantity: *quantity

data/db/migrate/20151112102452_add_draft_to_comable_orders.rb

@@ -0,0 +1,7 @@
+class AddDraftToComableOrders < ActiveRecord::Migration
+  def change
+    change_table :comable_orders do |t|
+      t.boolean :draft, null: false, default: false
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable-core
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta2
+  version: 0.7.0
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-31 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -287,6 +287,7 @@ files:
 - app/models/comable/ability.rb
 - app/models/comable/address.rb
 - app/models/comable/category.rb
+- app/models/comable/draft_order.rb
 - app/models/comable/image.rb
 - app/models/comable/inventory/adjuster.rb
 - app/models/comable/inventory/coordinator.rb
@@ -373,6 +374,7 @@ files:
 - db/migrate/20151012143215_create_comable_shipment_items.rb
 - db/migrate/20151013082845_remove_null_option_of_shipment_method_id_on_comable_shipments.rb
 - db/migrate/20151013194926_add_guest_token_index_to_comable_orders.rb
+- db/migrate/20151112102452_add_draft_to_comable_orders.rb
 - db/seeds.rb
 - db/seeds/comable/users.rb
 - lib/comable/core.rb
@@ -403,9 +405,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5