spree_cm_commissioner 1.8.7.pre.beta1 → 1.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5c82306658e75ae6622d3a57418ed2c33fa59431a139f6df65261ab4c66cc66
-  data.tar.gz: ad149426344cd2aed27ebbf8734e1200006db9cb849f2fb68e72ad3f5fb40afb
+  metadata.gz: 687ff4cf4e03ffe157a851660a8d0a82f90463ab2f7e2050e8d25e0792377989
+  data.tar.gz: 78794baf30a3bf2bcf033cc1ca921c422c273d2a3eb50ce40481c7424cd07950
 SHA512:
-  metadata.gz: 601ff2d02e0a2054ec59ab126e4c9fc078f23f4e275e24bf9180ed5048d9a3bcbacd4b27a3f94a74e2efe69552fad35365bacacac050a9feeade522fd56eb50a
-  data.tar.gz: 23a7212be5f02cdfb1d9b9e5b3be810c2d37e8e3eb33ea98feb2b6a6ca537a2d8f5dd6157e7c8f7e54146f8234e9e7d58fea670d47dd6282a87f1d47b0f3adb5
+  metadata.gz: 7b1884005a4e95691a3f71c6d2a128c821cd32fb41a29bb7af72f4be5a2a3734a8c81137a29d4a3a258832118c446ce8b93656122ebeeb8dc8e985edfca400ad
+  data.tar.gz: 5c5c8d8dd8f1a75402b034f9e158554cf00aa3e1d7a25f16c983c71a3867b4d4312f882e0863a30b463df82e205a59daa19b432f84e67a34c6adcab484e38786

data/Gemfile.lock

@@ -34,13 +34,12 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (1.8.7.pre.beta1)
+    spree_cm_commissioner (1.8.8)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
       aws-sdk-ecs
       aws-sdk-s3
-      blazer (~> 3.0.0)
       byebug
       counter_culture (~> 3.2)
       dry-validation (~> 1.10)
@@ -216,12 +215,6 @@ GEM
     base64 (0.1.1)
     bcrypt (3.1.19)
     bigdecimal (3.1.8)
-    blazer (3.0.4)
-      activerecord (>= 6.1)
-      chartkick (>= 5)
-      csv
-      railties (>= 6.1)
-      safely_block (>= 0.4)
     bootstrap (4.6.2)
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 1.16.1, < 2)
@@ -245,7 +238,6 @@ GEM
     capybara-select-2 (0.5.1)
     carmen (1.1.3)
       activesupport (>= 3.0.0)
-    chartkick (5.1.4)
     chunky_png (1.4.0)
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
@@ -261,7 +253,6 @@ GEM
     crass (1.0.6)
     css_parser (1.16.0)
       addressable
-    csv (3.3.3)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.1.0)
@@ -707,7 +698,6 @@ GEM
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    safely_block (0.4.1)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)

data/app/controllers/blazer/base_controller_decorator.rb

@@ -1,15 +1,10 @@
-# https://stackoverflow.com/questions/77318060/blazer-raised-activerecordconnectionnotestablished
 module Blazer
   module BaseControllerDecorator
     def self.prepended(base)
-      base.around_action :set_writing_role
       base.before_action :restrict_organizer_access
     end
 
-    # Annonymous block: https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Naming/BlockForwarding
-    def set_writing_role(&block)
-      ActiveRecord::Base.connected_to(role: :writing, &block)
-    end
+    private
 
     def restrict_organizer_access
       return unless spree_current_user.organizer? && !spree_current_user.admin?
@@ -20,4 +15,4 @@ module Blazer
   end
 end
 
-Blazer::BaseController.prepend(Blazer::BaseControllerDecorator) unless Blazer::BaseController.ancestors.include?(Blazer::BaseControllerDecorator)
+Blazer::BaseController.prepend(Blazer::BaseControllerDecorator) if defined?(Blazer::BaseController)

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

@@ -0,0 +1,28 @@
+module SpreeCmCommissioner
+  module OrderConcern
+    # override
+    def spree_current_order
+      @spree_current_order ||= find_spree_current_order
+      return nil if @spree_current_order.blank?
+
+      # Spree doesn't validate this by default (might be a bug).
+      # Temporary fix to ensure the order's user ID matches the logged-in user.
+      if @spree_current_order.user_id.present? && spree_current_user.present? && @spree_current_order.user_id != spree_current_user.id
+        raise CanCan::AccessDenied
+      end
+
+      @spree_current_order
+    end
+
+    # override
+    def find_spree_current_order
+      SpreeCmCommissioner::Orders::Find.new.execute(
+        store: current_store,
+        user: spree_current_user,
+        currency: current_currency,
+        token: order_token,
+        state: params[:state]
+      )
+    end
+  end
+end

data/app/controllers/spree/api/v2/storefront/order_histories_controller.rb

@@ -0,0 +1,58 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class OrderHistoriesController < ::Spree::Api::V2::ResourceController
+          # GET /api/v2/storefront/order_histories
+          # For user - no params needed
+          # For guest - pass: { "order_tokens[]": [1, 2, 3] }
+          def index
+            render_serialized_payload do
+              serialize_collection(paginated_collection)
+            end
+          end
+
+          # PATCH /api/v2/storefront/order_histories/:id/archive
+          def archive
+            order_token = params[:id]
+            order = Spree::Order.not_archived.find_by!(token: order_token)
+
+            spree_authorize! :update, order, order_token
+            raise CanCan::AccessDenied unless order.payment?
+
+            if order.archive
+              render_serialized_payload { serialize_resource(order) }
+            else
+              render_error_payload(order.errors.full_messages.to_sentence)
+            end
+          end
+
+          private
+
+          def collection
+            if spree_current_user.present?
+              spree_current_user.orders.payment.not_archived
+            else
+              order_tokens = Array(params[:order_tokens])
+              return Spree::Order.none if order_tokens.empty?
+
+              Spree::Order.payment.not_archived.without_user.where(token: order_tokens)
+            end
+          end
+
+          def collection_serializer
+            Spree::V2::Storefront::CartSerializer
+          end
+
+          def resource_serializer
+            Spree::V2::Storefront::CartSerializer
+          end
+
+          def model_class
+            Spree::Order
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/storefront/queue_cart/line_items_controller.rb

@@ -6,7 +6,6 @@ module Spree
           class LineItemsController < CartController
             before_action :ensure_order, only: :create
             before_action :load_variant, only: :create
-            before_action :ensure_cart_exist, only: :create
 
             # override
             def create

data/app/controllers/spree_cm_commissioner/api/v2/storefront/cart_controller_decorator.rb

@@ -4,42 +4,17 @@ module SpreeCmCommissioner
       module Storefront
         module CartControllerDecorator
           def self.prepended(base)
-            base.before_action :ensure_cart_exist, only: :add_item
+            base.include SpreeCmCommissioner::OrderConcern
           end
 
-          # one usecase where this neccessary is when order.state is 'complete', but complated_at & payment_state is null,
-          # this cause app to be stuck at book page because cart is not considered cart or completed.
-          #
-          # solution is to restart it back to cart.
+          # Restart the checkout flow to bring the order back to the cart view
           def restart_checkout_flow
             spree_authorize! :update, spree_current_order, order_token
 
-            if spree_current_order.completed_at.present?
-              render_error_payload('Cart already completed!')
-            else
-              spree_current_order.restart_checkout_flow
-              spree_current_order.update_with_updater!
+            spree_current_order.restart_checkout_flow
+            spree_current_order.update_with_updater!
 
-              render_serialized_payload { serialized_current_order }
-            end
-          end
-
-          # we required only user can create cart
-          # in case there is no cart, and user try to add item to cart,
-          # it should create one instead of raising error.
-          def ensure_cart_exist
-            spree_authorize! :create, Spree::Order
-            return if spree_current_order.present?
-
-            create_cart_params = {
-              user: spree_current_user,
-              store: current_store,
-              currency: current_currency,
-              public_metadata: add_item_params[:public_metadata],
-              private_metadata: add_item_params[:private_metadata]
-            }
-
-            @spree_current_order ||= create_service.call(create_cart_params).value
+            render_serialized_payload { serialized_current_order }
           end
         end
       end

data/app/controllers/spree_cm_commissioner/api/v2/storefront/checkout_controller_decorator.rb

@@ -4,9 +4,7 @@ module SpreeCmCommissioner
       module Storefront
         module CheckoutControllerDecorator
           def self.prepended(base)
-            # spree_vpago gem update payment state in #payment_redirect
-            # GET /payment_redirect
-            base.around_action :set_writing_role, only: %i[payment_redirect]
+            base.include SpreeCmCommissioner::OrderConcern
           end
         end
       end

data/app/finders/spree_cm_commissioner/orders/find.rb

@@ -0,0 +1,34 @@
+# Custom replacement for Spree::Orders::FindCurrent with the following improvements:
+# - Supports filtering by state (e.g., to retrieve only 'cart' or 'address' orders for the page cart)
+# - Allows retrieving the order in any state (not just incomplete), which solves the issue of 404s after payment
+module SpreeCmCommissioner
+  module Orders
+    class Find
+      def execute(store:, user:, currency:, token: nil, state: nil)
+        params = { store_id: store.id, currency: currency }
+        params[:state] = state if state.present?
+
+        return find_by_token(params, token) if token.present?
+        return find_by_user(params, user) if user.present?
+
+        nil
+      end
+
+      def find_by_token(params, token)
+        params[:token] = token
+        scope.find_by(params)
+      end
+
+      def find_by_user(params, user)
+        params[:user_id] = user.id
+        scope.order(created_at: :desc).find_by(params)
+      end
+
+      private
+
+      def scope
+        Spree::Order.not_archived.not_canceled
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -7,6 +7,10 @@ module SpreeCmCommissioner
       base.scope :subscription, -> { where.not(subscription_id: nil) }
       base.scope :paid, -> { where(payment_state: :paid) }
       base.scope :complete_or_canceled, -> { complete.or(where(state: 'canceled')) }
+      base.scope :payment, -> { incomplete.where(state: 'payment') }
+      base.scope :archived, -> { where.not(archived_at: nil) }
+      base.scope :not_archived, -> { where(archived_at: nil) }
+      base.scope :without_user, -> { where(user_id: nil) }
 
       base.scope :filter_by_match_user_contact, lambda { |user|
         complete.where(
@@ -101,6 +105,10 @@ module SpreeCmCommissioner
       self.class.unscoped.where(id: self).update_all(changes) # rubocop:disable Rails/SkipsModelValidations
     end
 
+    def archive
+      update(archived_at: Time.current)
+    end
+
     # overrided
     # avoid raise error when source_id is nil.
     # https://github.com/channainfo/commissioner/pull/843

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

@@ -3,8 +3,15 @@ module Spree
     module Storefront
       module CartSerializerDecorator
         def self.prepended(base)
-          base.attributes :phone_number, :intel_phone_number, :country_code, :request_state, :qr_data,
+          base.attributes :phone_number, :intel_phone_number, :country_code, :request_state,
                           :channel
+
+          base.attribute :qr_data do |order|
+            order.qr_data if order.completed?
+          end
+
+          # override to return all payments instead of only valid_payments
+          base.has_many :payments
         end
       end
     end

data/config/routes.rb

@@ -1,10 +1,5 @@
 Spree::Core::Engine.add_routes do
   # Add your extension routes here
-
-  authenticate :spree_user, -> (user) { user.admin? || user.organizer? } do
-    mount Blazer::Engine, at: 'admin/bi_reports'
-  end
-
   namespace :admin do
     post '/invalidate_api_caches', to: 'base#invalidate_api_caches'
 
@@ -523,6 +518,13 @@ Spree::Core::Engine.add_routes do
 
         resources :wished_items
         resources :user_promotion
+
+        resources :order_histories, only: %i[index] do
+          member do
+            patch :archive
+          end
+        end
+
         resources :order_promotions
         resources :guest_card_classes
 

data/db/migrate/20250403040036_install_blazer.rb

@@ -1,6 +1,6 @@
 class InstallBlazer < ActiveRecord::Migration[7.0]
   def change
-    create_table :blazer_queries do |t|
+    create_table :blazer_queries, if_not_exists: true do |t|
       t.references :creator
       t.string :name
       t.text :description
@@ -10,7 +10,7 @@ class InstallBlazer < ActiveRecord::Migration[7.0]
       t.timestamps null: false
     end
 
-    create_table :blazer_audits do |t|
+    create_table :blazer_audits, if_not_exists: true do |t|
       t.references :user
       t.references :query
       t.text :statement
@@ -18,20 +18,20 @@ class InstallBlazer < ActiveRecord::Migration[7.0]
       t.datetime :created_at
     end
 
-    create_table :blazer_dashboards do |t|
+    create_table :blazer_dashboards, if_not_exists: true do |t|
       t.references :creator
       t.string :name
       t.timestamps null: false
     end
 
-    create_table :blazer_dashboard_queries do |t|
+    create_table :blazer_dashboard_queries, if_not_exists: true do |t|
       t.references :dashboard
       t.references :query
       t.integer :position
       t.timestamps null: false
     end
 
-    create_table :blazer_checks do |t|
+    create_table :blazer_checks, if_not_exists: true do |t|
       t.references :creator
       t.references :query
       t.string :state
@@ -44,4 +44,4 @@ class InstallBlazer < ActiveRecord::Migration[7.0]
       t.timestamps null: false
     end
   end
-end
+end

data/db/migrate/20250403083001_create_spree_cm_commissioner_taxon_blazer_query.rb

@@ -1,9 +1,10 @@
 class CreateSpreeCmCommissionerTaxonBlazerQuery < ActiveRecord::Migration[7.0]
   def change
-    create_table :cm_taxon_blazer_queries,if_not_exists: true  do |t|
+    create_table :cm_taxon_blazer_queries, if_not_exists: true  do |t|
       t.references :taxon, foreign_key: { to_table: :spree_taxons }, null: false, index: true
       t.references :blazer_query,  foreign_key: { to_table: :blazer_queries }, null: false, index: true
       t.timestamps
     end
   end
 end
+

data/db/migrate/20250404050117_add_archived_at_to_spree_orders.rb

@@ -0,0 +1,5 @@
+class AddArchivedAtToSpreeOrders < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_orders, :archived_at, :datetime, if_not_exists: true
+  end
+end

data/lib/generators/spree_cm_commissioner/install/install_generator.rb

@@ -12,10 +12,10 @@ module SpreeCmCommissioner
 
       def add_migrations
         gems = %i[
-          blazer
           spree_multi_vendor
           spree_cm_commissioner
         ]
+
         gems.each do |gem|
           run "bundle exec rake railties:install:migrations FROM=#{gem}"
         end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.8.7-beta1'.freeze
+  VERSION = '1.8.8'.freeze
 
   module_function
 

data/lib/spree_cm_commissioner.rb

@@ -3,7 +3,6 @@ require 'spree_api_v1'
 require 'spree_backend'
 require 'spree_auth_devise'
 require 'spree_multi_vendor'
-require 'blazer'
 require 'spree_extension'
 
 require 'spree_cm_commissioner/engine'

data/spree_cm_commissioner.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'spree_backend', spree_opts
   s.add_dependency 'spree_multi_vendor', '>= 2.4.1'
   s.add_dependency 'spree_extension'
+
   s.add_dependency 'activerecord-multi-tenant'
   s.add_dependency 'phonelib'
   s.add_dependency 'aws-sdk-ecs'
@@ -55,6 +56,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'counter_culture', '~> 3.2'
   s.add_development_dependency 'pg'
   s.add_development_dependency 'spree_dev_tools'
-  s.add_dependency 'blazer', '~> 3.0.0'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.8.7.pre.beta1
+  version: 1.8.8
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-03 00:00:00.000000000 Z
+date: 2025-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -478,20 +478,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: blazer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 description: Add (optional) extension description here
 email: you@example.com
 executables: []
@@ -679,6 +665,7 @@ files:
 - app/controllers/concerns/spree_cm_commissioner/content_cachable.rb
 - app/controllers/concerns/spree_cm_commissioner/events/role_authorization.rb
 - app/controllers/concerns/spree_cm_commissioner/exception_notificable.rb
+- app/controllers/concerns/spree_cm_commissioner/order_concern.rb
 - app/controllers/concerns/spree_cm_commissioner/transit/taxon_bitwise.rb
 - app/controllers/concerns/spree_cm_commissioner/waiting_room_authorization.rb
 - app/controllers/spree/admin/account_deletions_controller.rb
@@ -800,6 +787,7 @@ files:
 - app/controllers/spree/api/v2/storefront/line_items_controller.rb
 - app/controllers/spree/api/v2/storefront/nearby_places_controller.rb
 - app/controllers/spree/api/v2/storefront/notifications_controller.rb
+- app/controllers/spree/api/v2/storefront/order_histories_controller.rb
 - app/controllers/spree/api/v2/storefront/order_products_taxons_controller.rb
 - app/controllers/spree/api/v2/storefront/order_promotions_controller.rb
 - app/controllers/spree/api/v2/storefront/order_qrs_controller.rb
@@ -934,6 +922,7 @@ files:
 - app/factory/spree_cm_commissioner/order_telegram_message_factory.rb
 - app/factory/spree_cm_commissioner/telegram_message_factory.rb
 - app/finders/spree_cm_commissioner/line_items/find_by_variant_decorator.rb
+- app/finders/spree_cm_commissioner/orders/find.rb
 - app/finders/spree_cm_commissioner/orders/find_by_state.rb
 - app/finders/spree_cm_commissioner/payment_methods/group_by_bank.rb
 - app/helpers/spree/admin/base_helper_decorator.rb
@@ -2315,6 +2304,7 @@ files:
 - db/migrate/20250328072947_remove_unique_constraint_from_name_in_spree_roles.rb
 - db/migrate/20250403040036_install_blazer.rb
 - db/migrate/20250403083001_create_spree_cm_commissioner_taxon_blazer_query.rb
+- db/migrate/20250404050117_add_archived_at_to_spree_orders.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem
@@ -2453,9 +2443,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubygems_version: 3.4.1