spree_cm_commissioner 2.8.15.pre.pre6 → 2.8.15.pre.pre7
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/Gemfile.lock +1 -1
- data/app/models/spree_cm_commissioner/voting_credit.rb +10 -0
- data/config/locales/en.yml +6 -0
- data/config/locales/km.yml +6 -0
- data/lib/spree_cm_commissioner/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4a205fe1769cf608152ba1af6e648195e07a827b1dacc9a5901341e8db1f6da9
|
|
4
|
+
data.tar.gz: 6a28c521b683bbd6a30bb331baf6f0ad54e5125eb1dd6a1922753d4a2cdb6e92
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d7ccfd518798c6c6054141d31665a4e214f34d249546eb9eec3f04a8d603b72165170545a5c5fc00af9aaaca2cdb80f786e1560aaa36ba02cc143b7bb08aace1
|
|
7
|
+
data.tar.gz: cef8efc6dcee06b9febc8949e5186575a7d81d8aed89f061989bf3596b800b77b7251513fd9095056f20b74fb137062fcde04dc4cef8518807815d784550ef8a
|
data/Gemfile.lock
CHANGED
|
@@ -33,6 +33,7 @@ module SpreeCmCommissioner
|
|
|
33
33
|
validates :free_votes_used, numericality: { greater_than_or_equal_to: 0 }
|
|
34
34
|
validates :paid_votes_amount, numericality: { greater_than_or_equal_to: 0 }
|
|
35
35
|
validates :paid_votes_used, numericality: { greater_than_or_equal_to: 0 }
|
|
36
|
+
validate :amounts_not_less_than_used
|
|
36
37
|
|
|
37
38
|
def free_votes_remaining
|
|
38
39
|
free_votes_amount - free_votes_used
|
|
@@ -60,6 +61,15 @@ module SpreeCmCommissioner
|
|
|
60
61
|
|
|
61
62
|
private
|
|
62
63
|
|
|
64
|
+
def amounts_not_less_than_used
|
|
65
|
+
if free_votes_used.to_i.positive? && free_votes_amount.to_i < free_votes_used.to_i
|
|
66
|
+
errors.add(:free_votes_amount, :less_than_used, used: free_votes_used)
|
|
67
|
+
end
|
|
68
|
+
return unless paid_votes_used.to_i.positive? && paid_votes_amount.to_i < paid_votes_used.to_i
|
|
69
|
+
|
|
70
|
+
errors.add(:paid_votes_amount, :less_than_used, used: paid_votes_used)
|
|
71
|
+
end
|
|
72
|
+
|
|
63
73
|
def set_created_by
|
|
64
74
|
self.created_by ||= user
|
|
65
75
|
end
|
data/config/locales/en.yml
CHANGED
|
@@ -562,6 +562,12 @@ en:
|
|
|
562
562
|
advanced_from_session: 'was advanced from a previous session and cannot be removed directly. Clear the advancement in the source session instead.'
|
|
563
563
|
pre_vote_session: 'cannot be removed from a pre-vote session.'
|
|
564
564
|
has_advanced_to_session: 'has been assigned to advance to another session. Clear the advancement first before removing this contestant.'
|
|
565
|
+
spree_cm_commissioner/voting_credit:
|
|
566
|
+
attributes:
|
|
567
|
+
free_votes_amount:
|
|
568
|
+
less_than_used: "cannot be less than free votes used (%{used})"
|
|
569
|
+
paid_votes_amount:
|
|
570
|
+
less_than_used: "cannot be less than paid votes used (%{used})"
|
|
565
571
|
spree_cm_commissioner/tenant:
|
|
566
572
|
attributes:
|
|
567
573
|
host:
|
data/config/locales/km.yml
CHANGED
|
@@ -425,6 +425,12 @@ km:
|
|
|
425
425
|
advanced_from_session: 'ត្រូវបានដំឡើងពី session មុន ហើយមិនអាចដកចេញដោយផ្ទាល់បានទេ។ សូមលុបការដំឡើងនៅក្នុង session ប្រភពជំនួសវិញ។'
|
|
426
426
|
pre_vote_session: 'មិនអាចដកចេញពី pre-vote session បានទេ។'
|
|
427
427
|
has_advanced_to_session: 'ត្រូវបានកំណត់ឱ្យដំឡើងទៅ session មួយទៀត។ សូមលុបការដំឡើងជាមុនសិន មុននឹងដកអ្នកចូលប្រកួតនេះចេញ។'
|
|
428
|
+
spree_cm_commissioner/voting_credit:
|
|
429
|
+
attributes:
|
|
430
|
+
free_votes_amount:
|
|
431
|
+
less_than_used: "មិនអាចតូចជាងចំនួនសំឡេងឥតគិតថ្លៃដែលបានប្រើ (%{used})"
|
|
432
|
+
paid_votes_amount:
|
|
433
|
+
less_than_used: "មិនអាចតូចជាងចំនួនសំឡេងបង់ប្រាក់ដែលបានប្រើ (%{used})"
|
|
428
434
|
spree_cm_commissioner/tenant:
|
|
429
435
|
attributes:
|
|
430
436
|
host:
|