comable_core 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3586df9a1e1a2267feb7f84f1658f21f92909b2
-  data.tar.gz: 94e817e742c94849a8eb08ebf7f8de9c983c3a33
+  metadata.gz: d3c189f71e2286afacd9d9607498850ab4173f88
+  data.tar.gz: 99d3320d9c08295fd80cc41e964ebeb18b957707
 SHA512:
-  metadata.gz: 6b03e1b7ff2c55f92048da4ab2fa08fb7c503ea2e6d70da22eebf8b1cc8f98c6c2bfb11241811c76fce533cad8cdc1dc190bf158290f58cbda72555902498132
-  data.tar.gz: 7c24b354ae4934ba2670851b2390e18f1c292f9675cde73ac251bf0799e1d49b81f1d551926db6afed7dd6cc5074dae95c9542b76b0fc245b4a1e989cb36f75d
+  metadata.gz: c975609caf19b813fd71634e78e484da97f03982b0ebc27ce68699fdfa03f155db2222e8fb03d6f7d8d36748c8d6dcb6b2ce8ef444e018b2657d4365d081df1a
+  data.tar.gz: 987b35810b75b2a058553510b271bd4b7e1e884a2673ab7d2cd79e85f224fa32dce162adf48d8a2b4d10741e85fb6b341729947da5661792d4733159cd6a1ee9

data/app/mailers/comable/order_mailer.rb

@@ -6,7 +6,7 @@ module Comable
 
     def complete(order)
       @order = order
-      mail(from: current_store.email_sender, to: order.email, subject: subject_for(order))
+      mail(from: current_store.email, to: order.email, subject: subject_for(order))
     end
 
     private

data/app/models/comable/address.rb

@@ -17,15 +17,15 @@ module Comable
     end
 
     def same_as?(address)
-      attributes_without_id == address.attributes_without_id
+      contents == address.contents
     end
 
     def clone
-      self.class.new(attributes_without_id)
+      self.class.new(contents)
     end
 
-    def attributes_without_id
-      attributes.except('id', 'user_id')
+    def contents
+      attributes.except('id', 'user_id', 'created_at', 'updated_at')
     end
 
     def full_name

data/app/models/comable/shipment_method.rb

@@ -4,7 +4,6 @@ module Comable
     validates :fee, presence: true, numericality: { greater_than_or_equal_to: 0 }
     validates :traking_url, length: { maximum: 255 }
 
-    scope :activated, -> { where(activate_flag: true) }
-    scope :deactivated, -> { where(activate_flag: false) }
+    scope :activated, -> { where(activated_flag: true) }
   end
 end

data/app/models/comable/store.rb

@@ -3,7 +3,7 @@ module Comable
     validates :name, length: { maximum: 255 }
     validates :meta_keywords, length: { maximum: 255 }
     validates :meta_description, length: { maximum: 255 }
-    validates :email_sender, length: { maximum: 255 }
+    validates :email, length: { maximum: 255 }
 
     class << self
       def instance
@@ -15,8 +15,8 @@ module Comable
       end
     end
 
-    def email_activate?
-      email_activate_flag && email_sender.present?
+    def can_send_mail?
+      email.present?
     end
   end
 end

data/app/models/comable/tracker.rb

@@ -7,7 +7,7 @@ module Comable
     validates :code, presence: true
     validates :place, presence: true, length: { maximum: 255 }
 
-    scope :activated, -> { where(activate_flag: true) }
+    scope :activated, -> { where(activated_flag: true) }
 
     enumerize :place, in: %i(
       everywhere

data/app/models/comable/user.rb

@@ -13,6 +13,10 @@ module Comable
     accepts_nested_attributes_for :bill_address
     accepts_nested_attributes_for :ship_address
 
+    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) }
+
     validates :email, presence: true, length: { maximum: 255 }
 
     devise(*Comable::Config.devise_strategies[:user])

data/config/locales/en.yml

@@ -143,6 +143,7 @@ en:
       tracker_code_help_additional: '<code>order.order_items</code> is Array. And you can retrieve the following information from each element.'
       list_of_usable_variables: 'Available variables are as follows.'
       mote_infomation_for_syntax: 'For more information about the syntax please refer to the following page:'
+      help_of_store_email: 'This field will be used as sender of mail that send to customers. The mail will not be sent when the field is empty.'
       nav:
         dashboard: 'Dashboard'
         order: 'Orders'
@@ -304,12 +305,11 @@ en:
         name: 'Name'
         meta_keywords: 'Meta keywords'
         meta_description: 'Meta description'
-        email_sender: 'Email sender'
-        email_activate_flag: 'Email activated'
+        email: 'Email'
       comable/shipment_method:
         name: 'Name'
         fee: 'Fee'
-        activate_flag: 'Activated'
+        activated_flag: 'Activated'
         traking_url: 'Tracking URL'
       comable/payment_method:
         name: 'Name'
@@ -317,7 +317,7 @@ en:
         fee: 'Fee'
         enable_price: 'Enable price range'
       comable/tracker:
-        activate_flag: 'Activated'
+        activated_flag: 'Activated'
         name: 'Name'
         tracker_id: 'Tracker ID'
         code: 'Code'

data/config/locales/ja.yml

@@ -143,6 +143,7 @@ ja:
       tracker_code_help_additional: '<code>order.order_items</code> は配列で、各要素から次の情報を取り出すことができます。'
       list_of_usable_variables: '利用可能な変数は次の通りです。'
       mote_infomation_for_syntax: '構文についての詳しい情報は次のページをご覧ください:'
+      help_of_store_email: 'この項目は顧客に送信するメールの送信元として利用されます。未入力の場合はメールが送信されません。'
       nav:
         dashboard: ダッシュボード
         order: 注文管理
@@ -304,12 +305,11 @@ ja:
         name: ストア名
         meta_keywords: メタキーワード
         meta_description: メタディスクリプション
-        email_sender: 送信元メールアドレス
-        email_activate_flag: メール送信を有効にする
+        email: メールアドレス
       comable/shipment_method:
         name: 発送方法名
         fee: 手数料
-        activate_flag: この発送方法を有効にする
+        activated_flag: この発送方法を有効にする
         traking_url: トラッキングURL
       comable/payment_method:
         name: 決済方法名
@@ -317,7 +317,7 @@ ja:
         fee: '手数料'
         enable_price: 利用可能な価格範囲
       comable/tracker:
-        activate_flag: 'このトラッキング情報を有効にする'
+        activated_flag: 'このトラッキング情報を有効にする'
         name: 'トラッキング名'
         tracker_id: 'トラッキングID'
         code: 'トラッキングコード'

data/db/migrate/20131214194807_create_comable_products.rb

@@ -7,8 +7,9 @@ class CreateComableProducts < ActiveRecord::Migration
       t.text :caption
       t.string :sku_h_item_name
       t.string :sku_v_item_name
+      t.timestamps null: false
     end
 
-    add_index :comable_products, :code, unique: true, name: :comable_products_idx_01
+    add_index :comable_products, :code, unique: true
   end
 end

data/db/migrate/20140120032559_create_comable_users.rb

@@ -34,6 +34,8 @@ class CreateComableUsers < ActiveRecord::Migration
       ## Others
       t.references :bill_address
       t.references :ship_address
+
+      t.timestamps null: false
     end
 
     add_index :comable_users, :email, unique: true

data/db/migrate/20140502060116_create_comable_stocks.rb

@@ -6,8 +6,9 @@ class CreateComableStocks < ActiveRecord::Migration
       t.integer :quantity, null: false, default: 0
       t.string :sku_h_choice_name
       t.string :sku_v_choice_name
+      t.timestamps null: false
     end
 
-    add_index :comable_stocks, :code, unique: true, name: :comable_stocks_idx_01
+    add_index :comable_stocks, :code, unique: true
   end
 end

data/db/migrate/20140723175431_create_comable_orders.rb

@@ -12,8 +12,9 @@ class CreateComableOrders < ActiveRecord::Migration
       t.references :ship_address
       t.string :state
       t.datetime :completed_at
+      t.timestamps null: false
     end
 
-    add_index :comable_orders, :code, unique: true, name: :comable_orders_idx_01
+    add_index :comable_orders, :code, unique: true
   end
 end

data/db/migrate/20140723175810_create_comable_order_items.rb

@@ -11,8 +11,9 @@ class CreateComableOrderItems < ActiveRecord::Migration
       t.string :sku_h_choice_name
       t.string :sku_v_choice_name
       t.integer :quantity, default: 1, null: false
+      t.timestamps null: false
     end
 
-    add_index :comable_order_items, [:order_id, :stock_id], unique: true, name: :comable_order_items_idx_01
+    add_index :comable_order_items, [:order_id, :stock_id], unique: true
   end
 end

data/db/migrate/20140817194104_create_comable_payment_methods.rb

@@ -7,6 +7,7 @@ class CreateComablePaymentMethods < ActiveRecord::Migration
       t.integer :fee, null: false
       t.integer :enable_price_from
       t.integer :enable_price_to
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20140921191416_create_comable_shipment_methods.rb

@@ -1,10 +1,11 @@
 class CreateComableShipmentMethods < ActiveRecord::Migration
   def change
     create_table :comable_shipment_methods do |t|
-      t.boolean :activate_flag, null: false, default: true
+      t.boolean :activated_flag, null: false, default: true
       t.string :name, null: false
       t.integer :fee, null: false
       t.string :traking_url
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20140926063541_create_comable_stores.rb

@@ -4,8 +4,8 @@ class CreateComableStores < ActiveRecord::Migration
       t.string :name
       t.string :meta_keywords
       t.string :meta_description
-      t.string :email_sender
-      t.boolean :email_activate_flag, null: false, default: true
+      t.string :email
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20141024025526_create_comable_addresses.rb

@@ -11,6 +11,7 @@ class CreateComableAddresses < ActiveRecord::Migration
       t.string :detail
       t.string :phone_number, null: false, limit: 18
       t.datetime :last_used_at
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20150111031228_create_comable_categories.rb

@@ -4,6 +4,7 @@ class CreateComableCategories < ActiveRecord::Migration
       t.string :name, null: false
       t.string :ancestry, index: true
       t.integer :position
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20150112173706_create_comable_images.rb

@@ -3,6 +3,7 @@ class CreateComableImages < ActiveRecord::Migration
     create_table :comable_images do |t|
       t.references :product, null: false, index: true
       t.string :file, null: false
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20150423095210_create_comable_shipments.rb

@@ -7,6 +7,7 @@ class CreateComableShipments < ActiveRecord::Migration
       t.string :state, null: false
       t.string :tracking_number
       t.datetime :completed_at
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20150511171940_create_comable_payments.rb

@@ -6,6 +6,7 @@ class CreateComablePayments < ActiveRecord::Migration
       t.integer :fee, null: false
       t.string :state, null: false
       t.datetime :completed_at
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20150513185230_create_comable_trackers.rb

@@ -1,12 +1,13 @@
 class CreateComableTrackers < ActiveRecord::Migration
   def change
     create_table :comable_trackers do |t|
-      # TODO: Rename the column: activate_flag => activated
-      t.boolean :activate_flag, null: false, default: true
+      # TODO: Rename the column: activated_flag => activated
+      t.boolean :activated_flag, null: false, default: true
       t.string :name, null: false
       t.string :tracker_id
       t.text :code, null: false
       t.string :place, null: false
+      t.timestamps null: false
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comable_core
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - YOSHIDA Hiroki
@@ -298,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Provide core functions for Comable.