comable_core 0.3.2 → 0.3.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/models/comable/address.rb +5 -1
- data/app/models/comable/stock.rb +3 -1
- data/config/locales/ja.yml +11 -1
- data/lib/comable/state_machine_patch.rb +17 -1
- metadata +27 -26
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ea4dbaa8dfc838607fcec82a1fc77d7c36854669
|
4
|
+
data.tar.gz: cabc6a6dab76d530e84c2e569aa26a6888a27aff
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c1a205986c287b466329fad23c3bf44a1fe6379eff5ee6a4720208ff41212a3ad96b205a0e0fa7bcd6aada1871cbccf575cb076e50df795e296fc5e85e98c39a
|
7
|
+
data.tar.gz: a7cff0da79f6f1070520c26c61822cf4a67b7e7b373e8e5b17ede7d34d29b2cf8f2e3e7a446787c6edb3578a164e4ef9e97c4c33529ba9691accef16fd3db466
|
@@ -12,7 +12,7 @@ module Comable
|
|
12
12
|
|
13
13
|
class << self
|
14
14
|
def find_or_clone(address)
|
15
|
-
find { |obj| obj.same_as? address } || address.clone
|
15
|
+
all.to_a.find { |obj| obj.same_as? address } || address.clone
|
16
16
|
end
|
17
17
|
end
|
18
18
|
|
@@ -31,5 +31,9 @@ module Comable
|
|
31
31
|
def full_name
|
32
32
|
"#{family_name} #{first_name}"
|
33
33
|
end
|
34
|
+
|
35
|
+
def full_address
|
36
|
+
"#{state_name} #{city} #{detail}"
|
37
|
+
end
|
34
38
|
end
|
35
39
|
end
|
data/app/models/comable/stock.rb
CHANGED
@@ -4,6 +4,7 @@ module Comable
|
|
4
4
|
# 商品に複数紐付き、品数やSKU(Stock Keeping Unit)情報を保持する。
|
5
5
|
#
|
6
6
|
class Stock < ActiveRecord::Base
|
7
|
+
include Comable::SkuItem
|
7
8
|
include Comable::SkuChoice
|
8
9
|
|
9
10
|
belongs_to :product, class_name: Comable::Product.name
|
@@ -33,7 +34,8 @@ module Comable
|
|
33
34
|
|
34
35
|
delegate :name, to: :product
|
35
36
|
delegate :price, to: :product
|
36
|
-
delegate :
|
37
|
+
delegate :sku_h_item_name, to: :product
|
38
|
+
delegate :sku_v_item_name, to: :product
|
37
39
|
|
38
40
|
# 在庫の有無を取得する
|
39
41
|
#
|
data/config/locales/ja.yml
CHANGED
@@ -105,6 +105,7 @@ ja:
|
|
105
105
|
you_can_drag_and_drop: ドラッグ&ドロップの操作でツリーを編集できます。
|
106
106
|
you_can_right_click: 右クリックでメニューを表示できます。
|
107
107
|
link_to_add_new_node: '次のリンクから新しいカテゴリを追加できます: '
|
108
|
+
link_to_add_new_stock: '次のリンクから新しい在庫を追加できます: '
|
108
109
|
check_this_product_in_frontend: 'この商品をフロントで確認する'
|
109
110
|
note: 'NOTE:'
|
110
111
|
results: 件
|
@@ -118,10 +119,19 @@ ja:
|
|
118
119
|
better_than_last_week: '先週との比較 (%{percentage}%)'
|
119
120
|
edit_profile: プロフィールを編集
|
120
121
|
please_fill_when_using_sku: SKUを利用する場合はこの項目を記入してください。
|
122
|
+
operation: 操作
|
123
|
+
stocks: 在庫
|
124
|
+
clear_search_conditions: 検索条件をクリア
|
125
|
+
bill: 請求先
|
126
|
+
ship: 配送先
|
127
|
+
add_sub_image: サブ画像を追加
|
128
|
+
sign_in: ログイン
|
129
|
+
sign_out: ログアウト
|
121
130
|
nav:
|
122
131
|
dashboard: ダッシュボード
|
123
132
|
order: 注文管理
|
124
133
|
product: 商品管理
|
134
|
+
stock: 在庫管理
|
125
135
|
category: カテゴリ
|
126
136
|
customer: ユーザー
|
127
137
|
general_settings: 一般設定
|
@@ -130,7 +140,6 @@ ja:
|
|
130
140
|
payment_method: 決済管理
|
131
141
|
products:
|
132
142
|
detail: 商品詳細
|
133
|
-
stock: 在庫管理
|
134
143
|
orders:
|
135
144
|
detail: 注文明細
|
136
145
|
cart: カート情報
|
@@ -153,6 +162,7 @@ ja:
|
|
153
162
|
edit: 編集する
|
154
163
|
update: 変更する
|
155
164
|
destroy: 削除する
|
165
|
+
save: 保存する
|
156
166
|
cancel: キャンセル
|
157
167
|
categories:
|
158
168
|
new_node: 新しいカテゴリ
|
@@ -9,8 +9,24 @@ if StateMachine::VERSION != '1.2.0'
|
|
9
9
|
Rails.logger.warn 'Please remove me, StateMachine version has changed'
|
10
10
|
end
|
11
11
|
|
12
|
-
if Rails.version =~ /^4
|
12
|
+
if Rails.version =~ /^4./
|
13
13
|
module StateMachine::Integrations::ActiveModel
|
14
14
|
public :around_validation
|
15
15
|
end
|
16
16
|
end
|
17
|
+
|
18
|
+
if Rails.version =~ /^4.2./
|
19
|
+
# Hacks around https://github.com/pluginaweek/state_machine/issues/334
|
20
|
+
module StateMachine::Integrations::ActiveRecord
|
21
|
+
def define_state_initializer
|
22
|
+
define_helper :instance, <<-end_eval, __FILE__, __LINE__ + 1
|
23
|
+
def initialize(*)
|
24
|
+
super do |*args|
|
25
|
+
self.class.state_machines.initialize_states self
|
26
|
+
yield(*args) if block_given?
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end_eval
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: comable_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- YOSHIDA Hiroki
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-03-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -19,7 +19,7 @@ dependencies:
|
|
19
19
|
version: 3.2.0
|
20
20
|
- - "<"
|
21
21
|
- !ruby/object:Gem::Version
|
22
|
-
version:
|
22
|
+
version: '5'
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -29,7 +29,7 @@ dependencies:
|
|
29
29
|
version: 3.2.0
|
30
30
|
- - "<"
|
31
31
|
- !ruby/object:Gem::Version
|
32
|
-
version:
|
32
|
+
version: '5'
|
33
33
|
- !ruby/object:Gem::Dependency
|
34
34
|
name: devise
|
35
35
|
requirement: !ruby/object:Gem::Requirement
|
@@ -48,72 +48,72 @@ dependencies:
|
|
48
48
|
name: enumerize
|
49
49
|
requirement: !ruby/object:Gem::Requirement
|
50
50
|
requirements:
|
51
|
-
- - "
|
51
|
+
- - "~>"
|
52
52
|
- !ruby/object:Gem::Version
|
53
|
-
version:
|
53
|
+
version: 0.9.0
|
54
54
|
type: :runtime
|
55
55
|
prerelease: false
|
56
56
|
version_requirements: !ruby/object:Gem::Requirement
|
57
57
|
requirements:
|
58
|
-
- - "
|
58
|
+
- - "~>"
|
59
59
|
- !ruby/object:Gem::Version
|
60
|
-
version:
|
60
|
+
version: 0.9.0
|
61
61
|
- !ruby/object:Gem::Dependency
|
62
62
|
name: state_machine
|
63
63
|
requirement: !ruby/object:Gem::Requirement
|
64
64
|
requirements:
|
65
|
-
- - "
|
65
|
+
- - "~>"
|
66
66
|
- !ruby/object:Gem::Version
|
67
|
-
version:
|
67
|
+
version: 1.2.0
|
68
68
|
type: :runtime
|
69
69
|
prerelease: false
|
70
70
|
version_requirements: !ruby/object:Gem::Requirement
|
71
71
|
requirements:
|
72
|
-
- - "
|
72
|
+
- - "~>"
|
73
73
|
- !ruby/object:Gem::Version
|
74
|
-
version:
|
74
|
+
version: 1.2.0
|
75
75
|
- !ruby/object:Gem::Dependency
|
76
76
|
name: ancestry
|
77
77
|
requirement: !ruby/object:Gem::Requirement
|
78
78
|
requirements:
|
79
|
-
- - "
|
79
|
+
- - "~>"
|
80
80
|
- !ruby/object:Gem::Version
|
81
|
-
version:
|
81
|
+
version: 2.1.0
|
82
82
|
type: :runtime
|
83
83
|
prerelease: false
|
84
84
|
version_requirements: !ruby/object:Gem::Requirement
|
85
85
|
requirements:
|
86
|
-
- - "
|
86
|
+
- - "~>"
|
87
87
|
- !ruby/object:Gem::Version
|
88
|
-
version:
|
88
|
+
version: 2.1.0
|
89
89
|
- !ruby/object:Gem::Dependency
|
90
90
|
name: acts_as_list
|
91
91
|
requirement: !ruby/object:Gem::Requirement
|
92
92
|
requirements:
|
93
|
-
- - "
|
93
|
+
- - "~>"
|
94
94
|
- !ruby/object:Gem::Version
|
95
|
-
version:
|
95
|
+
version: 0.6.0
|
96
96
|
type: :runtime
|
97
97
|
prerelease: false
|
98
98
|
version_requirements: !ruby/object:Gem::Requirement
|
99
99
|
requirements:
|
100
|
-
- - "
|
100
|
+
- - "~>"
|
101
101
|
- !ruby/object:Gem::Version
|
102
|
-
version:
|
102
|
+
version: 0.6.0
|
103
103
|
- !ruby/object:Gem::Dependency
|
104
104
|
name: carrierwave
|
105
105
|
requirement: !ruby/object:Gem::Requirement
|
106
106
|
requirements:
|
107
|
-
- - "
|
107
|
+
- - "~>"
|
108
108
|
- !ruby/object:Gem::Version
|
109
|
-
version:
|
109
|
+
version: 0.10.0
|
110
110
|
type: :runtime
|
111
111
|
prerelease: false
|
112
112
|
version_requirements: !ruby/object:Gem::Requirement
|
113
113
|
requirements:
|
114
|
-
- - "
|
114
|
+
- - "~>"
|
115
115
|
- !ruby/object:Gem::Version
|
116
|
-
version:
|
116
|
+
version: 0.10.0
|
117
117
|
- !ruby/object:Gem::Dependency
|
118
118
|
name: cancancan
|
119
119
|
requirement: !ruby/object:Gem::Requirement
|
@@ -186,7 +186,8 @@ files:
|
|
186
186
|
- lib/comable_core.rb
|
187
187
|
- lib/tasks/comable_tasks.rake
|
188
188
|
homepage: https://github.com/hyoshida/comable#comable
|
189
|
-
licenses:
|
189
|
+
licenses:
|
190
|
+
- MIT
|
190
191
|
metadata: {}
|
191
192
|
post_install_message:
|
192
193
|
rdoc_options: []
|
@@ -196,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
196
197
|
requirements:
|
197
198
|
- - ">="
|
198
199
|
- !ruby/object:Gem::Version
|
199
|
-
version:
|
200
|
+
version: 2.1.5
|
200
201
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
201
202
|
requirements:
|
202
203
|
- - ">="
|