spree_cm_commissioner 1.8.0.pre.beta1 → 1.8.0.pre.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 791d6f17676f557d59de96c1515213fa2b348f4e1727837ea10c4c985f302f45
-  data.tar.gz: c0c3ec726af5f626e385ea768ae13e463f6bd0f4d2d4cff54da8a450c3e1c414
+  metadata.gz: 2e77caccf81a27dc63ab4c4f2e0e0667f60fd5130bea0ad3fcbcae673e173375
+  data.tar.gz: 1c2a7e3289aa520ae0fe29c28af1e1b1d41a1d2110948b6c32e76b21f6fe8d04
 SHA512:
-  metadata.gz: a0e80224bd19c608dfe569e8fd7f92a78a2a0dba85a3a20f835f9af22f896762c4d657ce300bb0349e07d40c2d68a97690bcb4d913b865381e97fa423564b71b
-  data.tar.gz: aa3bf4f391db785b76a6565542efc3d7c08e96621d89f0cfd986ab0ccc280374c308f8858cb630d82d25d3ab619cc8fcc538589c48953d9b780216949e55833d
+  metadata.gz: 5f290e1d41712c8082d1068976556a5c0214e46fa49d2db8388faf11603e7cdf6f79706418c5918f4fac441327ff4a61d6f6d9b953ed2041333cb8d178b85446
+  data.tar.gz: 15143141881df5cf187bda91efcd268a42196d31a1b3732f51ecffbd1f042f648fe2d22b997eb8ed4b25eaaac30b6a91ddb1679e6a1e977dc628cb607c1baeac

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (1.8.0.pre.beta1)
+    spree_cm_commissioner (1.8.0.pre.beta4)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
@@ -418,29 +418,29 @@ GEM
     google-cloud-recaptcha_enterprise-v1beta1 (0.10.0)
       gapic-common (>= 0.20.0, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-protobuf (3.24.4)
-    google-protobuf (3.24.4-x86_64-darwin)
-    google-protobuf (3.24.4-x86_64-linux)
+    google-protobuf (3.25.6)
+    google-protobuf (3.25.6-x86_64-darwin)
+    google-protobuf (3.25.6-x86_64-linux)
     googleapis-common-protos (1.4.0)
       google-protobuf (~> 3.14)
       googleapis-common-protos-types (~> 1.2)
       grpc (~> 1.27)
-    googleapis-common-protos-types (1.9.0)
-      google-protobuf (~> 3.18)
+    googleapis-common-protos-types (1.18.0)
+      google-protobuf (>= 3.18, < 5.a)
     googleauth (1.8.1)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    grpc (1.58.0)
-      google-protobuf (~> 3.23)
+    grpc (1.70.1)
+      google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
-    grpc (1.58.0-x86_64-darwin)
-      google-protobuf (~> 3.23)
+    grpc (1.70.1-x86_64-darwin)
+      google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
-    grpc (1.58.0-x86_64-linux)
-      google-protobuf (~> 3.23)
+    grpc (1.70.1-x86_64-linux)
+      google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     hana (1.3.7)
     hashdiff (1.0.1)

data/README.md

@@ -1,6 +1,6 @@
 # SpreeCmCommissioner
 
-![Commission gem build status](https://github.com/channainfo/commissioner/actions/workflows/publish.yml/badge.svg?branch= "Build status")
+![Commission gem build status](https://github.com/channainfo/commissioner/actions/workflows/test_and_build_gem.yml/badge.svg?branch= "Build status")
 
 An application platform built on top of Spree commerce for modeling any bussiness applications.
 
@@ -196,12 +196,25 @@ This setup allows you to configure the environment and database services in a si
 
 ## Releasing
 
-```sh
-bundle exec gem bump -p -t
-bundle exec gem release
-```
+To release the gem:
+
+1; Bump new version in the file: lib/spree_cm_commissioner/version.rb, for example
+
+  ```ruby
+  VERSION = '1.8.0-beta1'.freeze
+  ```
+
+to release `1.8.0-beta1`
+
+2; Tag a repo with the same version, for example
+
+  ```sh
+  git tag 1.8.0-beta1
+  ```
+
+3; Push the tag to the repo and github action will build and push the gem to rubygem.org.
 
-For more options please see [gem-release REAMDE](https://github.com/svenfuchs/gem-release)
+4; Get the gem version to the project in cm-market-server.
 
 ## Troubleshooting Database Lock on Taxonomy Creation Errors
 

data/app/controllers/spree/api/v2/tenant/pin_code_generators_controller.rb

@@ -3,23 +3,7 @@ module Spree
     module V2
       module Tenant
         class PinCodeGeneratorsController < BaseController
-          before_action :validate_recaptcha, only: [:create]
-
-          def validate_recaptcha
-            return unless ENV['RECAPTCHA_TOKEN_VALIDATOR_ENABLE'] == 'yes'
-
-            context = SpreeCmCommissioner::RecaptchaTokenValidator.call(
-              token: params[:recaptcha_token],
-              action: params[:recaptcha_action],
-              site_key: params[:recaptcah_site_key]
-            )
-
-            return if context.success?
-
-            render_error_payload(context.message, 400)
-          end
-
-          # :phone_number, :email, :type, :recaptcha_token, :recaptcha_action, :recaptcah_site_key
+          # :phone_number, :email, :type
           def create
             context = SpreeCmCommissioner::PinCodeGenerator.call(pin_code_attrs)
 

data/app/controllers/spree/api/v2/tenant/taxons_controller.rb

@@ -0,0 +1,56 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class TaxonsController < BaseController
+          private
+
+          def collection_serializer
+            Spree::Api::Dependencies.storefront_taxon_serializer.constantize
+          end
+
+          def resource_serializer
+            Spree::Api::Dependencies.storefront_taxon_serializer.constantize
+          end
+
+          def collection_finder
+            Spree::Api::Dependencies.storefront_taxon_finder.constantize
+          end
+
+          def paginated_collection
+            @paginated_collection ||= collection_paginator.new(collection, params).call
+          end
+
+          def resource
+            @resource ||= scope.find_by(permalink: params[:id]) || scope.find(params[:id])
+          end
+
+          def model_class
+            Spree::Taxon
+          end
+
+          def scope
+            MultiTenant.with(@tenant) do
+              model_class
+            end
+          end
+
+          def scope_includes
+            node_includes = %i[icon parent taxonomy]
+
+            {
+              parent: node_includes,
+              children: node_includes,
+              taxonomy: [root: node_includes],
+              icon: [attachment_attachment: :blob]
+            }
+          end
+
+          def serializer_params
+            super.merge(include_products: action_name == 'show')
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/spree_cm_commissioner/{order_requestable.rb → order_state_machine.rb}

@@ -1,10 +1,23 @@
 # Make sure to put this concern below other concern or methods that generating additional order info like guests, seat number, etc.
 # This will ensure that when each notification is sent with neccessary data.
 module SpreeCmCommissioner
-  module OrderRequestable
+  module OrderStateMachine
     extend ActiveSupport::Concern
 
     included do
+      state_machine.before_transition to: :complete, do: :request, if: :need_confirmation?
+      state_machine.before_transition to: :complete, do: :generate_bib_number
+
+      state_machine.after_transition to: :complete, do: :precalculate_conversion
+      state_machine.after_transition to: :complete, do: :notify_order_complete_app_notification_to_user, unless: :subscription?
+      state_machine.after_transition to: :complete, do: :notify_order_complete_telegram_notification_to_user, unless: :subscription?
+      state_machine.after_transition to: :complete, do: :send_order_complete_telegram_alert_to_vendors, unless: :need_confirmation?
+      state_machine.after_transition to: :complete, do: :send_order_complete_telegram_alert_to_store, unless: :need_confirmation?
+
+      state_machine.after_transition to: :resumed, do: :precalculate_conversion
+
+      state_machine.after_transition to: :canceled, do: :precalculate_conversion
+
       scope :accepted, -> { where(request_state: 'accepted') }
 
       scope :filter_by_request_state, lambda {
@@ -14,15 +27,6 @@ module SpreeCmCommissioner
           .order(created_at: :desc)
       }
 
-      # use after_update instead of after_transition
-      # since it has usecase that order state is forced to update which not fire after_transition
-
-      after_update :notify_order_complete_app_notification_to_user, if: -> { payment_state_changed_to_paid? && !subscription? }
-      after_update :notify_order_complete_telegram_notification_to_user, if: -> { state_changed_to_complete? && !subscription? }
-      after_update :request, if: -> { state_changed_to_complete? && need_confirmation? }
-      after_update :send_order_complete_telegram_alert_to_vendors, if: -> { state_changed_to_complete? && !need_confirmation? }
-      after_update :send_order_complete_telegram_alert_to_store, if: -> { state_changed_to_complete? && !need_confirmation? }
-
       state_machine :request_state, initial: nil, use_transactions: false do
         event :request do
           transition from: nil, to: :requested
@@ -42,6 +46,7 @@ module SpreeCmCommissioner
         event :reject do
           transition from: :requested, to: :rejected
         end
+
         after_transition to: :rejected, do: :send_order_rejected_app_notification_to_user
         after_transition to: :rejected, do: :send_order_rejected_telegram_alert_to_store
 
@@ -55,6 +60,29 @@ module SpreeCmCommissioner
       end
     end
 
+    def precalculate_conversion
+      line_items.each do |item|
+        SpreeCmCommissioner::ConversionPreCalculatorJob.perform_later(item.product_id)
+      end
+    end
+
+    def generate_bib_number
+      line_items.find_each(&:generate_remaining_guests)
+
+      line_items.with_bib_prefix.each do |line_item|
+        line_item.guests.none_bib.each do |guest|
+          guest.generate_bib
+          next if guest.save
+
+          guest.errors.each do |msg|
+            errors.add(:guests, msg)
+          end
+        end
+      end
+
+      errors.empty?
+    end
+
     def rejected_by(user)
       transaction do
         reject!
@@ -76,6 +104,12 @@ module SpreeCmCommissioner
       end
     end
 
+    # overrided not to send email yet to user if order needs confirmation
+    # it will send after vendors accepted.
+    def confirmation_delivered?
+      confirmation_delivered || need_confirmation?
+    end
+
     # can_accepted? already use by ransack/visitor.rb
     def can_accept_all?
       approved? && requested?
@@ -97,10 +131,6 @@ module SpreeCmCommissioner
       line_items.any?(&:need_confirmation)
     end
 
-    def payment_state_changed_to_paid?
-      saved_change_to_payment_state? && payment_state == 'paid'
-    end
-
     def send_order_request_telegram_confirmation_alert_to_vendor; end
 
     def send_order_complete_telegram_alert_to_vendors

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -2,8 +2,7 @@ module SpreeCmCommissioner
   module OrderDecorator
     def self.prepended(base) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
       base.include SpreeCmCommissioner::PhoneNumberSanitizer
-      base.include SpreeCmCommissioner::OrderBibNumberConcern
-      base.include SpreeCmCommissioner::OrderRequestable
+      base.include SpreeCmCommissioner::OrderStateMachine
 
       base.scope :subscription, -> { where.not(subscription_id: nil) }
       base.scope :paid, -> { where(payment_state: :paid) }
@@ -23,15 +22,18 @@ module SpreeCmCommissioner
 
       base.before_create :link_by_phone_number
       base.before_create :associate_customer
+      base.before_create :set_tenant_id
 
       base.validates :promo_total, base::MONEY_VALIDATION
       base.validate :validate_channel_prefix, if: :channel_changed?
-
       base.validates :phone_number, presence: true, if: :require_phone_number
+
       base.has_one :invoice, dependent: :destroy, class_name: 'SpreeCmCommissioner::Invoice'
+      base.has_one :customer, class_name: 'SpreeCmCommissioner::Customer', through: :subscription
 
+      base.belongs_to :tenant, class_name: 'SpreeCmCommissioner::Tenant'
       base.belongs_to :subscription, class_name: 'SpreeCmCommissioner::Subscription', optional: true
-      base.has_one :customer, class_name: 'SpreeCmCommissioner::Customer', through: :subscription
+
       base.has_many :taxons, class_name: 'Spree::Taxon', through: :customer
       base.has_many :vendors, through: :products, class_name: 'Spree::Vendor'
       base.has_many :taxons, through: :products, class_name: 'Spree::Taxon'
@@ -42,9 +44,6 @@ module SpreeCmCommissioner
       base.whitelisted_ransackable_associations |= %w[customer taxon payments invoice]
       base.whitelisted_ransackable_attributes |= %w[intel_phone_number phone_number email number]
 
-      base.after_update :precalculate_conversion, if: -> { state_changed_to_complete? }
-      base.after_update :precalculate_conversion, if: -> { state_changed_to_canceled? }
-
       def base.search_by_qr_data!(data)
         token = data.match(/^R\d{9,}-([A-Za-z0-9_\-]+)$/)&.captures
 
@@ -52,9 +51,6 @@ module SpreeCmCommissioner
 
         find_by!(token: token)
       end
-
-      base.belongs_to :tenant, class_name: 'SpreeCmCommissioner::Tenant'
-      base.before_create :set_tenant_id
     end
 
     def ticket_seller_user?
@@ -63,26 +59,6 @@ module SpreeCmCommissioner
       user.has_spree_role?('ticket_seller')
     end
 
-    # override
-    def after_resume
-      super
-
-      precalculate_conversion
-    end
-
-    # override
-    def after_cancel
-      super
-
-      precalculate_conversion
-    end
-
-    def precalculate_conversion
-      line_items.each do |item|
-        SpreeCmCommissioner::ConversionPreCalculatorJob.perform_later(item.product_id)
-      end
-    end
-
     # override
     def collect_payment_methods(store = nil)
       return super if user.blank?
@@ -96,24 +72,11 @@ module SpreeCmCommissioner
       store.payment_methods.available_on_frontend_for_early_adopter.select { |pm| pm.available_for_order?(self) }
     end
 
-    def state_changed_to_complete?
-      saved_change_to_state? && state == 'complete'
-    end
-
-    def state_changed_to_canceled?
-      saved_change_to_state? && state == 'canceled'
-    end
-
+    # override
     def delivery_required?
       line_items.any?(&:delivery_required?)
     end
 
-    # overrided not to send email yet to user if order needs confirmation
-    # it will send after vendors accepted.
-    def confirmation_delivered?
-      confirmation_delivered || need_confirmation?
-    end
-
     # overrided
     def payment_required?
       return false if need_confirmation?
@@ -240,6 +203,7 @@ module SpreeCmCommissioner
       require_contact
     end
 
+    # override
     def require_email
       require_contact
     end

data/app/overrides/spree/admin/taxons/edit/title.html.erb.deface

@@ -1,6 +1,8 @@
 <!-- replace "erb[silent]:contains('unless @taxon.root?')" closing_selector "erb[silent]:contains('end')" -->
 
-    <%if @taxon.depth !=1 %>
-  / <%= link_to @taxon.parent.name, spree.edit_admin_taxonomy_taxon_url(@taxonomy,@taxon.parent.id) %>
+    <%if @taxon.depth !=1 && @taxon.parent.present? %>
+  / <%= link_to @taxon.parent.name, spree.edit_admin_taxonomy_taxon_url(@taxonomy,@taxon.parent.id)   %>
     <%end%>
-  / <%= @taxon.name %>
+  <% unless @taxon.root? %>
+  / <%= @taxon.name %>
+  <% end %>

data/app/serializers/spree/v2/storefront/vendor_serializer_decorator.rb

@@ -3,7 +3,7 @@ module Spree
     module Storefront
       module VendorSerializerDecorator
         def self.prepended(base)
-          base.attributes :min_price, :max_price, :star_rating, :short_description, :full_address, :state
+          base.attributes :min_price, :max_price, :star_rating, :short_description, :full_address, :state, :meta_title, :meta_description
 
           base.has_many :stock_locations
           base.has_many :variants, serializer: 'Spree::Variant'

data/app/views/spree/admin/classifications/index.html.erb

@@ -2,7 +2,7 @@
   <%= link_to Spree.t(:taxonomies), spree.admin_taxonomies_url %> /
 
   <%= link_to @taxonomy.root.name, spree.edit_admin_taxonomy_url(@taxonomy) %>
-  <%if @taxon.depth !=1 %>
+  <%if @taxon.depth !=1 && @taxon.parent.present? %>
       / <%= link_to @taxon.parent.name, spree.edit_admin_taxonomy_taxon_url(@taxonomy,@taxon.parent.id) %>
     <%end%>
   <% unless @taxon.root? %>

data/app/views/spree/admin/guest_card_classes/index.html.erb

@@ -2,7 +2,7 @@
   <%= link_to Spree.t(:taxonomies), spree.admin_taxonomies_url %> /
 
   <%= link_to @taxonomy.root.name, spree.edit_admin_taxonomy_url(@taxonomy) %>
-  <%if @taxon.depth !=1 %>
+  <%if @taxon.depth !=1 && @taxon.parent.present? %>
       / <%= link_to @taxon.parent.name, spree.edit_admin_taxonomy_taxon_url(@taxonomy,@taxon.parent.id) %>
     <%end%>
   <% unless @taxon.root? %>

data/app/views/spree/admin/taxon_vendors/index.html.erb

@@ -2,7 +2,7 @@
   <%= link_to Spree.t(:taxonomies), spree.admin_taxonomies_url %> /
 
   <%= link_to @taxonomy.root.name, spree.edit_admin_taxonomy_url(@taxonomy) %>
-    <%if @taxon.depth !=1 %>
+    <%if @taxon.depth !=1 && @taxon.parent.present? %>
       / <%= link_to @taxon.parent.name, spree.edit_admin_taxonomy_taxon_url(@taxonomy,@taxon.parent.id) %>
     <%end%>
   <% unless @taxon.root? %>

data/app/views/spree/admin/user_events/_users.html.erb

@@ -2,7 +2,7 @@
   <%= link_to Spree.t(:taxonomies), spree.admin_taxonomies_url %> /
 
   <%= link_to @taxonomy.root.name, spree.edit_admin_taxonomy_url(@taxonomy) %>
-  <%if @taxon.depth !=1 %>
+  <%if @taxon.depth !=1 && @taxon.parent.present? %>
       / <%= link_to @taxon.parent.name, spree.edit_admin_taxonomy_taxon_url(@taxonomy,@taxon.parent.id) %>
     <%end%>
   <% unless @taxon.root? %>

data/app/views/spree/admin/vendors/_form.html.erb

@@ -48,6 +48,14 @@
     <%= f.label :commission_rate %>
     <%= f.number_field :commission_rate, step: '0.01', class: 'form-control' %>
   <% end %>
+  <%= f.field_container :meta_title do %>
+    <%= f.label :meta_title, Spree.t(:meta_title) %>
+    <%= f.text_field :meta_title, class: 'form-control', rows: 6 %>
+  <% end %>
+  <%= f.field_container :meta_description do %>
+    <%= f.label :meta_description, Spree.t(:meta_description) %>
+    <%= f.text_area :meta_description, class: 'form-control', rows: 6 %>
+  <% end %>
   <%= f.field_container :notification_email do%>
     <%= f.label :notification_email %>
     <%= f.email_field :notification_email, class: 'form-control' %>

data/config/routes.rb

@@ -446,6 +446,7 @@ Spree::Core::Engine.add_routes do
       namespace :tenant do
         resources :vendors
         resources :products
+        resources :taxons, only: %i[index show], id: /.+/
 
         resources :account_checker
         resource :pin_code_checkers, only: [:update]

data/db/migrate/20250304155234_add_meta_data_to_spree_vendors.rb

@@ -0,0 +1,6 @@
+class AddMetaDataToSpreeVendors < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_vendors, :meta_title, :string, if_not_exists: true
+    add_column :spree_vendors, :meta_description, :text, if_not_exists: true
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.8.0-beta1'.freeze
+  VERSION = '1.8.0-beta4'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.8.0.pre.beta1
+  version: 1.8.0.pre.beta4
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-05 00:00:00.000000000 Z
+date: 2025-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -822,6 +822,7 @@ files:
 - app/controllers/spree/api/v2/tenant/pin_code_checkers_controller.rb
 - app/controllers/spree/api/v2/tenant/pin_code_generators_controller.rb
 - app/controllers/spree/api/v2/tenant/products_controller.rb
+- app/controllers/spree/api/v2/tenant/taxons_controller.rb
 - app/controllers/spree/api/v2/tenant/user_account_linkages_controller.rb
 - app/controllers/spree/api/v2/tenant/user_device_tokens_controller.rb
 - app/controllers/spree/api/v2/tenant/user_registration_with_pin_codes_controller.rb
@@ -1062,8 +1063,7 @@ files:
 - app/models/concerns/spree_cm_commissioner/metafield.rb
 - app/models/concerns/spree_cm_commissioner/option_type_attr_type.rb
 - app/models/concerns/spree_cm_commissioner/option_value_attr_type.rb
-- app/models/concerns/spree_cm_commissioner/order_bib_number_concern.rb
-- app/models/concerns/spree_cm_commissioner/order_requestable.rb
+- app/models/concerns/spree_cm_commissioner/order_state_machine.rb
 - app/models/concerns/spree_cm_commissioner/parameterize_name.rb
 - app/models/concerns/spree_cm_commissioner/phone_number_sanitizer.rb
 - app/models/concerns/spree_cm_commissioner/product_delegation.rb
@@ -2228,6 +2228,7 @@ files:
 - db/migrate/20250217075228_add_indexes_to_cm_guests.rb
 - db/migrate/20250220021751_remove_unique_constraint_from_email_in_spree_users.rb
 - db/migrate/20250226092650_add_index_to_email_in_spree_users.rb
+- db/migrate/20250304155234_add_meta_data_to_spree_vendors.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem

data/app/models/concerns/spree_cm_commissioner/order_bib_number_concern.rb

@@ -1,17 +0,0 @@
-module SpreeCmCommissioner
-  module OrderBibNumberConcern
-    extend ActiveSupport::Concern
-
-    included do
-      after_update :generate_bib_number, if: :state_changed_to_complete?
-
-      def generate_bib_number
-        line_items.find_each(&:generate_remaining_guests)
-
-        line_items.with_bib_prefix.find_each do |line_item|
-          line_item.guests.none_bib.find_each(&:generate_bib!)
-        end
-      end
-    end
-  end
-end