spree_cm_commissioner 1.8.4 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23dc6ecf893ca834e63e31cfe256b1303e12449683612adcabad907e90ff1470
-  data.tar.gz: 7bfe596bd800a4c86efd8bfd08b32822aa2ec4b1b8a692e6cd7ce11f4126c442
+  metadata.gz: 53d7b7682c7178ee43a82fa1bed180bff277284eb4cc11790f7b9286d4aa2c98
+  data.tar.gz: e352ffca56db709ce091fd5d1900b0893ef86fc55a0c0254da1443cad454a49f
 SHA512:
-  metadata.gz: 399cc8af5b317b52c29bfe9e5dc8466c44b6397af50184d645120929ac1d5fab30b0cc099b243bbbe2393d6e18dccef4f5fcb32477f9ffa8c24335a8b18f46fc
-  data.tar.gz: b61c2a45b6631a45535163f3fb82cc4201a3fce10b3bfb4fcc49fb981b79fc3d3042ee98dad896c5934c540e61525e301fd7f56ec479640c08897064d7bab82c
+  metadata.gz: ab207fab5a440fb505cb157f7d29070c3d0f53a89117854bcdfceb0141e9cea8cc497d73d80afae1b6921c79b566744b52e86e4783c747527fa36bfb19505e5a
+  data.tar.gz: 790e0b20a95d9a52c525b1e0528f6421479742d2713fd87fc325e3b69c09ab8c6804db3969fee36256d13e728ace25277a2a2f3e96aad496ff3e02fa0695d2ac

data/Gemfile.lock

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

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/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/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/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.4'.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.4
+  version: 1.8.5
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-21 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
@@ -1462,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