spree_cm_commissioner 2.0.0 → 2.0.1.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 (215) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/test_and_build_gem.yml +16 -2
  3. data/.gitignore +2 -1
  4. data/Gemfile.lock +32 -1
  5. data/Rakefile +33 -4
  6. data/app/assets/stylesheets/spree_cm_commissioner/backend/calendar.scss +8 -11
  7. data/app/controllers/spree/admin/inventory_items_controller.rb +83 -0
  8. data/app/controllers/spree/admin/stock_managements_controller.rb +63 -1
  9. data/app/controllers/spree/api/v2/organizer/invite_guests_controller.rb +1 -1
  10. data/app/controllers/spree/api/v2/storefront/accommodations/variants_controller.rb +42 -0
  11. data/app/controllers/spree/api/v2/storefront/accommodations_controller.rb +14 -31
  12. data/app/controllers/spree/api/v2/storefront/guests_controller.rb +13 -13
  13. data/app/controllers/spree/api/v2/storefront/queue_cart/line_items_controller.rb +2 -2
  14. data/app/factory/spree_cm_commissioner/invite_guest_claimed_telegram_message_factory.rb +81 -23
  15. data/app/finders/spree_cm_commissioner/accommodations/find.rb +37 -0
  16. data/app/finders/spree_cm_commissioner/accommodations/find_variant.rb +32 -0
  17. data/app/interactors/spree_cm_commissioner/create_ticket.rb +5 -6
  18. data/app/interactors/spree_cm_commissioner/ensure_correct_product_type.rb +40 -0
  19. data/app/interactors/spree_cm_commissioner/inventory_item_syncer.rb +25 -0
  20. data/app/interactors/spree_cm_commissioner/pin_code_sender.rb +1 -0
  21. data/app/interactors/spree_cm_commissioner/sms.rb +1 -1
  22. data/app/interactors/spree_cm_commissioner/stock/inventory_item_resetter.rb +44 -0
  23. data/app/interactors/spree_cm_commissioner/stock/inventory_items_adjuster.rb +13 -0
  24. data/app/interactors/spree_cm_commissioner/stock/inventory_items_generator.rb +15 -0
  25. data/app/interactors/spree_cm_commissioner/stock/permanent_inventory_items_generator.rb +75 -0
  26. data/app/interactors/spree_cm_commissioner/stock/stock_movement_creator.rb +32 -0
  27. data/app/interactors/spree_cm_commissioner/user_id_token_authenticator.rb +3 -7
  28. data/app/interactors/spree_cm_commissioner/user_id_token_checker.rb +3 -11
  29. data/app/interactors/spree_cm_commissioner/user_identity_checker.rb +6 -12
  30. data/app/interactors/spree_cm_commissioner/user_registration_with_id_token.rb +1 -7
  31. data/app/jobs/spree_cm_commissioner/application_job.rb +20 -0
  32. data/app/jobs/spree_cm_commissioner/application_unique_job.rb +20 -0
  33. data/app/jobs/spree_cm_commissioner/ensure_correct_product_type_job.rb +7 -0
  34. data/app/jobs/spree_cm_commissioner/inventory_item_syncer_job.rb +7 -0
  35. data/app/jobs/spree_cm_commissioner/sms_pin_code_job.rb +1 -1
  36. data/app/jobs/spree_cm_commissioner/stock/inventory_items_adjuster_job.rb +11 -0
  37. data/app/jobs/spree_cm_commissioner/stock/inventory_items_generator_job.rb +11 -0
  38. data/app/jobs/spree_cm_commissioner/stock/permanent_inventory_items_generator_job.rb +9 -0
  39. data/app/mailers/spree/order_mailer_decorator.rb +3 -18
  40. data/app/models/concerns/spree_cm_commissioner/line_item_durationable.rb +9 -15
  41. data/app/models/concerns/spree_cm_commissioner/option_type_attr_type.rb +1 -12
  42. data/app/models/concerns/spree_cm_commissioner/order_seatable.rb +44 -0
  43. data/app/models/concerns/spree_cm_commissioner/order_state_machine.rb +39 -0
  44. data/app/models/concerns/spree_cm_commissioner/product_delegation.rb +1 -3
  45. data/app/models/concerns/spree_cm_commissioner/product_type.rb +10 -0
  46. data/app/models/concerns/spree_cm_commissioner/taxon_kind.rb +1 -1
  47. data/app/models/concerns/spree_cm_commissioner/tenant_preference.rb +0 -1
  48. data/app/models/spree_cm_commissioner/block.rb +23 -0
  49. data/app/models/spree_cm_commissioner/dynamic_field.rb +0 -20
  50. data/app/models/spree_cm_commissioner/guest.rb +18 -56
  51. data/app/models/spree_cm_commissioner/guest_dynamic_field.rb +1 -41
  52. data/app/models/spree_cm_commissioner/inventory.rb +11 -0
  53. data/app/models/spree_cm_commissioner/inventory_item.rb +69 -0
  54. data/app/models/spree_cm_commissioner/line_item_decorator.rb +46 -78
  55. data/app/models/spree_cm_commissioner/notification_taxon.rb +1 -1
  56. data/app/models/spree_cm_commissioner/option_type_decorator.rb +1 -11
  57. data/app/models/spree_cm_commissioner/order_decorator.rb +30 -1
  58. data/app/models/spree_cm_commissioner/place.rb +1 -4
  59. data/app/models/spree_cm_commissioner/price_decorator.rb +9 -0
  60. data/app/models/spree_cm_commissioner/product_decorator.rb +10 -28
  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 -1
  83. data/app/models/spree_cm_commissioner/taxonomy_decorator.rb +0 -6
  84. data/app/models/spree_cm_commissioner/trip.rb +8 -10
  85. data/app/models/spree_cm_commissioner/trip_connection.rb +5 -5
  86. data/app/models/spree_cm_commissioner/trip_stop.rb +6 -25
  87. data/app/models/spree_cm_commissioner/user_identity_provider.rb +4 -26
  88. data/app/models/spree_cm_commissioner/variant_block.rb +9 -0
  89. data/app/models/spree_cm_commissioner/variant_decorator.rb +37 -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 +11 -17
  93. data/app/models/spree_cm_commissioner/vendor_place.rb +9 -3
  94. data/app/queries/spree_cm_commissioner/trip_query.rb +70 -44
  95. data/app/request_schemas/spree_cm_commissioner/accommodation_request_schema.rb +3 -0
  96. data/app/request_schemas/spree_cm_commissioner/application_request_schema.rb +1 -1
  97. data/app/request_schemas/spree_cm_commissioner/variant_request_schema.rb +19 -0
  98. data/app/serializers/spree/v2/storefront/accommodation_serializer.rb +2 -0
  99. data/app/serializers/spree/v2/storefront/line_item_serializer_decorator.rb +1 -0
  100. data/app/serializers/spree/v2/tenant/user_serializer.rb +0 -1
  101. data/app/serializers/spree_cm_commissioner/v2/storefront/dynamic_field_serializer.rb +1 -1
  102. data/app/services/spree_cm_commissioner/user_authenticator.rb +1 -1
  103. data/app/views/spree/admin/inventory_items/show.html.erb +72 -0
  104. data/app/views/spree/admin/stock_managements/_variant_stock_items.html.erb +7 -2
  105. data/app/views/spree/admin/stock_managements/calendar.html.erb +56 -0
  106. data/app/views/spree/admin/stock_managements/index.html.erb +55 -6
  107. data/app/views/spree/admin/tenant_vendors/index.html.erb +2 -9
  108. data/app/views/spree/admin/tenants/_form.html.erb +0 -9
  109. data/app/views/spree/admin/tenants/edit.html.erb +1 -2
  110. data/app/views/spree/admin/tenants/index.html.erb +1 -7
  111. data/app/views/spree/admin/vendors/_form.html.erb +0 -14
  112. data/app/views/spree/order_mailer/confirm_email.html.erb +16 -27
  113. data/app/views/spree_cm_commissioner/layouts/order_mailer.html.erb +1 -5
  114. data/app/views/spree_cm_commissioner/order_mailer/_mailer_stylesheets.html.erb +4 -41
  115. data/config/initializers/paper_trail.rb +1 -0
  116. data/config/initializers/spree_permitted_attributes.rb +5 -0
  117. data/config/locales/en.yml +1 -5
  118. data/config/routes.rb +21 -2
  119. data/db/migrate/20240202080634_update_counter_cache_of_vehicle_type.rb +3 -1
  120. data/db/migrate/20250304293518_create_cm_inventory_items.rb +21 -0
  121. data/db/migrate/20250429094228_add_lock_version_to_cm_inventory_items.rb +5 -0
  122. data/db/migrate/20250502025848_add_index_to_spree_products.rb +5 -0
  123. data/db/migrate/20250502030001_add_product_type_to_spree_variants.rb +5 -0
  124. data/db/migrate/20250502030002_add_product_type_to_spree_line_items.rb +5 -0
  125. data/db/migrate/20250603035256_add_inventory_item_to_spree_prices.rb +7 -0
  126. data/db/migrate/20250619073724_drop_table_cm_line_item_seats.rb +5 -0
  127. data/db/migrate/20250619073812_drop_table_cm_vehicle_seats.rb +5 -0
  128. data/db/migrate/20250619073844_drop_table_cm_vehicle_types.rb +9 -0
  129. data/db/migrate/20250619073957_drop_table_cm_option_value_vehicle_types.rb +5 -0
  130. data/db/migrate/20250619082354_remove_unnecessary_fields_from_cm_places.rb +9 -0
  131. data/db/migrate/20250619082736_remove_route_type_from_spree_products.rb +5 -0
  132. data/db/migrate/20250619083055_remove_unnecessary_fields_from_spree_taxons.rb +5 -0
  133. data/db/migrate/20250620083055_remove_variant_id_from_cm_trips.rb +5 -0
  134. data/db/migrate/20250620090000_update_cm_trip_connections_to_use_cm_trips.rb +6 -0
  135. data/db/migrate/20250620090001_create_cm_seat_layouts.rb +17 -0
  136. data/db/migrate/20250620090002_create_cm_seat_sections.rb +18 -0
  137. data/db/migrate/20250620090003_create_cm_blocks.rb +18 -0
  138. data/db/migrate/20250624091005_create_cm_reserved_blocks.rb +29 -0
  139. data/db/migrate/20250626083642_create_cm_variant_blocks.rb +24 -0
  140. data/db/migrate/20250627023314_add_block_id_to_cm_guests.rb +13 -0
  141. data/db/migrate/20250716022821_add_location_reference_to_cm_vendor_places.rb +5 -0
  142. data/db/migrate/20250716031743_drop_table_cm_vendor_stops.rb +5 -0
  143. data/db/migrate/20250717023824_add_vendor_reference_to_cm_trips.rb +5 -0
  144. data/db/migrate/20250717041414_add_location_place_reference_to_cm_trip_stops.rb +5 -0
  145. data/db/migrate/20250717042539_rename_cm_trip_stops_stop_id_column_to_stop_place_id.rb +7 -0
  146. data/db/migrate/20250717042707_rename_cm_trips_origin_and_destination_to_origin_place_and_destination_place.rb +11 -0
  147. data/docker-compose.yml +1 -1
  148. data/lib/cm_app_logger.rb +11 -4
  149. data/lib/generators/spree_cm_commissioner/install/install_generator.rb +14 -11
  150. data/lib/generators/spree_cm_commissioner/install/templates/app/javascript/{spree_cm_commissioner → spree_dashboard/spree_cm_commissioner}/utilities.js +4 -0
  151. data/lib/spree_cm_commissioner/cached_inventory_item.rb +23 -0
  152. data/lib/spree_cm_commissioner/calendar_event.rb +11 -1
  153. data/lib/spree_cm_commissioner/test_helper/factories/block_factory.rb +15 -0
  154. data/lib/spree_cm_commissioner/test_helper/factories/guest_factory.rb +10 -0
  155. data/lib/spree_cm_commissioner/test_helper/factories/homepage_section_relatable_factory.rb +1 -1
  156. data/lib/spree_cm_commissioner/test_helper/factories/inventory_item_factory.rb +9 -0
  157. data/lib/spree_cm_commissioner/test_helper/factories/line_item_factory.rb +1 -1
  158. data/lib/spree_cm_commissioner/test_helper/factories/option_type_factory.rb +6 -30
  159. data/lib/spree_cm_commissioner/test_helper/factories/order_factory.rb +0 -36
  160. data/lib/spree_cm_commissioner/test_helper/factories/product_factory.rb +18 -34
  161. data/lib/spree_cm_commissioner/test_helper/factories/reserved_block_factory.rb +27 -0
  162. data/lib/spree_cm_commissioner/test_helper/factories/seat_layout_factory.rb +11 -0
  163. data/lib/spree_cm_commissioner/test_helper/factories/seat_section_factory.rb +16 -0
  164. data/lib/spree_cm_commissioner/test_helper/factories/stock_location_factory.rb +2 -2
  165. data/lib/spree_cm_commissioner/test_helper/factories/trip_connection_factory.rb +6 -0
  166. data/lib/spree_cm_commissioner/test_helper/factories/trip_factory.rb +11 -3
  167. data/lib/spree_cm_commissioner/test_helper/factories/trip_stop_factory.rb +10 -0
  168. data/lib/spree_cm_commissioner/test_helper/factories/user_identity_provider_factory.rb +1 -1
  169. data/lib/spree_cm_commissioner/test_helper/factories/variant_block_factory.rb +7 -0
  170. data/lib/spree_cm_commissioner/test_helper/factories/variant_factory.rb +41 -19
  171. data/lib/spree_cm_commissioner/test_helper/factories/vehicle_factory.rb +1 -1
  172. data/lib/spree_cm_commissioner/test_helper/factories/vendor_factory.rb +6 -1
  173. data/lib/spree_cm_commissioner/test_helper/factories/vendor_place_factory.rb +13 -1
  174. data/lib/spree_cm_commissioner/trip_query_result.rb +8 -0
  175. data/lib/spree_cm_commissioner/trip_result.rb +5 -3
  176. data/lib/spree_cm_commissioner/version.rb +1 -1
  177. data/lib/spree_cm_commissioner.rb +35 -1
  178. data/lib/tasks/create_default_non_permanent_inventory_items.rake +16 -0
  179. data/lib/tasks/ensure_correct_product_type.rake +7 -0
  180. data/lib/tasks/generate_inventory_items.rake +7 -0
  181. data/spree_cm_commissioner.gemspec +7 -0
  182. metadata +141 -38
  183. data/app/assets/images/mailer/mail.png +0 -0
  184. data/app/assets/images/mailer/tenant_phone.png +0 -0
  185. data/app/assets/images/mailer/tenant_user.png +0 -0
  186. data/app/controllers/concerns/spree_cm_commissioner/transit/taxon_bitwise.rb +0 -44
  187. data/app/finders/spree_cm_commissioner/line_items/find_by_variant_decorator.rb +0 -20
  188. data/app/models/spree_cm_commissioner/branch.rb +0 -12
  189. data/app/models/spree_cm_commissioner/line_item_seat.rb +0 -10
  190. data/app/models/spree_cm_commissioner/option_value_vehicle_type.rb +0 -8
  191. data/app/models/spree_cm_commissioner/stop.rb +0 -23
  192. data/app/models/spree_cm_commissioner/vehicle_seat.rb +0 -11
  193. data/app/models/spree_cm_commissioner/vehicle_type.rb +0 -76
  194. data/app/models/spree_cm_commissioner/vendor_stop.rb +0 -10
  195. data/app/queries/spree_cm_commissioner/trip_search_query.rb +0 -76
  196. data/app/queries/spree_cm_commissioner/variant_availability/non_permanent_stock_query.rb +0 -45
  197. data/app/queries/spree_cm_commissioner/variant_availability/permanent_stock_query.rb +0 -55
  198. data/app/queries/spree_cm_commissioner/vendor_stop_place_query.rb +0 -54
  199. data/app/services/spree_cm_commissioner/vehicle_option_value_creator.rb +0 -11
  200. data/app/views/spree_cm_commissioner/order_mailer/tenant/_customer_info.html.erb +0 -42
  201. data/app/views/spree_cm_commissioner/order_mailer/tenant/_footer.html.erb +0 -25
  202. data/app/views/spree_cm_commissioner/order_mailer/tenant/_greeting.html.erb +0 -19
  203. data/app/views/spree_cm_commissioner/order_mailer/tenant/_support_contact.html.erb +0 -33
  204. data/db/migrate/20250709073455_add_email_fields_to_spree_vendors.rb +0 -6
  205. data/db/migrate/20250715103333_remove_indexes_from_cm_user_identity_providers.rb +0 -13
  206. data/db/migrate/20250718071620_add_data_fill_stage_to_dynamic_fields.rb +0 -5
  207. data/lib/spree_cm_commissioner/test_helper/factories/branch_factory.rb +0 -12
  208. data/lib/spree_cm_commissioner/test_helper/factories/departure_time_option_type_factory.rb +0 -8
  209. data/lib/spree_cm_commissioner/test_helper/factories/duration_option_type_factory.rb +0 -8
  210. data/lib/spree_cm_commissioner/test_helper/factories/line_item_seat_factory.rb +0 -7
  211. data/lib/spree_cm_commissioner/test_helper/factories/stop_factory.rb +0 -14
  212. data/lib/spree_cm_commissioner/test_helper/factories/transit_place_factory.rb +0 -8
  213. data/lib/spree_cm_commissioner/test_helper/factories/vehicle_option_type_factory.rb +0 -8
  214. data/lib/spree_cm_commissioner/test_helper/factories/vehicle_type_factory.rb +0 -96
  215. data/lib/spree_cm_commissioner/trip_seat_layout_result.rb +0 -11
@@ -0,0 +1,9 @@
1
+ class DropTableCmVehicleTypes < ActiveRecord::Migration[7.0]
2
+ def change
3
+ if column_exists?(:cm_vehicles, :vehicle_type_id)
4
+ remove_reference :cm_vehicles, :vehicle_type, foreign_key: { to_table: :cm_vehicle_types }
5
+ end
6
+
7
+ drop_table :cm_vehicle_types, if_exists: true
8
+ end
9
+ end
@@ -0,0 +1,5 @@
1
+ class DropTableCmOptionValueVehicleTypes < ActiveRecord::Migration[7.0]
2
+ def change
3
+ drop_table :cm_option_value_vehicle_types, if_exists: true
4
+ end
5
+ end
@@ -0,0 +1,9 @@
1
+ class RemoveUnnecessaryFieldsFromCmPlaces < ActiveRecord::Migration[7.0]
2
+ def change
3
+ # It is for single table inheritance (branch, stop)
4
+ # Remove it as we no longer need.
5
+ remove_column :cm_places, :type if column_exists?(:cm_places, :type)
6
+ remove_column :cm_places, :vendor_id if column_exists?(:cm_places, :vendor_id)
7
+ remove_column :cm_places, :branch_id if column_exists?(:cm_places, :branch_id)
8
+ end
9
+ end
@@ -0,0 +1,5 @@
1
+ class RemoveRouteTypeFromSpreeProducts < ActiveRecord::Migration[7.0]
2
+ def change
3
+ remove_column :spree_products, :route_type if column_exists?(:spree_products, :route_type)
4
+ end
5
+ end
@@ -0,0 +1,5 @@
1
+ class RemoveUnnecessaryFieldsFromSpreeTaxons < ActiveRecord::Migration[7.0]
2
+ def change
3
+ remove_column :spree_taxons, :data_type if column_exists?(:spree_taxons, :data_type)
4
+ end
5
+ end
@@ -0,0 +1,5 @@
1
+ class RemoveVariantIdFromCmTrips < ActiveRecord::Migration[7.0]
2
+ def change
3
+ remove_column :cm_trips, :variant_id if column_exists?(:cm_trips, :variant_id)
4
+ end
5
+ end
@@ -0,0 +1,6 @@
1
+ class UpdateCmTripConnectionsToUseCmTrips < ActiveRecord::Migration[7.0]
2
+ def change
3
+ remove_foreign_key :cm_trip_connections, column: :from_trip_id if foreign_key_exists?(:cm_trip_connections, column: :from_trip_id)
4
+ remove_foreign_key :cm_trip_connections, column: :to_trip_id if foreign_key_exists?(:cm_trip_connections, column: :to_trip_id)
5
+ end
6
+ end
@@ -0,0 +1,17 @@
1
+ class CreateCmSeatLayouts < ActiveRecord::Migration[7.0]
2
+ def change
3
+ create_table :cm_seat_layouts, if_not_exists: true do |t|
4
+ t.string :name
5
+ t.integer :total_seats
6
+ t.integer :total_sections
7
+ t.integer :status, default: 0
8
+
9
+ t.float :width
10
+ t.float :height
11
+
12
+ t.references :layoutable, polymorphic: true, index: true
13
+
14
+ t.timestamps
15
+ end
16
+ end
17
+ end
@@ -0,0 +1,18 @@
1
+ class CreateCmSeatSections < ActiveRecord::Migration[7.0]
2
+ def change
3
+ create_table :cm_seat_sections, if_not_exists: true do |t|
4
+ t.string :name
5
+ t.references :seat_layout, foreign_key: { to_table: :cm_seat_layouts }, null: false
6
+ t.integer :total_seats
7
+
8
+ t.float :width
9
+ t.float :height
10
+ t.float :x
11
+ t.float :y
12
+ t.float :rotation
13
+ t.string :shape_path
14
+
15
+ t.timestamps
16
+ end
17
+ end
18
+ end
@@ -0,0 +1,18 @@
1
+ class CreateCmBlocks < ActiveRecord::Migration[7.0]
2
+ def change
3
+ create_table :cm_blocks, if_not_exists: true do |t|
4
+ t.string :label
5
+
6
+ t.references :seat_layout, foreign_key: { to_table: :cm_seat_layouts }, null: false
7
+ t.references :seat_section, foreign_key: { to_table: :cm_seat_sections }, null: true
8
+
9
+ t.float :width
10
+ t.float :height
11
+ t.float :x
12
+ t.float :y
13
+ t.float :rotation
14
+
15
+ t.timestamps
16
+ end
17
+ end
18
+ end
@@ -0,0 +1,29 @@
1
+ class CreateCmReservedBlocks < ActiveRecord::Migration[7.0]
2
+ def up
3
+ create_table :cm_reserved_blocks, if_not_exists: true do |t|
4
+ t.references :updated_by, foreign_key: { to_table: :spree_users }, null: true
5
+ t.references :guest, foreign_key: { to_table: :cm_guests }, null: true
6
+ t.references :inventory_item, foreign_key: { to_table: :cm_inventory_items }, null: false
7
+ t.references :block, null: false, foreign_key: { to_table: :cm_blocks }
8
+
9
+ t.integer :status, null: false
10
+
11
+ t.datetime :inventory_date
12
+ t.datetime :expired_at
13
+
14
+ t.timestamps
15
+ end
16
+
17
+ unless index_exists?(:cm_reserved_blocks, [:block_id, :inventory_item_id], unique: true)
18
+ add_index :cm_reserved_blocks, [:block_id, :inventory_item_id], unique: true, name: 'index_reserved_blocks_on_block_and_inventory_item'
19
+ end
20
+ end
21
+
22
+ def down
23
+ if index_exists?(:cm_reserved_blocks, [:block_id, :inventory_item_id], name: 'index_reserved_blocks_on_block_and_inventory_item')
24
+ remove_index :cm_reserved_blocks, name: 'index_reserved_blocks_on_block_and_inventory_item'
25
+ end
26
+
27
+ drop_table :cm_reserved_blocks, if_exists: true
28
+ end
29
+ end
@@ -0,0 +1,24 @@
1
+
2
+ class CreateCmVariantBlocks < ActiveRecord::Migration[7.0]
3
+ def up
4
+ create_table :cm_variant_blocks, if_not_exists: true do |t|
5
+ t.references :variant, null: false, foreign_key: { to_table: :spree_variants }
6
+ t.references :trip, null: false, foreign_key: { to_table: :cm_trips }
7
+ t.references :block, null: false, foreign_key: { to_table: :cm_blocks }
8
+
9
+ t.timestamps
10
+ end
11
+
12
+ unless index_exists?(:cm_variant_blocks, [:variant_id, :trip_id, :block_id], unique: true, name: 'index_variant_blocks_on_variant_trip_block')
13
+ add_index :cm_variant_blocks, [:variant_id, :trip_id, :block_id], unique: true, name: 'index_variant_blocks_on_variant_trip_block'
14
+ end
15
+ end
16
+
17
+ def down
18
+ if index_exists?(:cm_variant_blocks, [:variant_id, :trip_id, :block_id], name: 'index_variant_blocks_on_variant_trip_block')
19
+ remove_index :cm_variant_blocks, name: 'index_variant_blocks_on_variant_trip_block'
20
+ end
21
+
22
+ drop_table :cm_variant_blocks, if_exists: true
23
+ end
24
+ end
@@ -0,0 +1,13 @@
1
+ class AddBlockIdToCmGuests < ActiveRecord::Migration[7.0]
2
+ def up
3
+ unless column_exists?(:cm_guests, :block_id)
4
+ add_reference :cm_guests, :block, foreign_key: { to_table: :cm_blocks }
5
+ end
6
+ end
7
+
8
+ def down
9
+ if column_exists?(:cm_guests, :block_id)
10
+ remove_column :cm_guests, :block_id
11
+ end
12
+ end
13
+ end
@@ -0,0 +1,5 @@
1
+ class AddLocationReferenceToCmVendorPlaces < ActiveRecord::Migration[7.0]
2
+ def change
3
+ add_reference :cm_vendor_places, :location, foreign_key: { to_table: :cm_vendor_places }, index: true, if_not_exists: true
4
+ end
5
+ end
@@ -0,0 +1,5 @@
1
+ class DropTableCmVendorStops < ActiveRecord::Migration[7.0]
2
+ def change
3
+ drop_table :cm_vendor_stops, if_exists: true
4
+ end
5
+ end
@@ -0,0 +1,5 @@
1
+ class AddVendorReferenceToCmTrips < ActiveRecord::Migration[7.0]
2
+ def change
3
+ add_reference :cm_trips, :vendor, foreign_key: { to_table: :spree_vendors }, index: true, if_not_exists: true
4
+ end
5
+ end
@@ -0,0 +1,5 @@
1
+ class AddLocationPlaceReferenceToCmTripStops < ActiveRecord::Migration[7.0]
2
+ def change
3
+ add_reference :cm_trip_stops, :location_place, foreign_key: { to_table: :cm_places }, index: true, if_not_exists: true
4
+ end
5
+ end
@@ -0,0 +1,7 @@
1
+ class RenameCmTripStopsStopIdColumnToStopPlaceId < ActiveRecord::Migration[7.0]
2
+ def change
3
+ if column_exists?(:cm_trip_stops, :stop_id)
4
+ rename_column :cm_trip_stops, :stop_id, :stop_place_id
5
+ end
6
+ end
7
+ end
@@ -0,0 +1,11 @@
1
+ class RenameCmTripsOriginAndDestinationToOriginPlaceAndDestinationPlace < ActiveRecord::Migration[7.0]
2
+ def change
3
+ if column_exists?(:cm_trips, :origin_id)
4
+ rename_column :cm_trips, :origin_id, :origin_place_id
5
+ end
6
+
7
+ if column_exists?(:cm_trips, :destination_id)
8
+ rename_column :cm_trips, :destination_id, :destination_place_id
9
+ end
10
+ end
11
+ end
data/docker-compose.yml CHANGED
@@ -20,7 +20,7 @@ services:
20
20
 
21
21
  volumes:
22
22
  - .:/gem
23
- - /gem/vendor/bundle
23
+ - ./vendor/bundle:/gem/vendor/bundle
24
24
 
25
25
  # depends_on:
26
26
  # - db
data/lib/cm_app_logger.rb CHANGED
@@ -1,11 +1,18 @@
1
1
  # lib/cm_app_logger.rb
2
2
  module CmAppLogger
3
3
  def self.log(label:, data: nil)
4
- message = {
5
- label: label,
6
- data: data
7
- }
4
+ message = { label: label, data: data }
5
+ start_time = Time.current
6
+ Rails.logger.info(message.to_json)
7
+
8
+ return unless block_given?
9
+
10
+ # Capture the block’s return value and return it to preserve existing behavior for callers expecting that value.
11
+ block_result = yield
8
12
 
13
+ message[:start_time] = start_time
14
+ message[:duration_ms] = (Time.current - start_time) * 1000
9
15
  Rails.logger.info(message.to_json)
16
+ block_result
10
17
  end
11
18
  end
@@ -11,14 +11,9 @@ module SpreeCmCommissioner
11
11
  end
12
12
 
13
13
  def add_migrations
14
- gems = %i[
15
- spree_multi_vendor
16
- spree_cm_commissioner
17
- ]
18
-
19
- gems.each do |gem|
20
- run "bundle exec rake railties:install:migrations FROM=#{gem}"
21
- end
14
+ run 'bundle exec rake railties:install:migrations FROM=spree_multi_vendor'
15
+ run 'bundle exec rake railties:install:migrations FROM=spree_cm_commissioner'
16
+ run 'bundle exec rails generate paper_trail:install'
22
17
  end
23
18
 
24
19
  def run_migrations
@@ -40,9 +35,17 @@ module SpreeCmCommissioner
40
35
  after: %r{//= require spree/backend}, verbose: true
41
36
 
42
37
  # For NPM support
43
- template 'app/javascript/spree_cm_commissioner/utilities.js'
44
- inject_into_file 'app/javascript/spree-dashboard.js', "\nimport \"./spree_cm_commissioner/utilities.js\"",
45
- after: %r{import "@spree/dashboard"}, verbose: true
38
+ if File.exist?(File.join(destination_root, 'app/javascript/spree_dashboard'))
39
+ template 'app/javascript/spree_dashboard/spree_cm_commissioner/utilities.js'
40
+ inject_into_file 'app/javascript/spree_dashboard/spree-dashboard.js', "\nimport \"./spree_cm_commissioner/utilities.js\"",
41
+ after: %r{import "@spree/dashboard"}, verbose: true
42
+ else
43
+ Logger.new($stdout).debug <<~MSG
44
+ SpreeCmCommissioner: JavaScript files for the dashboard are missing.
45
+ Please move your JavaScript files to the appropriate location in
46
+ app/javascript/spree_dashboard.
47
+ MSG
48
+ end
46
49
  end
47
50
 
48
51
  def install_telegram_web_bot
@@ -6,3 +6,7 @@ const $ = jquery;
6
6
  document.addEventListener("spree:load", function () {
7
7
  $('[data-toggle="popover"]').popover();
8
8
  });
9
+
10
+ document.documentElement.addEventListener("turbo:frame-load", (event) => {
11
+ $('[data-toggle="popover"]').popover();
12
+ });
@@ -0,0 +1,23 @@
1
+ module SpreeCmCommissioner
2
+ class CachedInventoryItem
3
+ attr_reader :inventory_key, :active, :quantity_available, :inventory_item_id, :variant_id
4
+
5
+ def initialize(inventory_key:, active:, quantity_available:, inventory_item_id:, variant_id:)
6
+ @inventory_key = inventory_key
7
+ @active = active
8
+ @quantity_available = quantity_available
9
+ @inventory_item_id = inventory_item_id
10
+ @variant_id = variant_id
11
+ end
12
+
13
+ def active?
14
+ active
15
+ end
16
+
17
+ def to_h
18
+ instance_variables.each_with_object({}) do |var, hash|
19
+ hash[var.to_s.delete('@').to_sym] = instance_variable_get(var)
20
+ end
21
+ end
22
+ end
23
+ end
@@ -2,7 +2,7 @@ module SpreeCmCommissioner
2
2
  class CalendarEvent
3
3
  attr_reader :from_date, :to_date, :title, :options
4
4
 
5
- def initialize(from_date:, to_date:, title:, options:)
5
+ def initialize(from_date:, to_date:, title: nil, options: nil)
6
6
  @from_date = from_date
7
7
  @to_date = to_date
8
8
  @title = title
@@ -23,5 +23,15 @@ module SpreeCmCommissioner
23
23
  )
24
24
  end
25
25
  end
26
+
27
+ def self.from_inventory_items(inventory_items)
28
+ inventory_items.map do |item|
29
+ CalendarEvent.new(
30
+ from_date: item.inventory_date,
31
+ to_date: item.inventory_date,
32
+ options: { inventory_item: item }
33
+ )
34
+ end
35
+ end
26
36
  end
27
37
  end
@@ -0,0 +1,15 @@
1
+ FactoryBot.define do
2
+ factory :cm_block, class: SpreeCmCommissioner::Block do
3
+ label { "Block #{rand(1.0..100.0)}" }
4
+
5
+ association :seat_section, factory: :cm_seat_section
6
+
7
+ width { rand(10.0..100.0) }
8
+ height { rand(10.0..100.0) }
9
+
10
+ x { rand(0.0..500.0) }
11
+ y { rand(0.0..500.0) }
12
+
13
+ rotation { rand(-180.0..180.0) }
14
+ end
15
+ end
@@ -1,4 +1,5 @@
1
1
  FactoryBot.define do
2
+ # use cm_guest instead for consistency
2
3
  factory :guest, class: SpreeCmCommissioner::Guest do
3
4
  line_item { |a| a.association(:line_item) }
4
5
  first_name { FFaker::Name.name }
@@ -7,4 +8,13 @@ FactoryBot.define do
7
8
  dob { '1986-03-28' }
8
9
  token { SecureRandom.hex(32) }
9
10
  end
11
+
12
+ factory :cm_guest, class: SpreeCmCommissioner::Guest do
13
+ line_item { |a| a.association(:line_item) }
14
+ first_name { FFaker::Name.name }
15
+ last_name { FFaker::Name.name }
16
+ gender { 1 }
17
+ dob { '1986-03-28' }
18
+ token { SecureRandom.hex(32) }
19
+ end
10
20
  end
@@ -17,7 +17,7 @@ FactoryBot.define do
17
17
  end
18
18
 
19
19
  factory :cm_product_homepage_section_relatable do
20
- relatable { create(:product) }
20
+ relatable { create(:cm_product) }
21
21
  end
22
22
 
23
23
  factory :cm_taxon_homepage_section_relatable do
@@ -0,0 +1,9 @@
1
+ FactoryBot.define do
2
+ factory :cm_inventory_item, class: SpreeCmCommissioner::InventoryItem do
3
+ variant { create(:cm_variant) }
4
+ max_capacity { 10 }
5
+ quantity_available { 10 }
6
+ product_type { 'accommodation' }
7
+ inventory_date { Date.today }
8
+ end
9
+ end
@@ -16,7 +16,7 @@ FactoryBot.define do
16
16
  variant { product.master }
17
17
 
18
18
  factory :cm_need_confirmation_line_item do
19
- product { create(:product, need_confirmation: true) }
19
+ product { create(:cm_product, need_confirmation: true) }
20
20
  end
21
21
 
22
22
  factory :cm_kyc_line_item do
@@ -9,6 +9,12 @@ FactoryBot.define do
9
9
  presentation { 'location' }
10
10
  end
11
11
 
12
+ trait :vehicle do
13
+ attr_type { :string }
14
+ name { 'vehicle' }
15
+ presentation { 'vehicle' }
16
+ end
17
+
12
18
  trait :start_date do
13
19
  attr_type { :date }
14
20
  name { 'start-date' }
@@ -147,36 +153,6 @@ FactoryBot.define do
147
153
  presentation { 'seat-number-positions' }
148
154
  end
149
155
 
150
- trait :origin do
151
- attr_type { :origin }
152
- name { 'origin' }
153
- presentation { 'origin' }
154
- end
155
-
156
- trait :destination do
157
- attr_type { :destination }
158
- name { 'destination' }
159
- presentation { 'destination' }
160
- end
161
-
162
- trait :departure_time do
163
- attr_type { :time }
164
- name { 'departure-time' }
165
- presentation { 'departure-time' }
166
- end
167
-
168
- trait :vehicle do
169
- attr_type { :vehicle_id }
170
- name { 'vehicle' }
171
- presentation { 'vehicle' }
172
- end
173
-
174
- trait :allow_seat_selection do
175
- attr_type { :boolean }
176
- name { 'allow-seat-selection' }
177
- presentation { 'allow-seat-selection' }
178
- end
179
-
180
156
  initialize_with { Spree::OptionType.where(name: name).first_or_initialize }
181
157
  end
182
158
  end
@@ -1,38 +1,2 @@
1
1
  FactoryBot.define do
2
- factory :transit_order, class: Spree::Order do
3
- bill_address
4
- ship_address
5
- state {'complete'}
6
- payment_state {'paid'}
7
-
8
- transient do
9
- line_items_count { 1 }
10
- shipment_cost { 100 }
11
- shipping_method_filter { Spree::ShippingMethod::DISPLAY_ON_FRONT_END }
12
- seats {}
13
- variant {}
14
- quantity {}
15
- date { Date.today }
16
- selected_seats {[]}
17
- line_item_seats_attributes{[]}
18
- end
19
-
20
- after(:create) do |order, evaluator|
21
- if evaluator.quantity.nil? && evaluator.seats.present?
22
- @line_item_seats_attributes = evaluator.seats.map do |seat|
23
- {seat_id: seat.id, date: evaluator.date, variant_id: evaluator.variant.id}
24
- end
25
- create(:line_item, order: order, variant: evaluator.variant, date: evaluator.date, line_item_seats_attributes: @line_item_seats_attributes)
26
- order.line_items.reload
27
- else
28
- create(:line_item, order: order, variant: evaluator.variant, date: evaluator.date, quantity: evaluator.quantity)
29
- end
30
-
31
- stock_location = order.line_items&.first&.variant&.stock_items&.first&.stock_location || create(:stock_location)
32
- create(:shipment, order: order, cost: evaluator.shipment_cost, stock_location: stock_location)
33
- order.shipments.reload
34
-
35
- order.update_with_updater!
36
- end
37
- end
38
2
  end
@@ -1,6 +1,19 @@
1
1
  FactoryBot.define do
2
- factory :cm_product, parent: :base_product do
2
+ factory :cm_product_in_stock, parent: :product_in_stock do
3
+ product_type { :ecommerce }
4
+ end
5
+
6
+ factory :cm_product_with_option_types, parent: :product_with_option_types do
7
+ product_type { :ecommerce }
8
+ end
9
+
10
+ factory :cm_base_product, parent: :base_product do
11
+ product_type { :ecommerce }
12
+ end
13
+
14
+ factory :cm_product, parent: :product do
3
15
  vendor { Spree::Vendor.first || create(:cm_vendor) }
16
+ product_type { :ecommerce }
4
17
 
5
18
  before(:create) do |product|
6
19
  create(:stock_location) unless Spree::StockLocation.any?
@@ -33,35 +46,6 @@ FactoryBot.define do
33
46
  end
34
47
  end
35
48
 
36
- factory :route do
37
- route_type {:automobile}
38
- product_type { :transit }
39
- before(:create) do |route, evaluator|
40
- create(:stock_location) unless Spree::StockLocation.any?
41
- if route.stores.empty?
42
- default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
43
- store = default_store || create(:store)
44
-
45
- route.stores << [store]
46
- end
47
- end
48
- after(:create) do |route, evaluator|
49
- trip = route.master
50
- trip.permanent_stock = 10
51
- trip.stock_items = [create(:stock_item, variant: trip, stock_location: route.vendor.stock_locations.first)]
52
- trip.stock_items.first.adjust_count_on_hand(10)
53
-
54
- # option types
55
- route.option_types << create(:cm_option_type, :origin)
56
- route.option_types << create(:cm_option_type, :destination)
57
- route.option_types << create(:cm_option_type, :departure_time)
58
- route.option_types << create(:cm_option_type, :duration_in_hours)
59
- route.option_types << create(:cm_option_type, :duration_in_minutes)
60
- route.option_types << create(:cm_option_type, :allow_seat_selection)
61
- route.option_types << create(:cm_option_type, :vehicle)
62
- end
63
- end
64
-
65
49
  factory :cm_subscribable_product do
66
50
  option_types { [
67
51
  create(:cm_option_type, :month),
@@ -85,7 +69,7 @@ FactoryBot.define do
85
69
  option_value2 = create(:cm_option_value, presentation: "#{evaluator.due_date} Days", name: evaluator.due_date.to_s, option_type: product.option_types[1])
86
70
  option_value3 = create(:cm_option_value, presentation: "#{evaluator.payment_option}", name: evaluator.payment_option.to_s, option_type: product.option_types[2])
87
71
 
88
- variant = create(:variant, price: product.price, product: product)
72
+ variant = create(:cm_variant, price: product.price, product: product)
89
73
  variant.option_values = [option_value1, option_value2, option_value3]
90
74
  variant.save!
91
75
 
@@ -103,7 +87,7 @@ FactoryBot.define do
103
87
  end
104
88
 
105
89
  after(:create) do |product, evaluator|
106
- variant = create(:variant, price: product.price, product: product)
90
+ variant = create(:cm_variant, price: product.price, product: product)
107
91
  variant.save!
108
92
 
109
93
  variant.stock_items.first.adjust_count_on_hand(evaluator.total_inventory)
@@ -136,12 +120,12 @@ FactoryBot.define do
136
120
  create(:cm_option_value, presentation: 'Yes', name: '1', option_type: product.option_types.find_by(name: 'bib-pre-generation-on-create'))
137
121
  end
138
122
 
139
- variant1 = create(:variant, price: product.price, product: product)
123
+ variant1 = create(:cm_variant, price: product.price, product: product)
140
124
  variant1.option_values = [option_value1]
141
125
  variant1.option_values << bib_pre_generation_option_value if evaluator.bib_pre_generation_on_create
142
126
  variant1.save!
143
127
 
144
- variant2 = create(:variant, price: product.price, product: product)
128
+ variant2 = create(:cm_variant, price: product.price, product: product)
145
129
  variant2.option_values = [option_value2]
146
130
  variant2.option_values << bib_pre_generation_option_value if evaluator.bib_pre_generation_on_create
147
131
  variant2.save!
@@ -0,0 +1,27 @@
1
+ FactoryBot.define do
2
+ factory :cm_reserved_block, class: SpreeCmCommissioner::ReservedBlock do
3
+ association :inventory_item, factory: :cm_inventory_item
4
+ association :block, factory: :cm_block
5
+ association :guest, factory: :guest
6
+ association :updated_by, factory: :user
7
+
8
+ status { :on_hold } # or :reserved, :canceled based on enum
9
+ inventory_date { Time.current }
10
+ expired_at { 10.minutes.from_now }
11
+
12
+ trait :reserved do
13
+ status { :reserved }
14
+ expired_at { nil }
15
+ end
16
+
17
+ trait :on_hold do
18
+ status { :on_hold }
19
+ expired_at { 8.minutes.from_now }
20
+ end
21
+
22
+ trait :canceled do
23
+ status { :canceled }
24
+ expired_at { nil }
25
+ end
26
+ end
27
+ end
@@ -0,0 +1,11 @@
1
+ FactoryBot.define do
2
+ factory :cm_seat_layout, class: SpreeCmCommissioner::SeatLayout do
3
+ association :layoutable, factory: :cm_vehicle
4
+
5
+ name { "Layout #{rand(1.0..50.0)}" }
6
+ status { :active }
7
+
8
+ width { rand(200.0..1000.0) }
9
+ height { rand(200.0..1000.0) }
10
+ end
11
+ end