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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (210) hide show
  1. checksums.yaml +4 -4
  2. data/.env.example +0 -3
  3. data/.github/workflows/test_and_build_gem.yml +16 -2
  4. data/.gitignore +2 -1
  5. data/Gemfile.lock +28 -1
  6. data/Rakefile +33 -4
  7. data/app/assets/javascripts/spree_cm_commissioner/backend.js +0 -1
  8. data/app/assets/stylesheets/spree_cm_commissioner/backend/calendar.scss +8 -11
  9. data/app/assets/stylesheets/spree_cm_commissioner/backend/commissioner_admin.css.scss +0 -1
  10. data/app/controllers/concerns/spree_cm_commissioner/content_cachable.rb +1 -2
  11. data/app/controllers/spree/admin/inventory_items_controller.rb +83 -0
  12. data/app/controllers/spree/admin/stock_managements_controller.rb +63 -1
  13. data/app/controllers/spree/admin/tenants_controller.rb +0 -8
  14. data/app/controllers/spree/api/v2/storefront/accommodations/variants_controller.rb +42 -0
  15. data/app/controllers/spree/api/v2/storefront/accommodations_controller.rb +14 -31
  16. data/app/controllers/spree/api/v2/storefront/guests_controller.rb +5 -31
  17. data/app/controllers/spree/api/v2/storefront/queue_cart/line_items_controller.rb +2 -2
  18. data/app/controllers/spree_cm_commissioner/admin/variants_controller_decorator.rb +1 -1
  19. data/app/controllers/spree_cm_commissioner/well_known_controller.rb +17 -31
  20. data/app/finders/spree_cm_commissioner/accommodations/find.rb +37 -0
  21. data/app/finders/spree_cm_commissioner/accommodations/find_variant.rb +32 -0
  22. data/app/interactors/spree_cm_commissioner/ensure_correct_product_type.rb +40 -0
  23. data/app/interactors/spree_cm_commissioner/inventory_item_syncer.rb +25 -0
  24. data/app/interactors/spree_cm_commissioner/stock/inventory_item_resetter.rb +44 -0
  25. data/app/interactors/spree_cm_commissioner/stock/inventory_items_adjuster.rb +13 -0
  26. data/app/interactors/spree_cm_commissioner/stock/inventory_items_generator.rb +15 -0
  27. data/app/interactors/spree_cm_commissioner/stock/permanent_inventory_items_generator.rb +75 -0
  28. data/app/interactors/spree_cm_commissioner/stock/stock_movement_creator.rb +32 -0
  29. data/app/interactors/spree_cm_commissioner/vattanac_bank_initiator.rb +1 -5
  30. data/app/jobs/spree_cm_commissioner/application_job.rb +20 -0
  31. data/app/jobs/spree_cm_commissioner/application_unique_job.rb +20 -0
  32. data/app/jobs/spree_cm_commissioner/ensure_correct_product_type_job.rb +7 -0
  33. data/app/jobs/spree_cm_commissioner/inventory_item_syncer_job.rb +7 -0
  34. data/app/jobs/spree_cm_commissioner/stock/inventory_items_adjuster_job.rb +11 -0
  35. data/app/jobs/spree_cm_commissioner/stock/inventory_items_generator_job.rb +11 -0
  36. data/app/jobs/spree_cm_commissioner/stock/permanent_inventory_items_generator_job.rb +9 -0
  37. data/app/models/concerns/spree_cm_commissioner/line_item_durationable.rb +9 -15
  38. data/app/models/concerns/spree_cm_commissioner/option_type_attr_type.rb +1 -13
  39. data/app/models/concerns/spree_cm_commissioner/order_seatable.rb +44 -0
  40. data/app/models/concerns/spree_cm_commissioner/order_state_machine.rb +39 -0
  41. data/app/models/concerns/spree_cm_commissioner/product_delegation.rb +1 -3
  42. data/app/models/concerns/spree_cm_commissioner/product_type.rb +10 -0
  43. data/app/models/concerns/spree_cm_commissioner/taxon_kind.rb +1 -1
  44. data/app/models/concerns/spree_cm_commissioner/tenant_preference.rb +0 -4
  45. data/app/models/spree_cm_commissioner/block.rb +23 -0
  46. data/app/models/spree_cm_commissioner/dynamic_field.rb +3 -15
  47. data/app/models/spree_cm_commissioner/dynamic_field_option.rb +1 -5
  48. data/app/models/spree_cm_commissioner/guest.rb +19 -1
  49. data/app/models/spree_cm_commissioner/guest_dynamic_field.rb +3 -21
  50. data/app/models/spree_cm_commissioner/inventory.rb +11 -0
  51. data/app/models/spree_cm_commissioner/inventory_item.rb +69 -0
  52. data/app/models/spree_cm_commissioner/invite_team.rb +1 -3
  53. data/app/models/spree_cm_commissioner/line_item_decorator.rb +46 -78
  54. data/app/models/spree_cm_commissioner/notification_taxon.rb +1 -1
  55. data/app/models/spree_cm_commissioner/option_type_decorator.rb +1 -11
  56. data/app/models/spree_cm_commissioner/order_decorator.rb +30 -1
  57. data/app/models/spree_cm_commissioner/pin_code.rb +2 -3
  58. data/app/models/spree_cm_commissioner/place.rb +1 -3
  59. data/app/models/spree_cm_commissioner/price_decorator.rb +9 -0
  60. data/app/models/spree_cm_commissioner/product_decorator.rb +10 -4
  61. data/app/models/spree_cm_commissioner/redis_stock/cached_inventory_items_builder.rb +41 -0
  62. data/app/models/spree_cm_commissioner/redis_stock/inventory_updater.rb +126 -0
  63. data/app/models/spree_cm_commissioner/redis_stock/line_items_cached_inventory_items_builder.rb +36 -0
  64. data/app/models/spree_cm_commissioner/redis_stock/variant_cached_inventory_items_builder.rb +25 -0
  65. data/app/models/spree_cm_commissioner/reserved_block.rb +30 -0
  66. data/app/models/spree_cm_commissioner/seat_layout.rb +20 -0
  67. data/app/models/spree_cm_commissioner/seat_section.rb +16 -0
  68. data/app/models/spree_cm_commissioner/seats/blocks_canceler.rb +30 -0
  69. data/app/models/spree_cm_commissioner/seats/blocks_holder.rb +53 -0
  70. data/app/models/spree_cm_commissioner/seats/blocks_reserver.rb +49 -0
  71. data/app/models/spree_cm_commissioner/seats/errors/blocks_are_on_hold_by_other_guest.rb +4 -0
  72. data/app/models/spree_cm_commissioner/seats/errors/blocks_are_reserved_by_other_guest.rb +4 -0
  73. data/app/models/spree_cm_commissioner/seats/errors/blocks_are_reserved_by_same_guest.rb +4 -0
  74. data/app/models/spree_cm_commissioner/seats/errors/unable_to_save_reserved_block_record.rb +4 -0
  75. data/app/models/spree_cm_commissioner/service_calendar.rb +0 -2
  76. data/app/models/spree_cm_commissioner/state_decorator.rb +0 -1
  77. data/app/models/spree_cm_commissioner/stock/availability_checker.rb +26 -25
  78. data/app/models/spree_cm_commissioner/stock/availability_validator_decorator.rb +2 -1
  79. data/app/models/spree_cm_commissioner/stock/line_item_availability_checker.rb +3 -3
  80. data/app/models/spree_cm_commissioner/stock/order_availability_checker.rb +44 -0
  81. data/app/models/spree_cm_commissioner/stock_item_decorator.rb +17 -0
  82. data/app/models/spree_cm_commissioner/taxon_decorator.rb +0 -2
  83. data/app/models/spree_cm_commissioner/taxonomy_decorator.rb +0 -6
  84. data/app/models/spree_cm_commissioner/trip.rb +20 -6
  85. data/app/models/spree_cm_commissioner/trip_connection.rb +5 -5
  86. data/app/models/spree_cm_commissioner/trip_stop.rb +2 -3
  87. data/app/models/spree_cm_commissioner/user_taxon.rb +0 -1
  88. data/app/models/spree_cm_commissioner/variant_block.rb +9 -0
  89. data/app/models/spree_cm_commissioner/variant_decorator.rb +36 -47
  90. data/app/models/spree_cm_commissioner/variant_options.rb +0 -23
  91. data/app/models/spree_cm_commissioner/vehicle.rb +9 -14
  92. data/app/models/spree_cm_commissioner/vendor_decorator.rb +7 -10
  93. data/app/models/spree_cm_commissioner/vendor_place.rb +6 -5
  94. data/app/models/spree_cm_commissioner/vendor_stop.rb +1 -2
  95. data/app/overrides/spree/admin/variants/_form/kyc_field.html.erb.deface +2 -2
  96. data/app/queries/spree_cm_commissioner/guest_searcher_query.rb +3 -45
  97. data/app/queries/spree_cm_commissioner/trip_query.rb +23 -26
  98. data/app/request_schemas/spree_cm_commissioner/accommodation_request_schema.rb +3 -0
  99. data/app/request_schemas/spree_cm_commissioner/application_request_schema.rb +1 -1
  100. data/app/request_schemas/spree_cm_commissioner/variant_request_schema.rb +19 -0
  101. data/app/serializers/spree/v2/storefront/accommodation_serializer.rb +2 -0
  102. data/app/serializers/spree/v2/storefront/line_item_serializer_decorator.rb +1 -0
  103. data/app/serializers/spree_cm_commissioner/v2/operator/dashboard_crew_event_serializer.rb +1 -4
  104. data/app/serializers/spree_cm_commissioner/v2/storefront/dynamic_field_option_serializer.rb +3 -1
  105. data/app/serializers/spree_cm_commissioner/v2/storefront/dynamic_field_serializer.rb +3 -1
  106. data/app/serializers/spree_cm_commissioner/v2/storefront/guest_dynamic_field_serializer.rb +1 -2
  107. data/app/services/spree_cm_commissioner/organizer/export_guest_csv_service.rb +15 -23
  108. data/app/views/spree/admin/inventory_items/show.html.erb +72 -0
  109. data/app/views/spree/admin/stock_managements/_variant_stock_items.html.erb +7 -2
  110. data/app/views/spree/admin/stock_managements/calendar.html.erb +56 -0
  111. data/app/views/spree/admin/stock_managements/index.html.erb +55 -6
  112. data/app/views/spree/admin/tenants/_form.html.erb +42 -109
  113. data/config/initializers/paper_trail.rb +1 -0
  114. data/config/initializers/spree_permitted_attributes.rb +5 -2
  115. data/config/locales/en.yml +0 -5
  116. data/config/routes.rb +22 -4
  117. data/db/migrate/20240202080634_update_counter_cache_of_vehicle_type.rb +3 -1
  118. data/db/migrate/20250304293518_create_cm_inventory_items.rb +21 -0
  119. data/db/migrate/20250429094228_add_lock_version_to_cm_inventory_items.rb +5 -0
  120. data/db/migrate/20250502025848_add_index_to_spree_products.rb +5 -0
  121. data/db/migrate/20250502030001_add_product_type_to_spree_variants.rb +5 -0
  122. data/db/migrate/20250502030002_add_product_type_to_spree_line_items.rb +5 -0
  123. data/db/migrate/20250603035256_add_inventory_item_to_spree_prices.rb +7 -0
  124. data/db/migrate/20250619073724_drop_table_cm_line_item_seats.rb +5 -0
  125. data/db/migrate/20250619073812_drop_table_cm_vehicle_seats.rb +5 -0
  126. data/db/migrate/20250619073844_drop_table_cm_vehicle_types.rb +9 -0
  127. data/db/migrate/20250619073957_drop_table_cm_option_value_vehicle_types.rb +5 -0
  128. data/db/migrate/20250619082354_remove_unnecessary_fields_from_cm_places.rb +9 -0
  129. data/db/migrate/20250619082736_remove_route_type_from_spree_products.rb +5 -0
  130. data/db/migrate/20250619083055_remove_unnecessary_fields_from_spree_taxons.rb +5 -0
  131. data/db/migrate/20250620083055_remove_variant_id_from_cm_trips.rb +5 -0
  132. data/db/migrate/20250620090000_update_cm_trip_connections_to_use_cm_trips.rb +6 -0
  133. data/db/migrate/20250620090001_create_cm_seat_layouts.rb +17 -0
  134. data/db/migrate/20250620090002_create_cm_seat_sections.rb +18 -0
  135. data/db/migrate/20250620090003_create_cm_blocks.rb +18 -0
  136. data/db/migrate/20250624091005_create_cm_reserved_blocks.rb +29 -0
  137. data/db/migrate/20250626083642_create_cm_variant_blocks.rb +24 -0
  138. data/db/migrate/20250627023314_add_block_id_to_cm_guests.rb +13 -0
  139. data/docker-compose.yml +1 -1
  140. data/lib/cm_app_logger.rb +11 -4
  141. data/lib/generators/spree_cm_commissioner/install/install_generator.rb +14 -11
  142. data/lib/generators/spree_cm_commissioner/install/templates/app/javascript/{spree_cm_commissioner → spree_dashboard/spree_cm_commissioner}/utilities.js +4 -0
  143. data/lib/spree_cm_commissioner/cached_inventory_item.rb +23 -0
  144. data/lib/spree_cm_commissioner/calendar_event.rb +11 -1
  145. data/lib/spree_cm_commissioner/test_helper/factories/block_factory.rb +9 -0
  146. data/lib/spree_cm_commissioner/test_helper/factories/guest_factory.rb +10 -0
  147. data/lib/spree_cm_commissioner/test_helper/factories/homepage_section_relatable_factory.rb +1 -1
  148. data/lib/spree_cm_commissioner/test_helper/factories/inventory_item_factory.rb +9 -0
  149. data/lib/spree_cm_commissioner/test_helper/factories/line_item_factory.rb +1 -1
  150. data/lib/spree_cm_commissioner/test_helper/factories/option_type_factory.rb +6 -30
  151. data/lib/spree_cm_commissioner/test_helper/factories/order_factory.rb +0 -36
  152. data/lib/spree_cm_commissioner/test_helper/factories/product_factory.rb +18 -34
  153. data/lib/spree_cm_commissioner/test_helper/factories/reserved_block_factory.rb +27 -0
  154. data/lib/spree_cm_commissioner/test_helper/factories/seat_layout_factory.rb +8 -0
  155. data/lib/spree_cm_commissioner/test_helper/factories/seat_section_factory.rb +8 -0
  156. data/lib/spree_cm_commissioner/test_helper/factories/stock_location_factory.rb +2 -2
  157. data/lib/spree_cm_commissioner/test_helper/factories/trip_connection_factory.rb +6 -0
  158. data/lib/spree_cm_commissioner/test_helper/factories/trip_factory.rb +10 -3
  159. data/lib/spree_cm_commissioner/test_helper/factories/variant_block_factory.rb +7 -0
  160. data/lib/spree_cm_commissioner/test_helper/factories/variant_factory.rb +41 -19
  161. data/lib/spree_cm_commissioner/test_helper/factories/vehicle_factory.rb +1 -1
  162. data/lib/spree_cm_commissioner/test_helper/factories/vendor_factory.rb +1 -1
  163. data/lib/spree_cm_commissioner/version.rb +1 -1
  164. data/lib/spree_cm_commissioner.rb +35 -1
  165. data/lib/tasks/create_default_non_permanent_inventory_items.rake +16 -0
  166. data/lib/tasks/ensure_correct_product_type.rake +7 -0
  167. data/lib/tasks/generate_inventory_items.rake +7 -0
  168. data/spree_cm_commissioner.gemspec +7 -0
  169. metadata +131 -43
  170. data/app/assets/images/cm-hangmeas-checkout_image.svg +0 -63
  171. data/app/assets/images/cm-hangmeas-failed.svg +0 -56
  172. data/app/assets/images/cm-hangmeas-loader.svg +0 -50
  173. data/app/assets/images/cm-hangmeas-success.svg +0 -51
  174. data/app/assets/javascripts/spree_cm_commissioner/tenant_payment_icon_fields.js +0 -65
  175. data/app/assets/stylesheets/spree_cm_commissioner/backend/tenant_payment_icon_fields.scss +0 -60
  176. data/app/controllers/concerns/spree_cm_commissioner/transit/taxon_bitwise.rb +0 -44
  177. data/app/finders/spree_cm_commissioner/line_items/find_by_variant_decorator.rb +0 -20
  178. data/app/interactors/spree_cm_commissioner/apple_app_site_association_fetcher.rb +0 -27
  179. data/app/interactors/spree_cm_commissioner/asset_links_fetcher.rb +0 -27
  180. data/app/interactors/spree_cm_commissioner/telegram_chats_auto_finder.rb +0 -144
  181. data/app/models/concerns/spree_cm_commissioner/event_check_in_flowable.rb +0 -30
  182. data/app/models/spree_cm_commissioner/branch.rb +0 -12
  183. data/app/models/spree_cm_commissioner/line_item_seat.rb +0 -10
  184. data/app/models/spree_cm_commissioner/option_value_vehicle_type.rb +0 -8
  185. data/app/models/spree_cm_commissioner/pin_code_telegram.rb +0 -28
  186. data/app/models/spree_cm_commissioner/promotion_category_decorator.rb +0 -11
  187. data/app/models/spree_cm_commissioner/stop.rb +0 -23
  188. data/app/models/spree_cm_commissioner/telegram_chat.rb +0 -6
  189. data/app/models/spree_cm_commissioner/vehicle_seat.rb +0 -11
  190. data/app/models/spree_cm_commissioner/vehicle_type.rb +0 -76
  191. data/app/overrides/spree/admin/taxons/_form/check_in_flows.html.erb.deface +0 -18
  192. data/app/queries/spree_cm_commissioner/trip_search_query.rb +0 -76
  193. data/app/queries/spree_cm_commissioner/variant_availability/non_permanent_stock_query.rb +0 -45
  194. data/app/queries/spree_cm_commissioner/variant_availability/permanent_stock_query.rb +0 -55
  195. data/app/services/spree_cm_commissioner/vehicle_option_value_creator.rb +0 -11
  196. data/db/migrate/20250616084219_add_description_to_cm_vendor_place.rb +0 -5
  197. data/db/migrate/20250630103536_create_cm_telegram_chats.rb +0 -13
  198. data/db/migrate/20250701093203_add_configurations_to_cm_dynamic_field.rb +0 -6
  199. data/db/migrate/20250702091305_add_dynamic_field_option_to_guest_dynamic_field.rb +0 -5
  200. data/db/migrate/20250702091935_add_status_to_dynamic_field_option.rb +0 -5
  201. data/db/migrate/20250707032008_add_vendor_id_to_spree_category.rb +0 -7
  202. data/lib/spree_cm_commissioner/test_helper/factories/branch_factory.rb +0 -12
  203. data/lib/spree_cm_commissioner/test_helper/factories/departure_time_option_type_factory.rb +0 -8
  204. data/lib/spree_cm_commissioner/test_helper/factories/duration_option_type_factory.rb +0 -8
  205. data/lib/spree_cm_commissioner/test_helper/factories/line_item_seat_factory.rb +0 -7
  206. data/lib/spree_cm_commissioner/test_helper/factories/stop_factory.rb +0 -14
  207. data/lib/spree_cm_commissioner/test_helper/factories/transit_place_factory.rb +0 -8
  208. data/lib/spree_cm_commissioner/test_helper/factories/vehicle_option_type_factory.rb +0 -8
  209. data/lib/spree_cm_commissioner/test_helper/factories/vehicle_type_factory.rb +0 -96
  210. data/lib/spree_cm_commissioner/trip_seat_layout_result.rb +0 -11
@@ -2,6 +2,7 @@ module SpreeCmCommissioner
2
2
  module OrderDecorator
3
3
  def self.prepended(base) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
4
4
  base.include SpreeCmCommissioner::PhoneNumberSanitizer
5
+ base.include SpreeCmCommissioner::OrderSeatable
5
6
  base.include SpreeCmCommissioner::OrderStateMachine
6
7
 
7
8
  base.scope :subscription, -> { where.not(subscription_id: nil) }
@@ -42,6 +43,8 @@ module SpreeCmCommissioner
42
43
  base.has_many :vendors, through: :products, class_name: 'Spree::Vendor'
43
44
  base.has_many :taxons, through: :products, class_name: 'Spree::Taxon'
44
45
  base.has_many :guests, through: :line_items, class_name: 'SpreeCmCommissioner::Guest'
46
+ base.has_many :blocks, through: :guests, class_name: 'SpreeCmCommissioner::Block', source: :block
47
+ base.has_many :reserved_blocks, through: :guests, class_name: 'SpreeCmCommissioner::ReservedBlock'
45
48
  base.has_many :guest_card_classes, class_name: 'SpreeCmCommissioner::GuestCardClass', through: :variants
46
49
 
47
50
  base.delegate :customer, to: :user, allow_nil: true
@@ -58,6 +61,13 @@ module SpreeCmCommissioner
58
61
  end
59
62
  end
60
63
 
64
+ # override
65
+ # spree use this method to check stock availability & consider whether :order can continue to next state.
66
+ def insufficient_stock_lines
67
+ checker = SpreeCmCommissioner::Stock::OrderAvailabilityChecker.new(self)
68
+ checker.insufficient_stock_lines
69
+ end
70
+
61
71
  def ticket_seller_user?
62
72
  return false if user.nil?
63
73
 
@@ -106,7 +116,14 @@ module SpreeCmCommissioner
106
116
  end
107
117
 
108
118
  def mark_as_archive
109
- update(archived_at: Time.current)
119
+ blocks_canceled = begin
120
+ cancel_blocks!
121
+ true
122
+ rescue StandardError
123
+ false
124
+ end
125
+
126
+ update(archived_at: Time.current) if blocks_canceled
110
127
  end
111
128
 
112
129
  # overrided
@@ -199,6 +216,18 @@ module SpreeCmCommissioner
199
216
 
200
217
  private
201
218
 
219
+ def unstock_inventory_in_redis!
220
+ CmAppLogger.log(label: "#{self.class.name}#unstock_inventory_in_redis!", data: { order_id: id }) do
221
+ SpreeCmCommissioner::RedisStock::InventoryUpdater.new(line_item_ids).unstock!
222
+ end
223
+ end
224
+
225
+ def restock_inventory_in_redis!
226
+ CmAppLogger.log(label: "#{self.class.name}#restock_inventory_in_redis!", data: { order_id: id }) do
227
+ SpreeCmCommissioner::RedisStock::InventoryUpdater.new(line_item_ids).restock!
228
+ end
229
+ end
230
+
202
231
  # override :spree_api
203
232
  def webhook_payload_body
204
233
  resource_serializer.new(
@@ -2,7 +2,7 @@ module SpreeCmCommissioner
2
2
  class PinCode < SpreeCmCommissioner::Base
3
3
  has_secure_token
4
4
 
5
- enum contact_type: { 'phone_number' => 0, 'email' => 1, 'telegram' => 2 }
5
+ enum contact_type: { 'phone_number' => 0, 'email' => 1 }
6
6
 
7
7
  validates :code, length: { maximum: 6 }
8
8
  validates :contact, presence: true
@@ -130,8 +130,7 @@ module SpreeCmCommissioner
130
130
  'SpreeCmCommissioner::PinCodeMobileConfirm' => I18n.t('pincode.readable_type.confirmation_code'),
131
131
  'SpreeCmCommissioner::PinCodeUpdateUserLogin' => I18n.t('pincode.readable_type.update_user_login'),
132
132
  'SpreeCmCommissioner::PinCodeEmailConfirm' => I18n.t('pincode.readable_type.confirmation_code'),
133
- 'SpreeCmCommissioner::OtpCode' => I18n.t('pincode.readable_type.otp_code'),
134
- 'SpreeCmCommissioner::PinCodeTelegram' => I18n.t('pincode.readable_type.telegram_verification')
133
+ 'SpreeCmCommissioner::OtpCode' => I18n.t('pincode.readable_type.otp_code')
135
134
  }
136
135
  end
137
136
 
@@ -1,7 +1,5 @@
1
- require_dependency 'spree_cm_commissioner'
2
-
3
1
  module SpreeCmCommissioner
4
- class Place < ApplicationRecord
2
+ class Place < Base
5
3
  acts_as_nested_set
6
4
 
7
5
  validates :reference, presence: true, if: :validate_reference?
@@ -0,0 +1,9 @@
1
+ module SpreeCmCommissioner
2
+ module PriceDecorator
3
+ def self.prepended(base)
4
+ base.belongs_to :inventory_item, class_name: 'SpreeCmCommissioner::InventoryItem', inverse_of: :prices, optional: true
5
+ end
6
+ end
7
+ end
8
+
9
+ Spree::Price.prepend(SpreeCmCommissioner::PriceDecorator) unless Spree::Price.included_modules.include?(SpreeCmCommissioner::PriceDecorator)
@@ -6,7 +6,6 @@ module SpreeCmCommissioner
6
6
  base.include SpreeCmCommissioner::KycBitwise
7
7
  base.include SpreeCmCommissioner::Metafield
8
8
  base.include SpreeCmCommissioner::TenantUpdatable
9
- base.include SpreeCmCommissioner::RouteType
10
9
 
11
10
  base.has_many :variant_kind_option_types, -> { where(kind: :variant).order(:position) },
12
11
  through: :product_option_types, source: :option_type
@@ -33,6 +32,7 @@ module SpreeCmCommissioner
33
32
  base.has_one :google_wallet, class_name: 'SpreeCmCommissioner::GoogleWallet', dependent: :destroy
34
33
 
35
34
  base.has_many :complete_line_items, through: :classifications, source: :line_items
35
+ base.has_many :inventory_items, through: :variants
36
36
  base.has_many :guests, through: :line_items
37
37
 
38
38
  base.has_many :product_places, class_name: 'SpreeCmCommissioner::ProductPlace', dependent: :destroy
@@ -64,12 +64,11 @@ module SpreeCmCommissioner
64
64
  base.before_validation :set_event_id
65
65
 
66
66
  base.validate :validate_event_taxons, if: -> { taxons.event.present? }
67
-
68
67
  base.validate :validate_product_date, if: -> { available_on.present? && discontinue_on.present? }
69
-
68
+ base.validate :product_type_unchanged, on: :update
70
69
  base.validates :commission_rate, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 100 }, allow_nil: true
71
70
 
72
- base.whitelisted_ransackable_attributes = %w[description name slug discontinue_on status vendor_id short_name route_type]
71
+ base.whitelisted_ransackable_attributes = %w[description name slug discontinue_on status vendor_id short_name]
73
72
 
74
73
  base.after_update :update_variants_vendor_id, if: :saved_change_to_vendor_id?
75
74
  base.after_update :sync_event_id_to_children, if: :saved_change_to_event_id?
@@ -114,6 +113,13 @@ module SpreeCmCommissioner
114
113
 
115
114
  errors.add(:discontinue_on, 'must be after the available on date')
116
115
  end
116
+
117
+ def product_type_unchanged
118
+ return if product_type_was.nil?
119
+ return unless product_type_changed?
120
+
121
+ errors.add(:product_type, 'cannot be changed once set')
122
+ end
117
123
  end
118
124
  end
119
125
 
@@ -0,0 +1,41 @@
1
+ module SpreeCmCommissioner
2
+ module RedisStock
3
+ class CachedInventoryItemsBuilder
4
+ attr_reader :inventory_items
5
+
6
+ def initialize(inventory_items)
7
+ @inventory_items = inventory_items
8
+ end
9
+
10
+ # output: [ CachedInventoryItem(...), CachedInventoryItem(...) ]
11
+ def call
12
+ keys = inventory_items.map { |item| "inventory:#{item.id}" }
13
+ return [] unless keys.any?
14
+
15
+ counts = SpreeCmCommissioner.redis_pool.with { |redis| redis.mget(*keys) }
16
+ inventory_items.map.with_index do |inventory_item, i|
17
+ ::SpreeCmCommissioner::CachedInventoryItem.new(
18
+ inventory_key: keys[i],
19
+ active: inventory_item.active?,
20
+ quantity_available: cache_inventory(keys[i], inventory_item, counts[i]),
21
+ inventory_item_id: inventory_item.id,
22
+ variant_id: inventory_item.variant_id
23
+ )
24
+ end
25
+ end
26
+
27
+ private
28
+
29
+ def cache_inventory(key, inventory_item, count_in_redis)
30
+ return count_in_redis.to_i if count_in_redis.present?
31
+ return inventory_item.quantity_available unless inventory_item.active?
32
+
33
+ SpreeCmCommissioner.redis_pool.with do |redis|
34
+ redis.set(key, inventory_item.quantity_available, ex: inventory_item.redis_expired_in)
35
+ end
36
+
37
+ inventory_item.quantity_available
38
+ end
39
+ end
40
+ end
41
+ end
@@ -0,0 +1,126 @@
1
+ module SpreeCmCommissioner
2
+ module RedisStock
3
+ class InventoryUpdater
4
+ class UnableToRestock < StandardError; end
5
+ class UnableToUnstock < StandardError; end
6
+
7
+ def initialize(line_item_ids)
8
+ @line_item_ids = line_item_ids
9
+ end
10
+
11
+ def unstock!
12
+ keys, quantities, inventory_ids = extract_inventory_data
13
+
14
+ raise UnableToUnstock, Spree.t(:insufficient_stock_lines_present) unless unstock(keys, quantities)
15
+
16
+ inventory_id_and_quantities = inventory_ids.map.with_index do |inventory_id, i|
17
+ { inventory_id: inventory_id, quantity: -quantities[i] }
18
+ end
19
+
20
+ schedule_sync_inventory(inventory_id_and_quantities)
21
+ end
22
+
23
+ def restock!
24
+ keys, quantities, inventory_ids = extract_inventory_data
25
+
26
+ raise UnableToRestock unless restock(keys, quantities)
27
+
28
+ inventory_id_and_quantities = inventory_ids.map.with_index do |inventory_id, i|
29
+ { inventory_id: inventory_id, quantity: quantities[i] }
30
+ end
31
+
32
+ schedule_sync_inventory(inventory_id_and_quantities)
33
+ end
34
+
35
+ private
36
+
37
+ # only unstock or restock when variants is available, track inventory, not backorderable & not need_confirmation.
38
+ # otherwise, we can ignore them.
39
+ def line_items
40
+ return @line_items if defined?(@line_items)
41
+
42
+ @line_items = Spree::LineItem.where(id: @line_item_ids).includes(variant: :stock_items)
43
+ @line_items = @line_items.map do |line_item|
44
+ next unless line_item.variant.available?
45
+ next unless line_item.variant.should_track_inventory?
46
+ next if line_item.variant.backorderable?
47
+ next if line_item.variant.need_confirmation?
48
+
49
+ line_item
50
+ end.compact
51
+ end
52
+
53
+ def unstock(keys, quantities)
54
+ SpreeCmCommissioner.redis_pool.with do |redis|
55
+ redis.eval(unstock_redis_script, keys: keys, argv: quantities)
56
+ end.positive?
57
+ end
58
+
59
+ def restock(keys, quantities)
60
+ SpreeCmCommissioner.redis_pool.with do |redis|
61
+ redis.eval(restock_redis_script, keys: keys, argv: quantities)
62
+ end.positive?
63
+ end
64
+
65
+ # Return: [CachedInventoryItem(...), CachedInventoryItem(...)]
66
+ def cached_inventory_items
67
+ @cached_inventory_items ||= SpreeCmCommissioner::RedisStock::LineItemsCachedInventoryItemsBuilder.new(line_item_ids: line_items.pluck(:id))
68
+ .call.values.flatten
69
+ end
70
+
71
+ def extract_inventory_data
72
+ keys = []
73
+ quantities = []
74
+ inventory_ids = []
75
+
76
+ cached_inventory_items.each do |cached_inventory_item|
77
+ keys << cached_inventory_item.inventory_key
78
+ quantities << line_items.find { |item| item.variant_id == cached_inventory_item.variant_id }.quantity
79
+ inventory_ids << cached_inventory_item.inventory_item_id
80
+ end
81
+
82
+ [keys, quantities, inventory_ids]
83
+ end
84
+
85
+ def unstock_redis_script
86
+ <<~LUA
87
+ local keys = KEYS
88
+ local quantities = ARGV
89
+
90
+ -- Check availability first
91
+ for i, key in ipairs(keys) do
92
+ local current = tonumber(redis.call('GET', key) or 0)
93
+ if current - tonumber(quantities[i]) < 0 then
94
+ return 0
95
+ end
96
+ end
97
+
98
+ -- Apply updates
99
+ for i, key in ipairs(keys) do
100
+ redis.call('DECRBY', key, tonumber(quantities[i]))
101
+ end
102
+
103
+ return 1
104
+ LUA
105
+ end
106
+
107
+ def restock_redis_script
108
+ <<~LUA
109
+ local keys = KEYS
110
+ local quantities = ARGV
111
+
112
+ -- Apply restock updates
113
+ for i, key in ipairs(keys) do
114
+ redis.call('INCRBY', key, tonumber(quantities[i]))
115
+ end
116
+
117
+ return 1
118
+ LUA
119
+ end
120
+
121
+ def schedule_sync_inventory(inventory_id_and_quantities)
122
+ SpreeCmCommissioner::InventoryItemSyncerJob.perform_later(inventory_id_and_quantities:)
123
+ end
124
+ end
125
+ end
126
+ end
@@ -0,0 +1,36 @@
1
+ module SpreeCmCommissioner
2
+ module RedisStock
3
+ class LineItemsCachedInventoryItemsBuilder
4
+ attr_reader :line_item_ids
5
+
6
+ def initialize(line_item_ids:)
7
+ @line_item_ids = line_item_ids
8
+ end
9
+
10
+ # return list of inventory items group by :line_item_id:
11
+ # {
12
+ # 1: [ CachedInventoryItem(...), CachedInventoryItem(...) ],
13
+ # 2: [ CachedInventoryItem(...), CachedInventoryItem(...) ],
14
+ # }
15
+ def call
16
+ cached_inventory_items.group_by do |cached_inventory_item|
17
+ line_item = line_items.find { |item| item.variant_id == cached_inventory_item.variant_id }
18
+ line_item.id
19
+ end
20
+ end
21
+
22
+ def cached_inventory_items
23
+ @cached_inventory_items ||= SpreeCmCommissioner::RedisStock::CachedInventoryItemsBuilder.new(inventory_items)
24
+ .call
25
+ end
26
+
27
+ def inventory_items
28
+ @inventory_items ||= line_items.flat_map(&:inventory_items)
29
+ end
30
+
31
+ def line_items
32
+ @line_items ||= Spree::LineItem.where(id: line_item_ids).includes(:inventory_items)
33
+ end
34
+ end
35
+ end
36
+ end
@@ -0,0 +1,25 @@
1
+ module SpreeCmCommissioner
2
+ module RedisStock
3
+ class VariantCachedInventoryItemsBuilder
4
+ attr_reader :variant_id, :dates
5
+
6
+ def initialize(variant_id:, dates: [])
7
+ @variant_id = variant_id
8
+ @dates = dates
9
+ end
10
+
11
+ # output: [ CachedInventoryItem(...), CachedInventoryItem(...) ]
12
+ def call
13
+ ::SpreeCmCommissioner::RedisStock::CachedInventoryItemsBuilder.new(inventory_items).call
14
+ end
15
+
16
+ def inventory_items
17
+ variant = Spree::Variant.find(variant_id)
18
+
19
+ inventory_items = variant.inventory_items
20
+ inventory_items = inventory_items.where(inventory_date: dates) if variant.permanent_stock?
21
+ inventory_items
22
+ end
23
+ end
24
+ end
25
+ end
@@ -0,0 +1,30 @@
1
+ module SpreeCmCommissioner
2
+ class ReservedBlock < Base
3
+ has_paper_trail
4
+
5
+ belongs_to :updated_by, optional: true, class_name: 'Spree::User'
6
+ belongs_to :guest, optional: true, class_name: 'SpreeCmCommissioner::Guest'
7
+ belongs_to :inventory_item, class_name: 'SpreeCmCommissioner::InventoryItem'
8
+ belongs_to :block, class_name: 'SpreeCmCommissioner::Block'
9
+
10
+ enum status: {
11
+ reserved: 0, # confirmed reservation
12
+ on_hold: 1, # temporary hold
13
+ canceled: 2
14
+ }
15
+
16
+ validates :status, presence: true
17
+ validates :expired_at, presence: true, if: -> { on_hold? }
18
+
19
+ scope :active_on_hold, -> { on_hold.where('expired_at IS NULL OR expired_at > ?', Time.current) }
20
+ scope :active, -> { where('expired_at IS NULL OR expired_at > ?', Time.current) }
21
+
22
+ def expired?
23
+ expired_at.present? && expired_at <= Time.current
24
+ end
25
+
26
+ def active_on_hold?
27
+ on_hold? && !expired?
28
+ end
29
+ end
30
+ end
@@ -0,0 +1,20 @@
1
+ module SpreeCmCommissioner
2
+ class SeatLayout < Base
3
+ has_many :seat_sections, class_name: 'SpreeCmCommissioner::SeatSection', dependent: :destroy
4
+
5
+ has_many :top_level_blocks, -> { where(seat_section_id: nil) }, class_name: 'SpreeCmCommissioner::Block', dependent: :destroy
6
+ has_many :section_blocks, -> { where.not(seat_section_id: nil) }, class_name: 'SpreeCmCommissioner::Block', dependent: :destroy
7
+
8
+ belongs_to :layoutable, polymorphic: true
9
+
10
+ enum status: {
11
+ inactive: 0,
12
+ active: 1,
13
+ archived: 2
14
+ }
15
+
16
+ validates :name, presence: true
17
+
18
+ accepts_nested_attributes_for :seat_sections, :top_level_blocks
19
+ end
20
+ end
@@ -0,0 +1,16 @@
1
+ module SpreeCmCommissioner
2
+ class SeatSection < Base
3
+ belongs_to :seat_layout, class_name: 'SpreeCmCommissioner::SeatLayout', optional: false
4
+
5
+ has_many :blocks, class_name: 'SpreeCmCommissioner::Block', dependent: :destroy
6
+
7
+ validates :name, presence: true
8
+ validates :width, presence: true, numericality: { greater_than: 0 }
9
+ validates :height, presence: true, numericality: { greater_than: 0 }
10
+ validates :x, presence: true, numericality: true
11
+ validates :y, presence: true, numericality: true
12
+ validates :rotation, presence: true, numericality: { greater_than_or_equal_to: -360, less_than_or_equal_to: 360 }
13
+
14
+ accepts_nested_attributes_for :blocks
15
+ end
16
+ end
@@ -0,0 +1,30 @@
1
+ module SpreeCmCommissioner
2
+ module Seats
3
+ class BlocksCanceler
4
+ def initialize(order_id:, cancel_by: nil)
5
+ @order_id = order_id
6
+ @cancel_by = cancel_by
7
+ end
8
+
9
+ # Cancels all reserved blocks associated with a given order.
10
+ #
11
+ # Typically used when:
12
+ # - The order is canceled.
13
+ # - The user abandons the order before completing checkout.
14
+ def cancel_blocks!
15
+ order = Spree::Order.find(@order_id)
16
+
17
+ ActiveRecord::Base.transaction do
18
+ order.reserved_blocks.each do |reserved_block|
19
+ reserved_block.assign_attributes(
20
+ status: :canceled,
21
+ expired_at: nil,
22
+ updated_by: @cancel_by
23
+ )
24
+ raise Errors::UnableToSaveReservedBlockRecord unless reserved_block.save
25
+ end
26
+ end
27
+ end
28
+ end
29
+ end
30
+ end
@@ -0,0 +1,53 @@
1
+ module SpreeCmCommissioner
2
+ module Seats
3
+ class BlocksHolder
4
+ HOLD_DURATION = 8.minutes
5
+
6
+ def initialize(line_item_ids:, hold_by: nil)
7
+ @line_item_ids = line_item_ids
8
+ @hold_by = hold_by
9
+ end
10
+
11
+ # Hold blocks for the given line items, preventing dublicate block selection.
12
+ #
13
+ # It ensures:
14
+ # - Raises an error if already reserved.
15
+ # - Raises an error if currently on_hold by someone else.
16
+ # - Allows re-locking if already on_hold by the same guest.
17
+ # - Otherwise, proceeds to lock the given blocks.
18
+ def hold_blocks!
19
+ line_items = Spree::LineItem.where(id: @line_item_ids).includes(:inventory_items, guests_with_blocks: :block)
20
+ guests_with_blocks = line_items.flat_map(&:guests_with_blocks).compact
21
+ inventory_items = line_items.flat_map(&:inventory_items).compact
22
+
23
+ ActiveRecord::Base.transaction do
24
+ guests_with_blocks.each do |guest|
25
+ inventory_items.each do |inventory_item|
26
+ hold_specific_block!(inventory_item, guest)
27
+ end
28
+ end
29
+ end
30
+ end
31
+
32
+ private
33
+
34
+ def hold_specific_block!(inventory_item, guest)
35
+ reserved_block = SpreeCmCommissioner::ReservedBlock.find_or_initialize_by(inventory_item: inventory_item, block: guest.block)
36
+
37
+ raise Errors::BlocksAreReservedByOtherGuest if reserved_block.reserved? && reserved_block.guest_id != guest.id
38
+ raise Errors::BlocksAreReservedBySameGuest if reserved_block.reserved? && reserved_block.guest_id == guest.id
39
+ raise Errors::BlocksAreOnHoldByOtherGuest if reserved_block.active_on_hold? && reserved_block.guest_id != guest.id
40
+
41
+ reserved_block.assign_attributes(
42
+ status: :on_hold,
43
+ guest: guest,
44
+ expired_at: HOLD_DURATION.from_now,
45
+ inventory_date: inventory_item.inventory_date,
46
+ updated_by: @hold_by
47
+ )
48
+
49
+ raise Errors::UnableToSaveReservedBlockRecord unless reserved_block.save
50
+ end
51
+ end
52
+ end
53
+ end
@@ -0,0 +1,49 @@
1
+ module SpreeCmCommissioner
2
+ module Seats
3
+ class BlocksReserver
4
+ def initialize(line_item_ids:, reserve_by: nil)
5
+ @line_item_ids = line_item_ids
6
+ @reserve_by = reserve_by
7
+ end
8
+
9
+ # Mark blocks as reserved for the given line items.
10
+ #
11
+ # It ensures:
12
+ # - Raises an error if already reserved by same guest or other guest.
13
+ # - Raises an error if currently on_hold by someone else.
14
+ # - Otherwise, proceeds to reserve the given blocks.
15
+ def reserve_blocks!
16
+ line_items = Spree::LineItem.where(id: @line_item_ids).includes(:inventory_items, guests_with_blocks: :block)
17
+ guests_with_blocks = line_items.flat_map(&:guests_with_blocks).compact
18
+ inventory_items = line_items.flat_map(&:inventory_items).compact
19
+
20
+ ActiveRecord::Base.transaction do
21
+ guests_with_blocks.each do |guest|
22
+ inventory_items.each do |inventory_item|
23
+ reserve_specific_block!(inventory_item, guest)
24
+ end
25
+ end
26
+ end
27
+ end
28
+
29
+ def reserve_specific_block!(inventory_item, guest)
30
+ reserved_block = SpreeCmCommissioner::ReservedBlock.find_or_initialize_by(inventory_item_id: inventory_item.id, block_id: guest.block_id)
31
+
32
+ raise Errors::BlocksAreReservedByOtherGuest if reserved_block.reserved? && reserved_block.guest_id != guest.id
33
+ raise Errors::BlocksAreReservedBySameGuest if reserved_block.reserved? && reserved_block.guest_id == guest.id
34
+ raise Errors::BlocksAreOnHoldByOtherGuest if reserved_block.active_on_hold? && reserved_block.guest_id != guest.id
35
+
36
+ # mark the block as reserved if not on_hold or lock by anyone but already expired
37
+ reserved_block.assign_attributes(
38
+ guest: guest,
39
+ status: :reserved,
40
+ expired_at: nil,
41
+ inventory_date: inventory_item.inventory_date,
42
+ updated_by: @reserve_by
43
+ )
44
+
45
+ raise Errors::UnableToSaveReservedBlockRecord unless reserved_block.save
46
+ end
47
+ end
48
+ end
49
+ end
@@ -0,0 +1,4 @@
1
+ module SpreeCmCommissioner
2
+ class Seats::Errors::BlocksAreOnHoldByOtherGuest < StandardError
3
+ end
4
+ end
@@ -0,0 +1,4 @@
1
+ module SpreeCmCommissioner
2
+ class Seats::Errors::BlocksAreReservedByOtherGuest < StandardError
3
+ end
4
+ end
@@ -0,0 +1,4 @@
1
+ module SpreeCmCommissioner
2
+ class Seats::Errors::BlocksAreReservedBySameGuest < StandardError
3
+ end
4
+ end
@@ -0,0 +1,4 @@
1
+ module SpreeCmCommissioner
2
+ class Seats::Errors::UnableToSaveReservedBlockRecord < StandardError
3
+ end
4
+ end
@@ -1,5 +1,3 @@
1
- require_dependency 'spree_cm_commissioner'
2
-
3
1
  module SpreeCmCommissioner
4
2
  class ServiceCalendar < SpreeCmCommissioner::Base
5
3
  # exception_rules = [
@@ -3,7 +3,6 @@ module SpreeCmCommissioner
3
3
  def self.prepended(base)
4
4
  base.whitelisted_ransackable_attributes |= %w[name abbr country_id]
5
5
  base.has_many :vendors, foreign_key: 'default_state_id', class_name: 'Spree::Vendor', inverse_of: :default_state, dependent: :nullify
6
- base.has_many :stops, class_name: 'SpreeCmCommissioner::Place'
7
6
 
8
7
  def update_total_inventory
9
8
  update(total_inventory: vendors.pluck(:total_inventory).compact.sum)