spree_cm_commissioner 1.8.3 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a29005588982c0e0228340fd24198709de40e2e058a7d1013deb6c9bc947f2f5
-  data.tar.gz: d17216bb0b773e4b1e907f74f49dad9e370eaeb6ac972abba49775f30c1b4569
+  metadata.gz: 53d7b7682c7178ee43a82fa1bed180bff277284eb4cc11790f7b9286d4aa2c98
+  data.tar.gz: e352ffca56db709ce091fd5d1900b0893ef86fc55a0c0254da1443cad454a49f
 SHA512:
-  metadata.gz: 7e32fa8dd56c0263baef2dca897b1e83c4148cc5f827ed66d85254051279276880b6f3609fa69108623b1def8a7361bdef6bc067392b4765d2ce94fb7180c647
-  data.tar.gz: bf9195774bc68a1829c5803a94a50fce25bd3fceb4005b0d4aefb9f0a7167fe86aa8d42f17c8c07d974283be07589a4208a914af65489475b2c6a739a69e0e39
+  metadata.gz: ab207fab5a440fb505cb157f7d29070c3d0f53a89117854bcdfceb0141e9cea8cc497d73d80afae1b6921c79b566744b52e86e4783c747527fa36bfb19505e5a
+  data.tar.gz: 790e0b20a95d9a52c525b1e0528f6421479742d2713fd87fc325e3b69c09ab8c6804db3969fee36256d13e728ace25277a2a2f3e96aad496ff3e02fa0695d2ac

data/Gemfile.lock

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

data/app/controllers/spree/admin/base_controller_decorator.rb

@@ -32,7 +32,7 @@ module Spree
       end
 
       # POST
-      def invalidate_api_caches
+      def invalidate_api_caches # rubocop:disable Metrics/CyclomaticComplexity
         if params[:model].present?
           model = case params[:model]
                   when 'SpreeCmCommissioner::HomepageSection'
@@ -41,6 +41,10 @@ module Spree
                     SpreeCmCommissioner::HomepageBackground
                   when 'Spree::Menu'
                     Spree::Menu
+                  when 'Spree::Taxon'
+                    Spree::Taxon
+                  when 'Spree::Product'
+                    Spree::Product
                   else
                     flash[:error] = 'Invalid model provided' # rubocop:disable Rails/I18nLocaleTexts
                     redirect_back fallback_location: admin_root_path and return
@@ -50,7 +54,9 @@ module Spree
           api_patterns_map = {
             SpreeCmCommissioner::HomepageSection => '/api/v2/storefront/homepage/*',
             SpreeCmCommissioner::HomepageBackground => '/api/v2/storefront/homepage/*',
-            Spree::Menu => '/api/v2/storefront/menus*'
+            Spree::Menu => '/api/v2/storefront/menus*',
+            Spree::Taxon => '/api/v2/storefront/taxons*',
+            Spree::Product => '/api/v2/storefront/products*'
           }
           api_patterns = api_patterns_map[model]
 

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

@@ -53,6 +53,17 @@ module Spree
             render_order(result)
           end
 
+          def remove_line_item
+            spree_authorize! :update, spree_current_order, order_token
+
+            remove_line_item_service.call(
+              order: spree_current_order,
+              line_item: line_item
+            )
+
+            render_serialized_payload { serialized_current_order }
+          end
+
           def destroy
             spree_authorize! :update, spree_current_order, order_token
 
@@ -145,6 +156,10 @@ module Spree
             Spree::Api::Dependencies.storefront_cart_add_item_service.constantize
           end
 
+          def remove_line_item_service
+            Spree::Api::Dependencies.storefront_cart_remove_line_item_service.constantize
+          end
+
           def destroy_cart_service
             Spree::Api::Dependencies.storefront_cart_destroy_service.constantize
           end

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

@@ -0,0 +1,33 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class CartPaymentMethodGroupsController < BaseController
+          include Spree::Api::V2::Storefront::OrderConcern
+
+          before_action :ensure_order
+
+          # override
+          def index
+            render_serialized_payload do
+              collection_serializer.new(collection, { include: resource_includes }).serializable_hash
+            end
+          end
+
+          # override
+          def collection
+            @collection ||= SpreeCmCommissioner::PaymentMethods::GroupByBank.new.execute(
+              payment_methods: spree_current_order.available_payment_methods,
+              preferred_payment_method_id: spree_current_user&.preferred_payment_method_id
+            )
+          end
+
+          # override
+          def collection_serializer
+            Spree::V2::Tenant::PaymentMethodGroupSerializer
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -47,6 +47,16 @@ module Spree
             render_order(result)
           end
 
+          def create_payment
+            result = create_payment_service.call(order: spree_current_order, params: params)
+
+            if result.success?
+              render_serialized_payload(201) { serialize_resource(spree_current_order.reload) }
+            else
+              render_error_payload(result.error)
+            end
+          end
+
           private
 
           def wrap_with_multitenant_without(&block)
@@ -72,6 +82,10 @@ module Spree
           def update_service
             Spree::Api::Dependencies.storefront_checkout_update_service.constantize
           end
+
+          def create_payment_service
+            Vpago::Payments::FindOrCreate
+          end
         end
       end
     end

data/app/models/spree_cm_commissioner/ability_decorator.rb

@@ -3,7 +3,7 @@ module SpreeCmCommissioner
     private
 
     def abilities_to_register
-      super << SpreeCmCommissioner::CheckInAbility
+      super.reject { |ability| ability == Spree::VendorAbility } << SpreeCmCommissioner::CheckInAbility
     end
 
     def current_ability

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -31,7 +31,7 @@ module SpreeCmCommissioner
       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 :tenant, class_name: 'SpreeCmCommissioner::Tenant', optional: true
       base.belongs_to :subscription, class_name: 'SpreeCmCommissioner::Subscription', optional: true
 
       base.has_many :taxons, class_name: 'Spree::Taxon', through: :customer

data/app/models/spree_cm_commissioner/place.rb

@@ -16,6 +16,8 @@ module SpreeCmCommissioner
     has_many :children, class_name: 'SpreeCmCommissioner::Place', foreign_key: :parent_id, dependent: :destroy
     belongs_to :parent, class_name: 'SpreeCmCommissioner::Place', optional: true
 
+    has_many :vendor_stops, class_name: 'SpreeCmCommissioner::VendorStop', dependent: :destroy
+
     def self.ransackable_attributes(auth_object = nil)
       super & %w[name code]
     end

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -7,6 +7,7 @@ module SpreeCmCommissioner
 
       base.preference :background_color, :string
       base.preference :foreground_color, :string
+      base.preference :reports, :array, default: []
 
       base.has_many :taxon_vendors, class_name: 'SpreeCmCommissioner::TaxonVendor'
       base.has_many :vendors, through: :taxon_vendors

data/app/models/spree_cm_commissioner/tenant.rb

@@ -3,7 +3,11 @@ module SpreeCmCommissioner
     extend FriendlyId
     friendly_id :name, use: :history
 
-    has_many :vendors, class_name: 'Spree::Vendor'
+    has_many :vendors, class_name: 'Spree::Vendor', inverse_of: :tenant
+    has_many :orders, class_name: 'Spree::Order', inverse_of: :tenant
+    has_many :tenant_payment_methods, class_name: 'Spree::PaymentMethod',
+                                      through: :vendors,
+                                      source: :payment_methods
 
     enum state: { enabled: 0, disabled: 1 }
 

data/app/models/spree_cm_commissioner/trip_stop.rb

@@ -2,10 +2,10 @@ require_dependency 'spree_cm_commissioner'
 module SpreeCmCommissioner
   class TripStop < SpreeCmCommissioner::Base
     acts_as_list column: :sequence, scope: :trip_id
-    enum stop_type: { boarding: 0, drop_off: 1 }
+    enum :stop_type, { boarding: 0, drop_off: 1 }
 
-    belongs_to :trip, class_name: 'SpreeCmCommissioner::Trip'
-    belongs_to :stop, class_name: 'Spree::Taxon'
+    belongs_to :trip, class_name: 'Spree::Variant'
+    belongs_to :stop, class_name: 'SpreeCmCommissioner::Place'
 
     before_validation :set_stop_name
     after_create :create_vendor_stop

data/app/models/spree_cm_commissioner/variant_decorator.rb

@@ -21,6 +21,7 @@ module SpreeCmCommissioner
       base.has_many :variant_guest_card_class, class_name: 'SpreeCmCommissioner::VariantGuestCardClass'
       base.has_many :guest_card_classes, class_name: 'SpreeCmCommissioner::GuestCardClass', through: :variant_guest_card_class
 
+      base.has_many :trip_stops, class_name: 'SpreeCmCommissioner::TripStop', dependent: :destroy, foreign_key: :trip_id
       base.scope :subscribable, -> { active.joins(:product).where(product: { subscribable: true, status: :active }) }
 
       base.accepts_nested_attributes_for :option_values

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -37,16 +37,16 @@ module SpreeCmCommissioner
                     through: :option_value_vendors, source: :option_value
 
       base.has_many :branches, class_name: 'SpreeCmCommissioner::Branch'
-      base.has_many :stops, class_name: 'SpreeCmCommissioner::Stop'
+      base.has_many :stops, class_name: 'SpreeCmCommissioner::Place'
 
       base.has_many :places,
                     through: :nearby_places, source: :place, class_name: 'SpreeCmCommissioner::Place'
 
       base.has_many :vendor_stops, class_name: 'SpreeCmCommissioner::VendorStop', dependent: :destroy
       base.has_many :boarding_points, -> { where(cm_vendor_stops: { stop_type: 0 }) },
-                    through: :vendor_stops, source: :stop, class_name: 'Spree::Taxon'
+                    through: :vendor_stops, source: :stop, class_name: 'SpreeCmCommissioner::Place'
       base.has_many :drop_off_points, -> { where(cm_vendor_stops: { stop_type: 1 }) },
-                    through: :vendor_stops, source: :stop, class_name: 'Spree::Taxon'
+                    through: :vendor_stops, source: :stop, class_name: 'SpreeCmCommissioner::Place'
 
       base.has_one  :logo, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::VendorLogo'
       base.has_one  :payment_qrcode, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::VendorPaymentQrcode'

data/app/models/spree_cm_commissioner/vendor_stop.rb

@@ -2,7 +2,7 @@ require_dependency 'spree_cm_commissioner'
 module SpreeCmCommissioner
   class VendorStop < ApplicationRecord
     belongs_to :vendor, class_name: 'Spree::Vendor'
-    belongs_to :stop, class_name: 'Spree::Taxon'
+    belongs_to :stop, class_name: 'SpreeCmCommissioner::Place'
 
     enum stop_type: { boarding: 0, drop_off: 1 }
   end

data/app/overrides/spree/admin/products/edit/clear_cache_button.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_after "erb[silent]:contains('content_for :page_actions')" -->
+
+<%= button_link_to Spree.t(:clear_cache), admin_invalidate_api_caches_path(model: Spree::Product.name),method: :post, class: "btn btn-outline-primary" %>

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

@@ -0,0 +1,7 @@
+<!-- insert_after "erb[silent]:contains('content_for :page_actions')" -->
+
+<% if @taxon.depth == 1 %>
+      <%= button_link_to Spree.t(:clear_cache),
+          admin_invalidate_api_caches_path(model: Spree::Taxon.name),
+          method: :post, class: "btn btn-outline-primary" %>
+<% end %>

data/app/queries/spree_cm_commissioner/organizer_profile_event_query.rb

@@ -10,7 +10,7 @@ module SpreeCmCommissioner
     end
 
     def events
-      taxons = Spree::Taxon.includes(:vendor).where(vendor_id: vendor_id)
+      taxons = Spree::Taxon.includes(:vendor).where(vendor_id: vendor_id, depth: 1)
 
       case section
       when 'upcoming'

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

@@ -2,7 +2,7 @@ module Spree
   module V2
     module Storefront
       module ProductSerializerDecorator
-        def self.prepended(base)
+        def self.prepended(base) # rubocop:disable Metrics/MethodLength
           base.has_many :variant_kind_option_types, serializer: :option_type
           base.has_many :product_kind_option_types, serializer: :option_type
           base.has_many :promoted_option_types, serializer: :option_type
@@ -41,6 +41,8 @@ module Spree
             value = product.available?
             [true, false].include?(value) ? value : nil
           end
+
+          base.cache_options store: nil
         end
       end
     end

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

@@ -23,6 +23,8 @@ module Spree
           base.attribute :purchasable_on_web do |taxon|
             taxon.purchasable_on == 'web' || taxon.purchasable_on == 'both'
           end
+
+          base.cache_options store: nil
         end
       end
     end

data/app/serializers/spree/v2/tenant/payment_method_group_serializer.rb

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Tenant
+      class PaymentMethodGroupSerializer < BaseSerializer
+        attributes :name
+
+        has_many :payment_methods, serializer: Spree::V2::Tenant::PaymentMethodSerializer
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/tenant/payment_method_serializer.rb

@@ -0,0 +1,13 @@
+module Spree
+  module V2
+    module Tenant
+      class PaymentMethodSerializer < BaseSerializer
+        attributes :type, :name, :description, :public_metadata
+
+        attribute :preferences do |object|
+          object.public_preferences.as_json
+        end
+      end
+    end
+  end
+end

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

@@ -30,12 +30,17 @@
       </thead>
       <tbody>
         <% @user_events.each do |user_event| %>
-          <% user = user_event.user %>
-          <tr id="<%= spree_dom_id user %>" data-hook="admin_taxonomy_taxon_user_events_index_rows">
-            <td><%= user.id %></td>
-            <td class='user_email'><%= link_to user.email, edit_admin_user_url(user) %></td>
-            <td><%= user.created_at %></td>
-            <td><%= user.updated_at %></td>
+          <tr id="<%= spree_dom_id user_event %>" data-hook="admin_taxonomy_taxon_user_events_index_rows">
+            <td><%= user_event.id %></td>
+            <td class='user_email'>
+              <% if user_event.user.present? %>
+                <%= link_to user_event.user.email, edit_admin_user_url(user_event.user) %>
+              <% else %>
+                 <span class="text-danger">User is deleted</span>
+              <% end %>
+            </td>
+            <td><%= user_event.created_at %></td>
+            <td><%= user_event.updated_at %></td>
             <td data-hook="admin_taxonomy_taxon_user_events_index_row_actions" class="actions">
               <span class="d-flex justify-content-end">
                 <%= link_to_delete user_event, url: admin_user_event_path(user_event.id), no_text: true if can?(:delete, user_event) %>

data/config/routes.rb

@@ -466,6 +466,7 @@ Spree::Core::Engine.add_routes do
 
         resource :cart, controller: :cart, only: %i[show create destroy] do
           post   :add_item
+          delete 'remove_line_item/:line_item_id', to: 'cart#remove_line_item', as: :cart_remove_line_item
           patch  :set_quantity
           patch  :apply_coupon_code
           delete 'remove_coupon_code/:coupon_code', to: 'cart#remove_coupon_code', as: :cart_remove_coupon_code
@@ -479,6 +480,7 @@ Spree::Core::Engine.add_routes do
           patch  :next
           patch  :advance
           patch  :complete
+          post   :create_payment
         end
 
         resources :customer_notifications, only: [:show]
@@ -492,6 +494,7 @@ Spree::Core::Engine.add_routes do
         end
 
         resources :user_account_linkages, only: %i[index create destroy]
+        resources :cart_payment_method_groups, only: %i[index]
         resource :s3_signed_urls
         resource :profile_images, only: %i[update destroy]
         resources :line_items, only: %i[index show]

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.8.3'.freeze
+  VERSION = '1.8.5'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.5
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-20 00:00:00.000000000 Z
+date: 2025-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -819,6 +819,7 @@ files:
 - app/controllers/spree/api/v2/tenant/base_controller.rb
 - app/controllers/spree/api/v2/tenant/cart_controller.rb
 - app/controllers/spree/api/v2/tenant/cart_guests_controller.rb
+- app/controllers/spree/api/v2/tenant/cart_payment_method_groups_controller.rb
 - app/controllers/spree/api/v2/tenant/checkout_controller.rb
 - app/controllers/spree/api/v2/tenant/customer_notifications_controller.rb
 - app/controllers/spree/api/v2/tenant/guests_controller.rb
@@ -1300,6 +1301,7 @@ files:
 - app/overrides/spree/admin/products/_form/reveal_description_to_user.html.erb.deface
 - app/overrides/spree/admin/products/_form/subscribable_checkbox.html.erb.deface
 - app/overrides/spree/admin/products/_form/use_video_as_default.html.erb.deface
+- app/overrides/spree/admin/products/edit/clear_cache_button.html.erb.deface
 - app/overrides/spree/admin/products/index/product_vendor_link.html.erb.deface
 - app/overrides/spree/admin/products/new/allow_anonymous_booking.html.erb.deface
 - app/overrides/spree/admin/products/new/include_kyc_checkbox.html.erb.deface
@@ -1354,6 +1356,7 @@ files:
 - app/overrides/spree/admin/taxons/_form/sub_title.html.erb.deface
 - app/overrides/spree/admin/taxons/_form/to_date_form_date.html.erb.deface
 - app/overrides/spree/admin/taxons/_form/vendor.html.erb.deface
+- app/overrides/spree/admin/taxons/edit/clear_cache_button.html.erb.deface
 - app/overrides/spree/admin/taxons/edit/taxon_tabs.html.erb.deface
 - app/overrides/spree/admin/taxons/edit/title.html.erb.deface
 - app/overrides/spree/admin/users/_form/fields.html.erb.deface
@@ -1460,6 +1463,8 @@ files:
 - app/serializers/spree/v2/tenant/option_type_serializer.rb
 - app/serializers/spree/v2/tenant/option_value_serializer.rb
 - app/serializers/spree/v2/tenant/order_serializer.rb
+- app/serializers/spree/v2/tenant/payment_method_group_serializer.rb
+- app/serializers/spree/v2/tenant/payment_method_serializer.rb
 - app/serializers/spree/v2/tenant/role_serializer.rb
 - app/serializers/spree/v2/tenant/s3_signed_url_serializer.rb
 - app/serializers/spree/v2/tenant/stock_item_serializer.rb