spree_cm_commissioner 2.8.15.pre.pre5 → 2.8.15.pre.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c140d442dd82d4e6ceab7f2298d5664f229a2088162ddaa79dc58425830e96d
-  data.tar.gz: c408a1c86ab53f093b6055c408a7690a3ce6d4e279895751dc1dea3d6efed79f
+  metadata.gz: 4a205fe1769cf608152ba1af6e648195e07a827b1dacc9a5901341e8db1f6da9
+  data.tar.gz: 6a28c521b683bbd6a30bb331baf6f0ad54e5125eb1dd6a1922753d4a2cdb6e92
 SHA512:
-  metadata.gz: 4b3f6e3039b7b3274db1812622975376ef789e940125b8494a153900546b66162a4ec6f7df3094ccb85e70d0ebbb91babb671dc169517c406b7283a347d29fc1
-  data.tar.gz: f681c97fd4ec16641959c971475f3f6c8b608536178c2edcba48acc87f0083210893e6c6dd35662f3b3e11b8eeec31fc000b35b6328b605d9397816944a40e57
+  metadata.gz: d7ccfd518798c6c6054141d31665a4e214f34d249546eb9eec3f04a8d603b72165170545a5c5fc00af9aaaca2cdb80f786e1560aaa36ba02cc143b7bb08aace1
+  data.tar.gz: cef8efc6dcee06b9febc8949e5186575a7d81d8aed89f061989bf3596b800b77b7251513fd9095056f20b74fb137062fcde04dc4cef8518807815d784550ef8a

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.8.15.pre.pre5)
+    spree_cm_commissioner (2.8.15.pre.pre7)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

data/app/models/spree_cm_commissioner/voting_credit.rb

@@ -33,6 +33,7 @@ module SpreeCmCommissioner
     validates :free_votes_used, numericality: { greater_than_or_equal_to: 0 }
     validates :paid_votes_amount, numericality: { greater_than_or_equal_to: 0 }
     validates :paid_votes_used, numericality: { greater_than_or_equal_to: 0 }
+    validate :amounts_not_less_than_used
 
     def free_votes_remaining
       free_votes_amount - free_votes_used
@@ -60,6 +61,15 @@ module SpreeCmCommissioner
 
     private
 
+    def amounts_not_less_than_used
+      if free_votes_used.to_i.positive? && free_votes_amount.to_i < free_votes_used.to_i
+        errors.add(:free_votes_amount, :less_than_used, used: free_votes_used)
+      end
+      return unless paid_votes_used.to_i.positive? && paid_votes_amount.to_i < paid_votes_used.to_i
+
+      errors.add(:paid_votes_amount, :less_than_used, used: paid_votes_used)
+    end
+
     def set_created_by
       self.created_by ||= user
     end

data/app/services/spree_cm_commissioner/voting_credits/allocate.rb

@@ -11,16 +11,21 @@ module SpreeCmCommissioner
 
         ActiveRecord::Base.transaction do
           voting_credit = find_or_create_credit
-          allocations = episode_line_items.map do |line_item|
+
+          total_paid_vote_credits = unallocated_line_items.reject { |li| li.product.claimable_vote_package }.sum do |line_item|
+            SpreeCmCommissioner::VotingCredits::CreditCalculator.new(line_item).call
+          end
+
+          total_free_vote_credits = unallocated_line_items.select { |li| li.product.claimable_vote_package }.sum do |line_item|
             SpreeCmCommissioner::VotingCredits::CreditCalculator.new(line_item).call
           end
-          total_paid_vote_credits = allocations.sum
 
           # Use with_lock to ensure we have a lock on the voting credit record while we:
           # - Modify data inside the block
           # - Need to prevent race conditions
           voting_credit.with_lock do
             voting_credit.paid_votes_amount += total_paid_vote_credits
+            voting_credit.free_votes_amount += total_free_vote_credits
             voting_credit.save!
           end
 
@@ -55,6 +60,24 @@ module SpreeCmCommissioner
                                       .to_a
       end
 
+      def unallocated_line_items
+        return episode_line_items if @order.user_id.blank?
+
+        episode_line_items.reject do |line_item|
+          next false unless line_item.price.zero?
+
+          scope = line_item.claim_scope
+          next false if scope.nil?
+
+          SpreeCmCommissioner::Claim.free_claimed?(
+            user_id: @order.user_id,
+            product_id: line_item.product.id,
+            claimable_id: scope[:claimable_id],
+            claimable_type: scope[:claimable_type]
+          )
+        end
+      end
+
       def find_or_create_credit
         SpreeCmCommissioner::VotingCredit.active.find_or_create_by!(
           tenant_id: @order.tenant_id,

data/config/locales/en.yml

@@ -562,6 +562,12 @@ en:
               advanced_from_session: 'was advanced from a previous session and cannot be removed directly. Clear the advancement in the source session instead.'
               pre_vote_session: 'cannot be removed from a pre-vote session.'
               has_advanced_to_session: 'has been assigned to advance to another session. Clear the advancement first before removing this contestant.'
+        spree_cm_commissioner/voting_credit:
+          attributes:
+            free_votes_amount:
+              less_than_used: "cannot be less than free votes used (%{used})"
+            paid_votes_amount:
+              less_than_used: "cannot be less than paid votes used (%{used})"
         spree_cm_commissioner/tenant:
           attributes:
             host:

data/config/locales/km.yml

@@ -425,6 +425,12 @@ km:
               advanced_from_session: 'ត្រូវបានដំឡើងពី session មុន ហើយមិនអាចដកចេញដោយផ្ទាល់បានទេ។ សូមលុបការដំឡើងនៅក្នុង session ប្រភពជំនួសវិញ។'
               pre_vote_session: 'មិនអាចដកចេញពី pre-vote session បានទេ។'
               has_advanced_to_session: 'ត្រូវបានកំណត់ឱ្យដំឡើងទៅ session មួយទៀត។ សូមលុបការដំឡើងជាមុនសិន មុននឹងដកអ្នកចូលប្រកួតនេះចេញ។'
+        spree_cm_commissioner/voting_credit:
+          attributes:
+            free_votes_amount:
+              less_than_used: "មិនអាចតូចជាងចំនួនសំឡេងឥតគិតថ្លៃដែលបានប្រើ (%{used})"
+            paid_votes_amount:
+              less_than_used: "មិនអាចតូចជាងចំនួនសំឡេងបង់ប្រាក់ដែលបានប្រើ (%{used})"
         spree_cm_commissioner/tenant:
           attributes:
             host:

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.8.15.pre.pre5'.freeze
+  VERSION = '2.8.15.pre.pre7'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.8.15.pre.pre5
+  version: 2.8.15.pre.pre7
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-29 00:00:00.000000000 Z
+date: 2026-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree