spree_cm_commissioner 2.0.0.pre.pre → 2.0.0.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c84700dfc0c91553426b4c3957ab2e2906f4327f9b968efe1d88ce590d69a63
-  data.tar.gz: c98479e1dd2ff5f4def2b7799ff2ffc894812dd737e52a6e2488839318ca514b
+  metadata.gz: b85b4b7a446688bc4aed2974e7150a9155a2d919b998188fc7e575ccea0d2714
+  data.tar.gz: 134a3e165301c382a7e48016e768755420d32003a31cf3b3dac79f33b7a0d5a6
 SHA512:
-  metadata.gz: ddc75d3e7e17ad18de9c620336c8233191f268bd2c18911455b6169f4a6a379b2d8d537e1a7cc6c2d8f280842772b787d19d3215263cf3a6856309f263712512
-  data.tar.gz: 551e01c90befa48ad8fa44adc40e9be2af4bda32319f05e562d66d099a0d729477f9ade32aee9c9256728481756e35ccec863782d033962756daba9720e868e8
+  metadata.gz: fd91cb46cb05faec83d0978df8312e272265ad03d1d14c1319ea0303081521dac9468a4e9e6fd4e72698e61c175fcddfc3bed53527e7f0ebe1a23f81062bf9c3
+  data.tar.gz: 1d04b75c972c6cff71fa6e95ca3882411a8a54b6b0b226183369a97b1360fa00c2c334e728203f647405313da8deec7298e4662dedfb068cc51540e4caf548d7

data/.env.example

@@ -24,3 +24,6 @@ WAITING_ROOM_DISABLED=no
 # Vattanac Bank
 VATTANAC_AES_SECRET_KEY= ""
 VATTANAC_PUBLIC_KEY=""
+
+# Organizer URL
+ORGANIZER_URL=http://127.0.0.1:4000/organizer

data/.github/workflows/test_and_build_gem.yml

@@ -10,7 +10,6 @@ on:
       - reopened
     branches:
       - develop
-      - milestone-77-scalable-design
   push:
     tags:
       - "*"
@@ -38,8 +37,7 @@ jobs:
               console.log("PR title format is correct.");
             }
       - name: Check commit messages format
-        # skip validation if the PR is from the milestone-77-scalable-design branch for temporary
-        if: github.event_name == 'pull_request' && github.head_ref != 'milestone-77-scalable-design'
+        if: github.event_name == 'pull_request'
         uses: actions/github-script@v7
         with:
           script: |
@@ -138,17 +136,6 @@ jobs:
           --health-timeout 5s
           --health-retries 5
 
-      redis:
-        image: redis
-        # Set health checks to wait until redis has started
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 6379:6379 # Maps port 6379 on service container to the host
-
     steps:
       - uses: actions/checkout@v3
 
@@ -184,9 +171,8 @@ jobs:
       - name: Run test
         env:
           DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
-          REDIS_URL: redis://localhost:6379/0
 
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'develop'
         run: |
           bundle exec rake
 

data/.gitignore

@@ -28,5 +28,4 @@ node_modules
 # VScode
 .vscode
 !.vscode/.settings.json
-.env
-vendor/bundle/
+.env

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.0.0.pre.pre)
+    spree_cm_commissioner (2.0.0.pre.pre1)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
@@ -42,7 +42,6 @@ PATH
       aws-sdk-s3
       blazer (~> 3.0.4)
       byebug
-      connection_pool
       counter_culture (~> 3.2)
       dry-validation (~> 1.10)
       elasticsearch (~> 8.5)
@@ -55,12 +54,9 @@ PATH
       interactor (~> 3.1)
       jwt (>= 2.5.0)
       noticed (~> 1.6)
-      paper_trail (~> 16.0)
       phonelib
       premailer-rails
       rails (~> 7.0.4)
-      redis
-      redis-rails
       rqrcode (~> 2.0)
       searchkick (~> 5.1)
       simple_calendar (~> 2.4)
@@ -576,10 +572,6 @@ GEM
     nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
-      racc (~> 1.4)
     noticed (1.6.3)
       http (>= 4.0.0)
       rails (>= 5.2.0)
@@ -588,9 +580,6 @@ GEM
       sawyer (~> 0.9)
     orm_adapter (0.5.0)
     os (1.1.4)
-    paper_trail (16.0.0)
-      activerecord (>= 6.1)
-      request_store (~> 1.4)
     parallel (1.23.0)
     paranoia (2.6.3)
       activerecord (>= 5.1, < 7.2)
@@ -626,8 +615,6 @@ GEM
       activesupport (>= 2.3.14)
     racc (1.7.1)
     rack (2.2.8)
-    rack-session (1.0.2)
-      rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
     rails (7.0.8)
@@ -671,31 +658,13 @@ GEM
     rbtree (0.4.6)
     redis (5.0.7)
       redis-client (>= 0.9.0)
-    redis-actionpack (5.5.0)
-      actionpack (>= 5)
-      redis-rack (>= 2.1.0, < 4)
-      redis-store (>= 1.1.0, < 2)
-    redis-activesupport (5.3.0)
-      activesupport (>= 3, < 8)
-      redis-store (>= 1.3, < 2)
     redis-client (0.17.0)
       connection_pool
-    redis-rack (3.0.0)
-      rack-session (>= 0.2.0)
-      redis-store (>= 1.2, < 2)
-    redis-rails (5.0.2)
-      redis-actionpack (>= 5.0, < 6)
-      redis-activesupport (>= 5.0, < 6)
-      redis-store (>= 1.2, < 2)
-    redis-store (1.11.0)
-      redis (>= 4, < 6)
     regexp_parser (2.8.2)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
-    request_store (1.7.0)
-      rack (>= 1.4)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)

data/Rakefile

@@ -2,7 +2,7 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-require 'spree/testing_support/common_rake'
+require 'spree/testing_support/extension_rake'
 
 RSpec::Core::RakeTask.new
 
@@ -14,37 +14,8 @@ task :default do
   Rake::Task[:spec].invoke
 end
 
-# Copied from:
-# spree_core:lib/spree/testing_support/common_rake.rb
-# But refactored to skip frontend & backend setup.
 desc 'Generates a dummy app for testing'
-task :test_app do |_t, args|
-  require 'spree_cm_commissioner'
-  require "generators/spree_cm_commissioner/install/install_generator"
-
-  Rails.env = ENV['RAILS_ENV'] = 'test'
-
-  Spree::DummyGeneratorHelper.inject_extension_requirements = true
-  Spree::DummyGenerator.start ["--lib_name=spree_cm_commissioner", '--quiet']
-  Spree::InstallGenerator.start [
-    "--lib_name=spree_cm_commissioner",
-    '--auto-accept',
-    '--migrate=false',
-    '--seed=false',
-    '--sample=false',
-    '--quiet',
-    '--copy_storefront=false',
-    "--install_storefront=false",
-    "--install_admin=false",
-    "--user_class=Spree::User"
-  ]
-
-  puts 'Setting up dummy database...'
-  system('bin/rails db:environment:set RAILS_ENV=test')
-  system('bundle exec rake db:drop db:create')
-  Spree::DummyModelGenerator.start
-  system('bundle exec rake db:migrate')
-
-  puts 'Running extension installation generator...'
-  SpreeCmCommissioner::Generators::InstallGenerator.start(['--auto-run-migrations'])
+task :test_app do
+  ENV['LIB_NAME'] = 'spree_cm_commissioner'
+  Rake::Task['extension:test_app'].invoke
 end

data/app/assets/images/cm-hangmeas-checkout_image.svg

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="payment_proccessing" data-name="payment proccessing" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 334 200">
+  <defs>
+    <clipPath id="clippath">
+      <path d="m332.72,16.62v166.75c0,8.27-6.28,15.08-14.33,15.92-.55.05-1.11.08-1.67.08H16c-.48,0-.96-.02-1.43-.06-8.17-.73-14.57-7.59-14.57-15.94V16.62C0,7.78,7.16.62,16,.62h300.72c8.84,0,16,7.16,16,16Z" style="fill: none;"/>
+    </clipPath>
+  </defs>
+  <g style="clip-path: url(#clippath);">
+    <path d="m332.72,16.62v166.75c0,8.27-6.28,15.08-14.33,15.92-.55.05-1.11.08-1.67.08H16c-.48,0-.96-.02-1.43-.06-8.17-.73-14.57-7.59-14.57-15.94V16.62C0,7.78,7.16.62,16,.62h300.72c8.84,0,16,7.16,16,16Z" style="fill: #130d07;"/>
+    <path d="m160.11,89.69c1.41-5.81-3.61-9.74-10.21-9.27-6.6.47-26.31,10.68-28.51,12.26-2.2,1.57-29.54,6.6-34.25,3.77-4.71-2.83-12.46-7.49-12.46-7.49,0,0-23.81-23.81-40.47,2.86-16.67,26.66-13.99,61.42-13.99,61.42l-24.1,29.05s-10.95,10,3.81,19.05,22.11,18.14,31.15,21.3c9.04,3.16,14.46-7,14.46-7.68,0-.68,19.43-30.27,19.43-30.27,10.27-.69,20.53-1.41,30.79-2.17,10.81-.8,24.65.44,31.99-9.08,3.2-4.15,1.59-8.37-.02-12.85.06.18,3.68-1,4-1.13,1.81-.72,3.12-1.91,3.94-3.7,1.55-3.36,2.03-8.12.07-11.41-2.91-4.88-3.85-5.31-3.85-5.31.93.42,4.7-2.76,5.32-3.27,2.69-2.21,4.81-5.03,5.27-8.57,1.31-10.16-10.01-17.26-18.56-19.27,5.59,1.31,10.8,2.15,16.21-.39,3.01-1.41,5.69-3.43,8.35-5.44,4.02-3.03,10.38-7.18,11.65-12.41" style="fill: #e89875;"/>
+    <path d="m138.73,45.68c-1.83-.91-5.84-1.99-7.86-2.27-3.17-.44-12.78-.68-12.78-.68l-1.24,3.76-31.45-1.3c-4.73-.2-8.98,2.88-10.27,7.44l-27.87,101.59c-1.74,6.14,2.5,12.35,8.85,12.97l49.44,1.78c4.98.49,9.59-2.69,10.89-7.53l27.25-101.35c.17-.64.26-1.28.31-1.92,0-.02.01-.05.02-.07,1.59-7.52-1.35-10.47-5.29-12.43Z" style="fill: #302b31;"/>
+    <path d="m51.51,163.26l49.44,1.78c4.98.49,9.59-2.69,10.89-7.53l27.25-101.35c1.7-6.33-2.91-12.61-9.46-12.88l-48.82-2.02c-4.73-.2-8.98,2.88-10.27,7.44l-27.87,101.59c-1.74,6.14,2.5,12.35,8.85,12.97Z" style="fill: #212028;"/>
+    <path d="m108.45,126.85c-1.64.07-3.43-.23-5.08-.3-4.13-.18-8.26-.36-12.39-.54l-22.43-.98-.81-.04c-2.87-.41-4.61-1.99-3.7-4.96l.84-3.54c.55-2.49,2.89-4.15,5.42-3.86,13.54.41,27.15.41,40.66,1.23,2,.12,4.17.45,4.34,2.96.15,2.13-1.09,4.94-1.91,6.87-1.02,2.41-2.87,3.07-4.95,3.16Z" style="fill: #f59b1d;"/>
+    <path d="m117.78,96.1l-48.7-1.94c-2.03-.08-3.25-1.77-2.74-3.76l8.36-32.34c.52-2,2.58-3.55,4.61-3.47l48.7,1.94c2.03.08,3.25,1.77,2.74,3.76l-8.36,32.34c-.52,2-2.58,3.55-4.61,3.47Z" style="fill: #fffaf8;"/>
+    <path d="m85.83,77.72l-8.87-.35c-.88-.04-1.41-.77-1.19-1.63l1.23-4.78c.22-.87,1.12-1.54,2-1.51l8.87.35c.88.04,1.41.77,1.19,1.63l-1.23,4.78c-.22.87-1.12,1.54-2,1.51Z" style="fill: #d6d6d6;"/>
+    <path d="m124.55,64.16l-9.8-.39c-.62-.02-1-.54-.84-1.15l.45-1.74c.16-.61.79-1.09,1.41-1.06l9.8.39c.62.02,1,.54.84,1.15l-.45,1.74c-.16.61-.79,1.09-1.41,1.06Z" style="fill: #d6d6d6;"/>
+    <path d="m84.05,81.98l-8.95-.36c-.47-.02-.75-.41-.63-.87l.22-.86c.12-.46.59-.82,1.06-.8l8.95.36c.47.02.75.41.63.87l-.22.86c-.12.46-.59.82-1.06.8Z" style="fill: #d6d6d6;"/>
+    <path d="m99.83,91.71l-27.44-1.09c-.25-.01-.41-.22-.34-.47l.42-1.62c.06-.25.32-.44.57-.43l27.44,1.09c.25.01.41.22.34.47l-.42,1.62c-.06.25-.32.44-.57.43Z" style="fill: #d6d6d6;"/>
+    <path d="m95.54,82.43l-8.95-.36c-.47-.02-.75-.41-.63-.87l.22-.86c.12-.46.59-.82,1.06-.8l8.95.36c.47.02.75.41.63.87l-.22.86c-.12.46-.59.82-1.06.8Z" style="fill: #d6d6d6;"/>
+    <path d="m107.03,82.89l-8.95-.36c-.47-.02-.75-.41-.63-.87l.22-.86c.12-.46.59-.82,1.06-.8l8.95.36c.47.02.75.41.63.87l-.22.86c-.12.46-.59.82-1.06.8Z" style="fill: #d6d6d6;"/>
+    <path d="m118.52,83.35l-8.95-.36c-.47-.02-.75-.41-.63-.87l.22-.86c.12-.46.59-.82,1.06-.8l8.95.36c.47.02.75.41.63.87l-.22.86c-.12.46-.59.82-1.06.8Z" style="fill: #d6d6d6;"/>
+    <path d="m111.65,93.7c-.49.15-.94.45-1.44.61-2.03.64-4.12-.62-4.15-2.53-.02-1.28.45-2.44,1.6-3.42.84-.72,1.78-1.08,2.78-1.14.88-.05,1.65.12,2.24.65.12.11.29.16.44.24-.17.19.02.23.08.32.37.57.57,1.21.45,1.96-.2,1.22-.73,2.32-1.89,3.17-.05.03-.08.09-.11.14Z" style="fill: #d6d6d6;"/>
+    <path d="m111.65,93.7s.07-.11.11-.14c1.16-.85,1.69-1.95,1.89-3.17.12-.75-.08-1.39-.45-1.96-.06-.09-.25-.14-.08-.32.59-.27,1.16-.59,1.79-.67,2.25-.26,3.6.86,3.66,2.68.06,1.96-1.32,3.73-3.42,4.37-1.29.39-2.36.14-3.23-.58-.09-.07-.18-.15-.26-.22Z" style="fill: #5e5e5e;"/>
+    <path d="m53.69,110.12s1.51-5.75,5.56,2.51c4.05,8.27,15.38,11.23,20.41,6.86s-.79-23.41-15.54-36.21c-14.75-12.8-30.48,5.41-37.12,19.9-6.65,14.49-6.78,50.07-6.78,50.07l48.9,21.12s8.3-15.25.02-34.98c-4.68-11.15-9.08-16.86-12.8-21.88-3.73-5.02-2.64-7.37-2.64-7.37Z" style="fill: #e89875;"/>
+    <g>
+      <rect x="222.73" y="98.72" width="8.27" height="27.35" style="fill: #fbc01a;"/>
+      <polygon points="231 100.13 222.73 100.13 221.53 95.4 232.39 95.4 231 100.13" style="fill: #fbc01a;"/>
+      <line x1="223.67" y1="100.13" x2="231" y2="100.13" style="fill: none; stroke: #f9b500; stroke-miterlimit: 10; stroke-width: .5px;"/>
+      <polygon points="222.73 126.08 231 126.08 232.2 130.8 221.33 130.8 222.73 126.08" style="fill: #fbc01a;"/>
+      <line x1="231" y1="126.08" x2="222.73" y2="126.08" style="fill: none; stroke: #f9b500; stroke-miterlimit: 10; stroke-width: .5px;"/>
+    </g>
+    <g>
+      <rect x="240.34" y="98.72" width="8.27" height="27.35" style="fill: #f4b200;"/>
+      <polygon points="248.61 100.13 240.34 100.13 239.15 95.4 250.01 95.4 248.61 100.13" style="fill: #f4b200;"/>
+      <polygon points="240.35 126.08 248.62 126.08 249.81 130.8 238.95 130.8 240.35 126.08" style="fill: #f4b200;"/>
+    </g>
+    <g>
+      <rect x="257.95" y="98.72" width="8.27" height="27.35" style="fill: #fbc01a;"/>
+      <polygon points="266.22 100.13 257.95 100.13 256.76 95.4 267.62 95.4 266.22 100.13" style="fill: #fbc01a;"/>
+      <line x1="258.9" y1="100.13" x2="266.22" y2="100.13" style="fill: none; stroke: #f9b500; stroke-miterlimit: 10; stroke-width: .5px;"/>
+      <polygon points="257.96 126.08 266.23 126.08 267.42 130.8 256.56 130.8 257.96 126.08" style="fill: #fbc01a;"/>
+      <line x1="266.22" y1="126.08" x2="257.96" y2="126.08" style="fill: none; stroke: #f9b500; stroke-miterlimit: 10; stroke-width: .5px;"/>
+    </g>
+    <g>
+      <rect x="275.56" y="98.72" width="8.27" height="27.35" style="fill: #fbc01a;"/>
+      <polygon points="283.84 100.13 275.56 100.13 274.37 95.4 285.23 95.4 283.84 100.13" style="fill: #fbc01a;"/>
+      <line x1="276.51" y1="100.13" x2="283.84" y2="100.13" style="fill: none; stroke: #f9b500; stroke-miterlimit: 10; stroke-width: .5px;"/>
+      <polygon points="275.57 126.08 283.84 126.08 285.04 130.8 274.17 130.8 275.57 126.08" style="fill: #fbc01a;"/>
+      <line x1="283.84" y1="126.08" x2="275.57" y2="126.08" style="fill: none; stroke: #f9b500; stroke-miterlimit: 10; stroke-width: .5px;"/>
+    </g>
+    <rect x="218.79" y="91.42" width="69.46" height="3.98" style="fill: #f9b500;"/>
+    <rect x="218.79" y="130.8" width="69.46" height="3.98" style="fill: #fbc01a;"/>
+    <rect x="209.25" y="134.79" width="88.53" height="4.09" style="fill: #f4b200;"/>
+    <path d="m216.67,88.29l34.23-15.08c2.1-.93,4.5-.93,6.6,0l34.23,15.08c1.62.71,1.11,3.13-.66,3.13h-73.75c-1.77,0-2.28-2.42-.66-3.13Z" style="fill: #fbc01a;"/>
+    <path d="m230.81,86.16l21.33-9.4c1.31-.58,2.8-.58,4.11,0l21.33,9.4c1.01.44.69,1.95-.41,1.95h-45.96c-1.1,0-1.42-1.51-.41-1.95Z" style="fill: #f4b200;"/>
+    <path d="m256.72,83.21c0-1.39-1.13-2.51-2.51-2.51s-2.51,1.13-2.51,2.51,1.13,2.51,2.51,2.51,2.51-1.13,2.51-2.51Z" style="fill: none; stroke: #f9b500; stroke-miterlimit: 10; stroke-width: .5px;"/>
+    <line x1="218.8" y1="131.54" x2="288.24" y2="131.54" style="fill: none; stroke: #f9b500; stroke-miterlimit: 10; stroke-width: .5px;"/>
+    <path d="m143.42,43.43l2.99-1.92c34.81-22.3,81.11-12.16,103.41,22.65h0" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 4px;"/>
+    <polyline points="242.93 64.16 250.34 64.16 250.34 56.12" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 3px;"/>
+    <path d="m253.66,141.68l-3.52,4.34c-28.53,29.92-75.91,31.04-105.83,2.5h0" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 4px;"/>
+    <polyline points="151 146.9 143.8 148.65 145.77 156.76" style="fill: none; stroke: #fff; stroke-miterlimit: 10; stroke-width: 3px;"/>
+  </g>
+</svg>

data/app/assets/images/cm-hangmeas-failed.svg

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  viewBox="0 0 52 52"
+  width="100"
+  height="100"
+>
+  <style>
+    .svg-failed {
+      stroke: white;
+      stroke-width: 5;
+      stroke-miterlimit: 10;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      fill: none;
+      animation: svg-failed-scale 0.3s ease-in-out 0.9s both;
+    }
+
+    .svg-failed-circle {
+      stroke: none;
+      fill: #FF5A5F;
+    }
+
+    .svg-failed-x {
+      stroke-dasharray: 48;
+      stroke-dashoffset: 48;
+      animation: svg-failed-draw 0.5s ease forwards 0.6s;
+    }
+
+    @keyframes svg-failed-draw {
+      to {
+        stroke-dashoffset: 0;
+      }
+    }
+
+    @keyframes svg-failed-scale {
+      0%, 100% {
+        transform: scale(1);
+      }
+      50% {
+        transform: scale(1.1);
+      }
+    }
+  </style>
+
+  <circle class="svg-failed-circle" cx="26" cy="26" r="25" />
+  <!-- X mark: two lines crossing -->
+  <path
+    class="svg-failed svg-failed-x"
+    d="M16 16 L36 36"
+  />
+  <path
+    class="svg-failed svg-failed-x"
+    d="M36 16 L16 36"
+  />
+</svg>

data/app/assets/images/cm-hangmeas-loader.svg

@@ -0,0 +1,50 @@
+<svg class="pl" width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <style>
+    .pl__ring { animation: ringA 3s linear infinite; }
+    .pl__ring--a { stroke: #F79E1B; }
+    .pl__ring--b { animation-name: ringB; stroke: #F79E1B; }
+    .pl__ring--c { animation-name: ringC; stroke: #F79E1B; }
+    .pl__ring--d { animation-name: ringD; stroke: #F79E1B; }
+
+    @keyframes ringA {
+      from, 4% { stroke-dasharray: 0 660; stroke-width: 20; stroke-dashoffset: -330; }
+      12% { stroke-dasharray: 60 600; stroke-width: 30; stroke-dashoffset: -335; }
+      32% { stroke-dasharray: 60 600; stroke-width: 30; stroke-dashoffset: -595; }
+      40%, 54% { stroke-dasharray: 0 660; stroke-width: 20; stroke-dashoffset: -660; }
+      62% { stroke-dasharray: 60 600; stroke-width: 30; stroke-dashoffset: -665; }
+      82% { stroke-dasharray: 60 600; stroke-width: 30; stroke-dashoffset: -925; }
+      90%, to { stroke-dasharray: 0 660; stroke-width: 20; stroke-dashoffset: -990; }
+    }
+    @keyframes ringB {
+      from, 12% { stroke-dasharray: 0 220; stroke-width: 20; stroke-dashoffset: -110; }
+      20% { stroke-dasharray: 20 200; stroke-width: 30; stroke-dashoffset: -115; }
+      40% { stroke-dasharray: 20 200; stroke-width: 30; stroke-dashoffset: -195; }
+      48%, 62% { stroke-dasharray: 0 220; stroke-width: 20; stroke-dashoffset: -220; }
+      70% { stroke-dasharray: 20 200; stroke-width: 30; stroke-dashoffset: -225; }
+      90% { stroke-dasharray: 20 200; stroke-width: 30; stroke-dashoffset: -305; }
+      98%, to { stroke-dasharray: 0 220; stroke-width: 20; stroke-dashoffset: -330; }
+    }
+    @keyframes ringC {
+      from { stroke-dasharray: 0 440; stroke-width: 20; stroke-dashoffset: 0; }
+      8% { stroke-dasharray: 40 400; stroke-width: 30; stroke-dashoffset: -5; }
+      28% { stroke-dasharray: 40 400; stroke-width: 30; stroke-dashoffset: -175; }
+      36%, 58% { stroke-dasharray: 0 440; stroke-width: 20; stroke-dashoffset: -220; }
+      66% { stroke-dasharray: 40 400; stroke-width: 30; stroke-dashoffset: -225; }
+      86% { stroke-dasharray: 40 400; stroke-width: 30; stroke-dashoffset: -395; }
+      94%, to { stroke-dasharray: 0 440; stroke-width: 20; stroke-dashoffset: -440; }
+    }
+    @keyframes ringD {
+      from, 8% { stroke-dasharray: 0 440; stroke-width: 20; stroke-dashoffset: 0; }
+      16% { stroke-dasharray: 40 400; stroke-width: 30; stroke-dashoffset: -5; }
+      36% { stroke-dasharray: 40 400; stroke-width: 30; stroke-dashoffset: -175; }
+      44%, 50% { stroke-dasharray: 0 440; stroke-width: 20; stroke-dashoffset: -220; }
+      58% { stroke-dasharray: 40 400; stroke-width: 30; stroke-dashoffset: -225; }
+      78% { stroke-dasharray: 40 400; stroke-width: 30; stroke-dashoffset: -395; }
+      86%, to { stroke-dasharray: 0 440; stroke-width: 20; stroke-dashoffset: -440; }
+    }
+  </style>
+  <circle class="pl__ring pl__ring--a" cx="150" cy="150" r="105" fill="none" stroke-width="20" stroke-dasharray="0 660" stroke-dashoffset="-330" stroke-linecap="round"/>
+  <circle class="pl__ring pl__ring--b" cx="150" cy="150" r="35" fill="none" stroke-width="20" stroke-dasharray="0 220" stroke-dashoffset="-110" stroke-linecap="round"/>
+  <circle class="pl__ring pl__ring--c" cx="115" cy="150" r="70" fill="none" stroke-width="20" stroke-dasharray="0 440" stroke-linecap="round"/>
+  <circle class="pl__ring pl__ring--d" cx="185" cy="150" r="70" fill="none" stroke-width="20" stroke-dasharray="0 440" stroke-linecap="round"/>
+</svg>

data/app/assets/images/cm-hangmeas-success.svg

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  viewBox="0 0 52 52"
+  width="100"
+  height="100"
+>
+  <style>
+    .svg-checkmark {
+      stroke: white;
+      stroke-width: 5;
+      stroke-miterlimit: 10;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      fill: none;
+      animation: svg-success-scale 0.3s ease-in-out 0.9s both;
+    }
+
+    .svg-checkmark-circle {
+      stroke: none;
+      fill: #00D290;
+    }
+
+    .svg-checkmark-check {
+      stroke-dasharray: 48;
+      stroke-dashoffset: 48;
+      animation: svg-success-draw 0.5s ease forwards 0.6s;
+    }
+
+    @keyframes svg-success-draw {
+      to {
+        stroke-dashoffset: 0;
+      }
+    }
+
+    @keyframes svg-success-scale {
+      0%, 100% {
+        transform: scale(1);
+      }
+      50% {
+        transform: scale(1.1);
+      }
+    }
+  </style>
+
+  <circle class="svg-checkmark-circle" cx="26" cy="26" r="25" />
+  <path
+    class="svg-checkmark svg-checkmark-check"
+    d="M14.1 27.2l7.1 7.2 16.7-16.8"
+  />
+</svg>

data/app/assets/javascripts/spree_cm_commissioner/backend.js

@@ -11,3 +11,4 @@
 //= require spree_cm_commissioner/selected_field_filter_origin_destination
 //= require spree_cm_commissioner/location_checkbox_manager
 //= require spree_cm_commissioner/trip_stop_selection
+//= require spree_cm_commissioner/tenant_payment_icon_fields

data/app/assets/javascripts/spree_cm_commissioner/tenant_payment_icon_fields.js

@@ -0,0 +1,65 @@
+document.addEventListener('DOMContentLoaded', function () {
+  // Initialize Select2 for all tenant-payment-icon-select elements
+  if (window.$ && $.fn.select2) {
+    $('.tenant-payment-icon-select').each(function () {
+      $(this).select2({
+        width: '100%'
+      });
+    });
+  }
+
+  // Handle icon selection change
+  document.querySelectorAll('.tenant-payment-icon-select').forEach(function (select) {
+    select.addEventListener('change', function (e) {
+      const field = e.target.name.match(/\[([^\]]*)\]$/)[1]; // Extract field name
+      const preview = document.getElementById(`icon-preview-${field}`);
+      const removeBtn = document.querySelector(`.remove-icon-btn[data-target="${field}"]`);
+      const iconPath = e.target.value;
+
+      if (!preview || !removeBtn) return;
+
+      if (!iconPath) {
+        preview.innerHTML = '<span class="no-icon-placeholder"></span>';
+        removeBtn.classList.add('hidden');
+        return;
+      }
+
+      // Fetch SVG for the selected icon
+      fetch(`/admin/vector_icons/svg?path=${encodeURIComponent(iconPath)}`)
+        .then((response) => {
+          if (!response.ok) throw new Error('Failed to fetch SVG');
+          return response.text();
+        })
+        .then((svg) => {
+          preview.innerHTML = svg;
+          removeBtn.classList.remove('hidden');
+        })
+        .catch((error) => {
+          console.error('Error fetching SVG:', error);
+          preview.innerHTML = '<span class="no-icon-placeholder">Error loading icon</span>';
+        });
+    });
+  });
+
+  document.addEventListener('click', function (e) {
+    if (!e.target.classList.contains('remove-icon-btn')) return;
+
+    const field = e.target.getAttribute('data-target');
+    const select = document.querySelector(`.tenant-payment-icon-select[name*="[${field}]"]`);
+    const preview = document.getElementById(`icon-preview-${field}`);
+    const removeBtn = e.target;
+
+    if (!select || !preview || !removeBtn) return;
+
+    // Clear the select input
+    select.value = '';
+
+    if (window.$ && $(select).hasClass('select2-hidden-accessible')) {
+      $(select).val('').trigger('change.select2');
+    } else {
+      select.dispatchEvent(new Event('change', { bubbles: true }));
+    }
+    preview.innerHTML = '<span class="no-icon-placeholder"></span>';
+    removeBtn.classList.add('hidden');
+  });
+});

data/app/assets/stylesheets/spree_cm_commissioner/backend/calendar.scss

@@ -55,9 +55,8 @@ $day-background: theme-color("light");
     }
   }
 
-  .wday-0 {
-    background-color: darken($day-background, 5%);
-  }
+  // .wday-0 {
+  // }
 
   // .wday-1 {
   // }
@@ -74,9 +73,8 @@ $day-background: theme-color("light");
   // .wday-5 {
   // }
 
-  .wday-6 {
-    background-color: darken($day-background, 5%);
-  }
+  // .wday-6 {
+  // }
 
   // .today {
   // }
@@ -88,7 +86,9 @@ $day-background: theme-color("light");
   // }
 
   // known as active-date
-  // .start-date {}
+  .start-date {
+    background-color: darken($day-background, 5%);
+  }
 
   // .prev-month {
   // }
@@ -159,8 +159,11 @@ $day-background: theme-color("light");
 
     // .current-month {}
     .has-events {
+      background-color: lighten(theme-color("warning"), 30%);
+      color: darken(theme-color("warning"), 50%);
+
       @include hover {
-        background-color: rgba($dark, 0.1);
+        background-color: theme-color("warning");
       }
     }
 

data/app/assets/stylesheets/spree_cm_commissioner/backend/commissioner_admin.css.scss

@@ -3,3 +3,4 @@
 @import "spree_cm_commissioner/backend/service_calendar";
 @import "spree_cm_commissioner/backend/guest_qr_code";
 @import "spree_cm_commissioner/backend/vehicle_seat";
+@import "spree_cm_commissioner/backend/tenant_payment_icon_fields";

data/app/assets/stylesheets/spree_cm_commissioner/backend/tenant_payment_icon_fields.scss

@@ -0,0 +1,60 @@
+.payment-icon-preview {
+  width: 80px;
+  height: 80px;
+  background: #f8f9fa;
+  border: 1px dashed #ccc;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+}
+
+.payment-icon-preview svg {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}
+
+
+.no-icon-placeholder {
+  width: 40px;
+  height: 40px;
+  border: 1px dashed #ddd;
+  background: #f8f9fa;
+  display: inline-block;
+}
+
+.icon-preview-container {
+  position: relative;
+  display: inline-block;
+}
+
+.remove-icon-btn {
+  position: absolute;
+  top: -8px;
+  right: -8px;
+  width: 24px;
+  height: 24px;
+  border-radius: 50%;
+  background: #dc3545;
+  color: white;
+  border: 2px solid white;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  font-size: 12px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.2);
+  transition: all 0.2s ease;
+  z-index: 10;
+}
+
+.remove-icon-btn:hover {
+  background: #c82333;
+  transform: scale(1.1);
+  box-shadow: 0 3px 6px rgba(0,0,0,0.3);
+}
+
+.remove-icon-btn.hidden {
+  display: none;
+}

data/app/controllers/concerns/spree_cm_commissioner/content_cachable.rb

@@ -6,8 +6,9 @@ module SpreeCmCommissioner
       after_action :set_cache_control_for_cdn
     end
 
+    # Override This Method based on your UseCase
     def max_age
-      ENV.fetch('CONTENT_CACHE_MAX_AGE', '180')
+      ENV.fetch('CONTENT_CACHE_MAX_AGE', 1.day.to_i).to_i
     end
 
     def set_cache_control_for_cdn