comable_backend 0.4.0 → 0.4.1
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/controllers/comable/admin/dashboard_controller.rb +4 -5
- data/app/controllers/comable/admin/shipment_methods_controller.rb +1 -1
- data/app/controllers/comable/admin/store_controller.rb +1 -2
- data/app/controllers/comable/admin/trackers_controller.rb +1 -1
- data/app/views/comable/admin/dashboard/show.slim +0 -1
- data/app/views/comable/admin/payment_methods/index.slim +1 -1
- data/app/views/comable/admin/shipment_methods/_form.slim +3 -3
- data/app/views/comable/admin/shipment_methods/index.slim +1 -1
- data/app/views/comable/admin/store/_form.slim +5 -7
- data/app/views/comable/admin/trackers/_form.slim +3 -3
- data/app/views/comable/admin/trackers/index.slim +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 99b392fa967786593a01f9fd3f6f3220ccc4f9d1
|
|
4
|
+
data.tar.gz: 1b0c10eb4e1c8602084e30af09cd8827086f626a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1957e2efe162941bf28743107a76774d65e6b6f5ba3a560c72c8b22c42efc45b4c4bf680cdbeb6e082e557ebdab36c950fc537fd9c45b19a08fe8d6236e0ff75
|
|
7
|
+
data.tar.gz: 1bbf24c6eaa5ea90d78cdd30a0882653e9dc1e797544024e07da3245d8b9d0b9d5931a227a76d73027738b7afca9c4f7f13baa199ba4d7e3af911593cbaaa6b4
|
|
@@ -9,11 +9,10 @@ module Comable
|
|
|
9
9
|
@last_week_orders = Comable::Order.last_week
|
|
10
10
|
authorize! :read, @this_month_orders
|
|
11
11
|
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
# authorize! :read, @this_week_users
|
|
12
|
+
@this_month_users = Comable::User.with_role(:customer).this_month
|
|
13
|
+
@this_week_users = Comable::User.with_role(:customer).this_week
|
|
14
|
+
@last_week_users = Comable::User.with_role(:customer).last_week
|
|
15
|
+
authorize! :read, @this_week_users
|
|
17
16
|
end
|
|
18
17
|
end
|
|
19
18
|
end
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
tr
|
|
27
27
|
td
|
|
28
28
|
= link_to payment_method.name, comable.admin_payment_method_path(payment_method)
|
|
29
|
-
/- unless payment_method.
|
|
29
|
+
/- unless payment_method.activated_flag
|
|
30
30
|
/ span.fa.fa-eye-slash.text-muted<
|
|
31
31
|
td
|
|
32
32
|
= payment_method.payment_provider.display_name
|
|
@@ -24,6 +24,6 @@
|
|
|
24
24
|
|
|
25
25
|
.form-group
|
|
26
26
|
.checkbox
|
|
27
|
-
= f.label :
|
|
28
|
-
= f.check_box :
|
|
29
|
-
= f.object.class.human_attribute_name(:
|
|
27
|
+
= f.label :activated_flag do
|
|
28
|
+
= f.check_box :activated_flag
|
|
29
|
+
= f.object.class.human_attribute_name(:activated_flag)
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
tr
|
|
27
27
|
td
|
|
28
28
|
= link_to shipment_method.name, comable.admin_shipment_method_path(shipment_method)
|
|
29
|
-
- unless shipment_method.
|
|
29
|
+
- unless shipment_method.activated_flag
|
|
30
30
|
span.fa.fa-eye-slash.text-muted<
|
|
31
31
|
td
|
|
32
32
|
= number_to_currency shipment_method.fee
|
|
@@ -24,11 +24,9 @@
|
|
|
24
24
|
= f.text_field :meta_description
|
|
25
25
|
|
|
26
26
|
.form-group
|
|
27
|
-
= f.label :
|
|
28
|
-
= f.email_field :
|
|
27
|
+
= f.label :email
|
|
28
|
+
= f.email_field :email
|
|
29
29
|
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
= f.check_box :email_activate_flag
|
|
34
|
-
= f.object.class.human_attribute_name(:email_activate_flag)
|
|
30
|
+
.help-block
|
|
31
|
+
p
|
|
32
|
+
= Comable.t('admin.help_of_store_email')
|
|
@@ -12,9 +12,9 @@
|
|
|
12
12
|
.col-md-9
|
|
13
13
|
.form-group
|
|
14
14
|
.checkbox
|
|
15
|
-
= f.label :
|
|
16
|
-
= f.check_box :
|
|
17
|
-
= f.object.class.human_attribute_name(:
|
|
15
|
+
= f.label :activated_flag do
|
|
16
|
+
= f.check_box :activated_flag
|
|
17
|
+
= f.object.class.human_attribute_name(:activated_flag)
|
|
18
18
|
|
|
19
19
|
.form-group
|
|
20
20
|
= f.label :name
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: comable_backend
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.4.
|
|
4
|
+
version: 0.4.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- YOSHIDA Hiroki
|
|
@@ -16,14 +16,14 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - '='
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: 0.4.
|
|
19
|
+
version: 0.4.1
|
|
20
20
|
type: :runtime
|
|
21
21
|
prerelease: false
|
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
|
23
23
|
requirements:
|
|
24
24
|
- - '='
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
|
-
version: 0.4.
|
|
26
|
+
version: 0.4.1
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: rails
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -400,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
400
400
|
version: '0'
|
|
401
401
|
requirements: []
|
|
402
402
|
rubyforge_project:
|
|
403
|
-
rubygems_version: 2.
|
|
403
|
+
rubygems_version: 2.4.5
|
|
404
404
|
signing_key:
|
|
405
405
|
specification_version: 4
|
|
406
406
|
summary: Provide backend functions for Comable.
|