spree_cm_commissioner 2.0.3.pre.pre5 → 2.0.3.pre.pre.pre7

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 +2 -16
  3. data/.gitignore +1 -2
  4. data/Gemfile.lock +4 -39
  5. data/Rakefile +4 -33
  6. data/app/assets/stylesheets/spree_cm_commissioner/backend/calendar.scss +11 -8
  7. data/app/controllers/concerns/spree_cm_commissioner/transit/taxon_bitwise.rb +44 -0
  8. data/app/controllers/spree/admin/stock_managements_controller.rb +1 -63
  9. data/app/controllers/spree/api/v2/operator/event_charts_controller.rb +2 -8
  10. data/app/controllers/spree/api/v2/storefront/accommodations_controller.rb +31 -14
  11. data/app/controllers/spree/api/v2/storefront/dynamic_fields_controller.rb +42 -0
  12. data/app/controllers/spree/api/v2/storefront/guests_controller.rb +2 -0
  13. data/app/controllers/spree/api/v2/storefront/queue_cart/line_items_controller.rb +2 -2
  14. data/app/controllers/spree_cm_commissioner/admin/products_controller_decorator.rb +14 -0
  15. data/app/finders/spree_cm_commissioner/line_items/find_by_variant_decorator.rb +20 -0
  16. data/app/interactors/spree_cm_commissioner/create_vendor.rb +11 -1
  17. data/app/jobs/spree_cm_commissioner/application_job.rb +0 -20
  18. data/app/jobs/spree_cm_commissioner/application_unique_job.rb +0 -20
  19. data/app/models/concerns/spree_cm_commissioner/line_item_durationable.rb +15 -18
  20. data/app/models/concerns/spree_cm_commissioner/line_item_guests_concern.rb +15 -29
  21. data/app/models/concerns/spree_cm_commissioner/option_type_attr_type.rb +12 -2
  22. data/app/models/concerns/spree_cm_commissioner/order_state_machine.rb +0 -39
  23. data/app/models/concerns/spree_cm_commissioner/product_delegation.rb +3 -1
  24. data/app/models/concerns/spree_cm_commissioner/product_type.rb +0 -10
  25. data/app/models/concerns/spree_cm_commissioner/route_type.rb +1 -1
  26. data/app/models/concerns/spree_cm_commissioner/taxon_kind.rb +1 -1
  27. data/app/models/spree_cm_commissioner/address_decorator.rb +2 -22
  28. data/app/models/spree_cm_commissioner/branch.rb +12 -0
  29. data/app/models/spree_cm_commissioner/guest.rb +85 -71
  30. data/app/models/spree_cm_commissioner/guest_dynamic_field.rb +37 -27
  31. data/app/models/spree_cm_commissioner/line_item_decorator.rb +78 -47
  32. data/app/models/spree_cm_commissioner/line_item_seat.rb +10 -0
  33. data/app/models/spree_cm_commissioner/notification_taxon.rb +1 -1
  34. data/app/models/spree_cm_commissioner/option_type_decorator.rb +11 -1
  35. data/app/models/spree_cm_commissioner/option_value_vehicle_type.rb +8 -0
  36. data/app/models/spree_cm_commissioner/order_decorator.rb +1 -31
  37. data/app/models/spree_cm_commissioner/place.rb +4 -1
  38. data/app/models/spree_cm_commissioner/product_decorator.rb +35 -10
  39. data/app/models/spree_cm_commissioner/service_calendar.rb +2 -0
  40. data/app/models/spree_cm_commissioner/state_decorator.rb +1 -0
  41. data/app/models/spree_cm_commissioner/stock/availability_checker.rb +25 -26
  42. data/app/models/spree_cm_commissioner/stock/availability_validator_decorator.rb +1 -2
  43. data/app/models/spree_cm_commissioner/stock/line_item_availability_checker.rb +3 -3
  44. data/app/models/spree_cm_commissioner/stock_item_decorator.rb +0 -17
  45. data/app/models/spree_cm_commissioner/stop.rb +23 -0
  46. data/app/models/spree_cm_commissioner/taxon_decorator.rb +1 -0
  47. data/app/models/spree_cm_commissioner/taxonomy_decorator.rb +6 -0
  48. data/app/models/spree_cm_commissioner/trip.rb +10 -17
  49. data/app/models/spree_cm_commissioner/trip_connection.rb +5 -5
  50. data/app/models/spree_cm_commissioner/trip_stop.rb +21 -10
  51. data/app/models/spree_cm_commissioner/user_decorator.rb +1 -1
  52. data/app/models/spree_cm_commissioner/variant_decorator.rb +47 -37
  53. data/app/models/spree_cm_commissioner/variant_options.rb +23 -0
  54. data/app/models/spree_cm_commissioner/vehicle.rb +16 -11
  55. data/app/models/spree_cm_commissioner/vehicle_seat.rb +11 -0
  56. data/app/models/spree_cm_commissioner/vehicle_type.rb +76 -0
  57. data/app/models/spree_cm_commissioner/vendor_decorator.rb +14 -11
  58. data/app/models/spree_cm_commissioner/vendor_place.rb +3 -13
  59. data/app/models/spree_cm_commissioner/vendor_stop.rb +10 -0
  60. data/app/overrides/spree/admin/products/_form/industry_taxons.html.erb.deface +26 -0
  61. data/app/overrides/spree/admin/products/_form/taxons.html.erb.deface +26 -0
  62. data/app/queries/spree_cm_commissioner/trip_query.rb +131 -110
  63. data/app/queries/spree_cm_commissioner/trip_search_query.rb +76 -0
  64. data/app/queries/spree_cm_commissioner/variant_availability/non_permanent_stock_query.rb +45 -0
  65. data/app/queries/spree_cm_commissioner/variant_availability/permanent_stock_query.rb +55 -0
  66. data/app/queries/spree_cm_commissioner/vendor_stop_place_query.rb +54 -0
  67. data/app/request_schemas/spree_cm_commissioner/accommodation_request_schema.rb +0 -3
  68. data/app/request_schemas/spree_cm_commissioner/application_request_schema.rb +1 -1
  69. data/app/serializers/spree/v2/storefront/accommodation_serializer.rb +0 -2
  70. data/app/serializers/spree/v2/storefront/line_item_serializer_decorator.rb +0 -1
  71. data/app/serializers/spree/v2/storefront/product_serializer_decorator.rb +2 -0
  72. data/app/serializers/spree_cm_commissioner/v2/storefront/guest_serializer.rb +1 -3
  73. data/app/services/spree_cm_commissioner/vehicle_option_value_creator.rb +11 -0
  74. data/app/views/spree/admin/stock_managements/_variant_stock_items.html.erb +2 -7
  75. data/app/views/spree/admin/stock_managements/index.html.erb +6 -55
  76. data/config/initializers/spree_permitted_attributes.rb +0 -5
  77. data/config/routes.rb +3 -24
  78. data/db/migrate/20240202080634_update_counter_cache_of_vehicle_type.rb +1 -3
  79. data/db/migrate/20250812015522_remove_unique_indexes_from_cm_user_identity_providers.rb +8 -0
  80. data/db/migrate/20250812121745_add_data_fill_stage_phase_to_cm_guests.rb +5 -0
  81. data/db/migrate/20250814073854_add_call_to_action_to_spree_products.rb +5 -0
  82. data/docker-compose.yml +1 -1
  83. data/lib/cm_app_logger.rb +4 -11
  84. data/lib/generators/spree_cm_commissioner/install/install_generator.rb +11 -14
  85. data/lib/generators/spree_cm_commissioner/install/templates/app/javascript/{spree_dashboard/spree_cm_commissioner → spree_cm_commissioner}/utilities.js +0 -4
  86. data/lib/spree_cm_commissioner/calendar_event.rb +1 -11
  87. data/lib/spree_cm_commissioner/test_helper/factories/branch_factory.rb +12 -0
  88. data/lib/spree_cm_commissioner/test_helper/factories/departure_time_option_type_factory.rb +8 -0
  89. data/lib/spree_cm_commissioner/test_helper/factories/duration_option_type_factory.rb +8 -0
  90. data/lib/spree_cm_commissioner/test_helper/factories/guest_factory.rb +0 -10
  91. data/lib/spree_cm_commissioner/test_helper/factories/homepage_section_relatable_factory.rb +1 -1
  92. data/lib/spree_cm_commissioner/test_helper/factories/line_item_factory.rb +1 -1
  93. data/lib/spree_cm_commissioner/test_helper/factories/line_item_seat_factory.rb +7 -0
  94. data/lib/spree_cm_commissioner/test_helper/factories/option_type_factory.rb +30 -6
  95. data/lib/spree_cm_commissioner/test_helper/factories/order_factory.rb +36 -0
  96. data/lib/spree_cm_commissioner/test_helper/factories/product_factory.rb +34 -18
  97. data/lib/spree_cm_commissioner/test_helper/factories/stock_location_factory.rb +2 -2
  98. data/lib/spree_cm_commissioner/test_helper/factories/stop_factory.rb +14 -0
  99. data/lib/spree_cm_commissioner/test_helper/factories/transit_place_factory.rb +8 -0
  100. data/lib/spree_cm_commissioner/test_helper/factories/trip_factory.rb +3 -11
  101. data/lib/spree_cm_commissioner/test_helper/factories/variant_factory.rb +19 -41
  102. data/lib/spree_cm_commissioner/test_helper/factories/vehicle_factory.rb +1 -1
  103. data/lib/spree_cm_commissioner/test_helper/factories/vehicle_option_type_factory.rb +8 -0
  104. data/lib/spree_cm_commissioner/test_helper/factories/vehicle_type_factory.rb +96 -0
  105. data/lib/spree_cm_commissioner/test_helper/factories/vendor_factory.rb +1 -6
  106. data/lib/spree_cm_commissioner/test_helper/factories/vendor_place_factory.rb +1 -13
  107. data/lib/spree_cm_commissioner/trip_query_result.rb +0 -16
  108. data/lib/spree_cm_commissioner/trip_result.rb +10 -12
  109. data/lib/spree_cm_commissioner/trip_seat_layout_result.rb +11 -0
  110. data/lib/spree_cm_commissioner/version.rb +1 -1
  111. data/lib/spree_cm_commissioner.rb +1 -37
  112. data/spree_cm_commissioner.gemspec +0 -7
  113. metadata +32 -161
  114. data/app/controllers/spree/admin/inventory_items_controller.rb +0 -83
  115. data/app/controllers/spree/api/v2/storefront/accommodations/variants_controller.rb +0 -42
  116. data/app/controllers/spree/api/v2/storefront/trip_search_controller.rb +0 -60
  117. data/app/finders/spree_cm_commissioner/accommodations/find.rb +0 -37
  118. data/app/finders/spree_cm_commissioner/accommodations/find_variant.rb +0 -32
  119. data/app/interactors/spree_cm_commissioner/ensure_correct_product_type.rb +0 -40
  120. data/app/interactors/spree_cm_commissioner/inventory_item_syncer.rb +0 -25
  121. data/app/interactors/spree_cm_commissioner/stock/inventory_item_resetter.rb +0 -44
  122. data/app/interactors/spree_cm_commissioner/stock/inventory_items_adjuster.rb +0 -13
  123. data/app/interactors/spree_cm_commissioner/stock/inventory_items_generator.rb +0 -15
  124. data/app/interactors/spree_cm_commissioner/stock/permanent_inventory_items_generator.rb +0 -75
  125. data/app/interactors/spree_cm_commissioner/stock/stock_movement_creator.rb +0 -32
  126. data/app/interactors/spree_cm_commissioner/taxi_trip_creator.rb +0 -66
  127. data/app/interactors/spree_cm_commissioner/transit/draft_order_creator.rb +0 -119
  128. data/app/interactors/spree_cm_commissioner/variant_block_updater.rb +0 -62
  129. data/app/interactors/spree_cm_commissioner/vehicle_updater.rb +0 -41
  130. data/app/jobs/spree_cm_commissioner/ensure_correct_product_type_job.rb +0 -7
  131. data/app/jobs/spree_cm_commissioner/inventory_item_syncer_job.rb +0 -7
  132. data/app/jobs/spree_cm_commissioner/stock/inventory_items_adjuster_job.rb +0 -11
  133. data/app/jobs/spree_cm_commissioner/stock/inventory_items_generator_job.rb +0 -11
  134. data/app/jobs/spree_cm_commissioner/stock/permanent_inventory_items_generator_job.rb +0 -9
  135. data/app/models/concerns/spree_cm_commissioner/line_item_transitable.rb +0 -89
  136. data/app/models/concerns/spree_cm_commissioner/order_seatable.rb +0 -44
  137. data/app/models/concerns/spree_cm_commissioner/vehicle_type.rb +0 -11
  138. data/app/models/spree_cm_commissioner/block.rb +0 -43
  139. data/app/models/spree_cm_commissioner/inventory.rb +0 -11
  140. data/app/models/spree_cm_commissioner/inventory_item.rb +0 -69
  141. data/app/models/spree_cm_commissioner/price_decorator.rb +0 -9
  142. data/app/models/spree_cm_commissioner/redis_stock/cached_inventory_items_builder.rb +0 -41
  143. data/app/models/spree_cm_commissioner/redis_stock/inventory_updater.rb +0 -126
  144. data/app/models/spree_cm_commissioner/redis_stock/line_items_cached_inventory_items_builder.rb +0 -36
  145. data/app/models/spree_cm_commissioner/redis_stock/variant_cached_inventory_items_builder.rb +0 -25
  146. data/app/models/spree_cm_commissioner/reserved_block.rb +0 -30
  147. data/app/models/spree_cm_commissioner/saved_guest.rb +0 -13
  148. data/app/models/spree_cm_commissioner/seat_layout.rb +0 -20
  149. data/app/models/spree_cm_commissioner/seat_section.rb +0 -16
  150. data/app/models/spree_cm_commissioner/seats/blocks_canceler.rb +0 -30
  151. data/app/models/spree_cm_commissioner/seats/blocks_holder.rb +0 -53
  152. data/app/models/spree_cm_commissioner/seats/blocks_reserver.rb +0 -49
  153. data/app/models/spree_cm_commissioner/seats/errors/blocks_are_on_hold_by_other_guest.rb +0 -4
  154. data/app/models/spree_cm_commissioner/seats/errors/blocks_are_reserved_by_other_guest.rb +0 -4
  155. data/app/models/spree_cm_commissioner/seats/errors/blocks_are_reserved_by_same_guest.rb +0 -4
  156. data/app/models/spree_cm_commissioner/seats/errors/unable_to_save_reserved_block_record.rb +0 -4
  157. data/app/models/spree_cm_commissioner/stock/order_availability_checker.rb +0 -44
  158. data/app/models/spree_cm_commissioner/variant_block.rb +0 -17
  159. data/app/request_schemas/spree_cm_commissioner/trip_search_request_schema.rb +0 -20
  160. data/app/request_schemas/spree_cm_commissioner/variant_request_schema.rb +0 -19
  161. data/app/serializers/spree/v2/storefront/amenity_serializer.rb +0 -15
  162. data/app/serializers/spree/v2/storefront/trip_query_result_serializer.rb +0 -14
  163. data/app/serializers/spree/v2/storefront/trip_result_serializer.rb +0 -16
  164. data/app/serializers/spree/v2/storefront/trip_vehicle_serializer.rb +0 -11
  165. data/app/serializers/spree/v2/storefront/trip_vendor_serializer.rb +0 -13
  166. data/app/views/spree/admin/inventory_items/show.html.erb +0 -72
  167. data/app/views/spree/admin/stock_managements/calendar.html.erb +0 -56
  168. data/config/initializers/paper_trail.rb +0 -1
  169. data/db/migrate/20250122000000_move_route_type_from_vehicles_to_trips.rb +0 -7
  170. data/db/migrate/20250304293518_create_cm_inventory_items.rb +0 -21
  171. data/db/migrate/20250429094228_add_lock_version_to_cm_inventory_items.rb +0 -5
  172. data/db/migrate/20250502025848_add_index_to_spree_products.rb +0 -5
  173. data/db/migrate/20250502030001_add_product_type_to_spree_variants.rb +0 -5
  174. data/db/migrate/20250502030002_add_product_type_to_spree_line_items.rb +0 -5
  175. data/db/migrate/20250603035256_add_inventory_item_to_spree_prices.rb +0 -7
  176. data/db/migrate/20250619073724_drop_table_cm_line_item_seats.rb +0 -5
  177. data/db/migrate/20250619073812_drop_table_cm_vehicle_seats.rb +0 -5
  178. data/db/migrate/20250619073844_drop_table_cm_vehicle_types.rb +0 -9
  179. data/db/migrate/20250619073957_drop_table_cm_option_value_vehicle_types.rb +0 -5
  180. data/db/migrate/20250619082354_remove_unnecessary_fields_from_cm_places.rb +0 -9
  181. data/db/migrate/20250619082736_remove_route_type_from_spree_products.rb +0 -5
  182. data/db/migrate/20250619083055_remove_unnecessary_fields_from_spree_taxons.rb +0 -5
  183. data/db/migrate/20250620083055_remove_variant_id_from_cm_trips.rb +0 -5
  184. data/db/migrate/20250620090000_update_cm_trip_connections_to_use_cm_trips.rb +0 -6
  185. data/db/migrate/20250620090001_create_cm_seat_layouts.rb +0 -17
  186. data/db/migrate/20250620090002_create_cm_seat_sections.rb +0 -18
  187. data/db/migrate/20250620090003_create_cm_blocks.rb +0 -18
  188. data/db/migrate/20250624091005_create_cm_reserved_blocks.rb +0 -29
  189. data/db/migrate/20250626083642_create_cm_variant_blocks.rb +0 -24
  190. data/db/migrate/20250627023314_add_block_id_to_cm_guests.rb +0 -13
  191. data/db/migrate/20250716022821_add_location_reference_to_cm_vendor_places.rb +0 -5
  192. data/db/migrate/20250716031743_drop_table_cm_vendor_stops.rb +0 -5
  193. data/db/migrate/20250717023824_add_vendor_reference_to_cm_trips.rb +0 -5
  194. data/db/migrate/20250717041414_add_location_place_reference_to_cm_trip_stops.rb +0 -5
  195. data/db/migrate/20250717042539_rename_cm_trip_stops_stop_id_column_to_stop_place_id.rb +0 -7
  196. data/db/migrate/20250717042707_rename_cm_trips_origin_and_destination_to_origin_place_and_destination_place.rb +0 -11
  197. data/db/migrate/20250721080738_add_vehicle_type_to_cm_vehicles.rb +0 -7
  198. data/db/migrate/20250725092713_add_block_type_to_cm_blocks.rb +0 -5
  199. data/db/migrate/20250731062816_add_departure_time_and_arrival_time_to_trip_stop.rb +0 -6
  200. data/db/migrate/20250807033035_create_spree_cm_commissioner_saved_guests.rb +0 -23
  201. data/db/migrate/20250808054835_add_saved_guest_reference_to_cm_blocks.rb +0 -5
  202. data/lib/spree_cm_commissioner/cached_inventory_item.rb +0 -23
  203. data/lib/spree_cm_commissioner/test_helper/factories/block_factory.rb +0 -16
  204. data/lib/spree_cm_commissioner/test_helper/factories/inventory_item_factory.rb +0 -9
  205. data/lib/spree_cm_commissioner/test_helper/factories/reserved_block_factory.rb +0 -27
  206. data/lib/spree_cm_commissioner/test_helper/factories/seat_layout_factory.rb +0 -11
  207. data/lib/spree_cm_commissioner/test_helper/factories/seat_section_factory.rb +0 -16
  208. data/lib/spree_cm_commissioner/test_helper/factories/trip_connection_factory.rb +0 -6
  209. data/lib/spree_cm_commissioner/test_helper/factories/trip_stop_factory.rb +0 -13
  210. data/lib/spree_cm_commissioner/test_helper/factories/variant_block_factory.rb +0 -7
  211. data/lib/spree_cm_commissioner/transit/leg.rb +0 -23
  212. data/lib/spree_cm_commissioner/transit/seat_selection.rb +0 -19
  213. data/lib/tasks/create_default_non_permanent_inventory_items.rake +0 -16
  214. data/lib/tasks/ensure_correct_product_type.rake +0 -7
  215. data/lib/tasks/generate_inventory_items.rake +0 -7
@@ -1,134 +1,155 @@
1
1
  module SpreeCmCommissioner
2
2
  class TripQuery
3
- attr_reader :origin_id, :destination_id, :date
3
+ include SpreeCmCommissioner::Transit::TripHelper
4
4
 
5
- def initialize(origin_id:, destination_id:, date:, params: {})
5
+ attr_reader :origin_id, :destination_id, :travel_date, :params
6
+
7
+ def initialize(origin_id:, destination_id:, travel_date:, params: {})
6
8
  @origin_id = origin_id
7
9
  @destination_id = destination_id
8
- @date = date.to_date == Time.zone.now.to_date ? Time.zone.now : Time.zone.parse(date.to_s)
10
+ @travel_date = travel_date
11
+ @travel_date = Time.zone.now if travel_date.to_date == Time.zone.now.to_date
9
12
  @params = params
10
- @page = (params[:page] || 1).to_i
11
- @per_page = (params[:per_page] || 25).to_i
12
13
  end
13
14
 
14
15
  def call
15
- return Kaminari.paginate_array([]) if date.to_date < Date.current
16
-
17
- paginated_relation = direct_trips
18
- return Kaminari.paginate_array([]) if paginated_relation.empty?
19
-
20
- results_array = paginated_relation.map do |trip|
21
- result = build_trip_result(trip)
22
- SpreeCmCommissioner::TripQueryResult.new([result])
23
- end
16
+ return [] if travel_date.to_date < Date.current
24
17
 
25
- Kaminari.paginate_array(
26
- results_array,
27
- total_count: paginated_relation.total_count,
28
- limit: @per_page,
29
- offset: paginated_relation.offset_value
30
- )
18
+ direct_results = direct_trips.map { |trip| SpreeCmCommissioner::TripQueryResult.new([trip]) }
19
+ connected_results = connected_trips || []
20
+ direct_results + connected_results
31
21
  end
32
22
 
33
23
  def direct_trips
34
- @inventory_sql ||= product_inventory_totals
35
- result = SpreeCmCommissioner::Trip
36
- .select(<<~SQL.squish)
37
- cm_trips.*,
38
- boarding.departure_time AS boarding_departure_time,
39
- boarding.stop_place_id AS boarding_stop_id, boarding.stop_name AS boarding_stop_name,
40
- drop_off.stop_name AS drop_off_stop_name, drop_off.stop_place_id AS drop_off_stop_id,
41
- drop_off.arrival_time AS drop_off_arrival_time,
42
- COALESCE(iv.quantity_available, 0) AS quantity_available,
43
- COALESCE(iv.max_capacity, 0) AS max_capacity,
44
- origin_places.name AS origin_place_name, dest_places.name AS destination_place_name,
45
- prices.amount AS amount, prices.compare_at_amount AS compare_at_amount,
46
- prices.currency AS currency
47
- SQL
48
- .includes(vendor: :logo, vehicle: :option_values)
49
- .joins(<<~SQL.squish)
50
- INNER JOIN cm_trip_stops AS boarding ON boarding.trip_id = cm_trips.id AND boarding.stop_type = 0
51
- INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = cm_trips.id AND drop_off.stop_type = 1
52
- INNER JOIN cm_places AS origin_places ON origin_places.id = cm_trips.origin_place_id
53
- INNER JOIN cm_places AS dest_places ON dest_places.id = cm_trips.destination_place_id
54
- INNER JOIN spree_products ON spree_products.id = cm_trips.product_id
55
- INNER JOIN spree_variants AS master ON master.product_id = spree_products.id AND master.is_master = true
56
- INNER JOIN spree_prices AS prices ON prices.variant_id = master.id AND prices.deleted_at IS NULL
57
- SQL
58
- .where('(boarding.location_place_id = ? OR boarding.stop_place_id = ?)
59
- AND (drop_off.location_place_id = ? OR drop_off.stop_place_id = ?)', origin_id, origin_id, destination_id, destination_id
60
- )
61
- .joins("LEFT JOIN (#{@inventory_sql.to_sql}) iv ON cm_trips.product_id = iv.product_id")
62
-
63
- result = result.where(vendor_id: @params[:vendor_id]) if @params[:vendor_id].present?
64
- result.page(@page).per(@per_page)
65
- end
24
+ result = Spree::Variant
25
+ .select('spree_variants.id AS variant_id,
26
+ vendors.id AS vendor_id,
27
+ vendors.name AS vendor_name,
28
+ routes.name AS route_name,
29
+ routes.short_name AS short_name,
30
+ boarding.stop_id AS origin_id,
31
+ drop_off.stop_id AS destination_id,
32
+ boarding.stop_name AS origin,
33
+ drop_off.stop_name AS destination,
34
+ trips.departure_time AS departure_time,
35
+ trips.duration AS duration,
36
+ trips.vehicle_id AS vehicle_id'
37
+ )
38
+ .joins('INNER JOIN cm_trips AS trips ON trips.variant_id = spree_variants.id')
39
+ .joins('INNER JOIN cm_trip_stops AS boarding ON boarding.trip_id = spree_variants.id AND boarding.stop_type = 0')
40
+ .joins('INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = spree_variants.id AND drop_off.stop_type = 1')
41
+ .joins('INNER JOIN spree_vendors AS vendors ON vendors.id = spree_variants.vendor_id')
42
+ .joins('INNER JOIN spree_products AS routes ON routes.id = spree_variants.product_id')
43
+ result = result.where(vendors: { id: params[:vendor_id] }) if params[:vendor_id].present?
44
+ result = result.where('boarding.stop_id = ? AND drop_off.stop_id = ?', origin_id, destination_id)
45
+ .where('trips.departure_time > ? AND trips.departure_time <= ?',
46
+ travel_date.strftime('%H:%M:%S'),
47
+ travel_date.end_of_day.strftime('%H:%M:%S')
48
+ )
66
49
 
67
- def product_inventory_totals
68
- Spree::Product
69
- .select(
70
- 'spree_products.id AS product_id,
71
- SUM(cm_inventory_items.max_capacity) AS max_capacity,
72
- SUM(cm_inventory_items.quantity_available) AS quantity_available'
73
- )
74
- .joins(variants: :inventory_items)
75
- .where(cm_inventory_items: { inventory_date: date.to_date })
76
- .group('spree_products.id')
50
+ result.map do |trip|
51
+ trip_result_options = {
52
+ trip_id: trip[:variant_id],
53
+ vendor_id: trip[:vendor_id],
54
+ vendor_name: trip[:vendor_name],
55
+ route_name: trip[:route_name],
56
+ short_name: trip[:short_name],
57
+ detail: trip[:variant_id],
58
+ origin_id: trip[:origin_id],
59
+ origin: trip[:origin],
60
+ destination_id: trip[:destination_id],
61
+ destination: trip[:destination],
62
+ vehicle_id: trip[:vehicle_id],
63
+ departure_time: parse_time(trip[:departure_time]),
64
+ duration: trip[:duration]
65
+ }
66
+ SpreeCmCommissioner::TripResult.new(trip_result_options)
67
+ end
77
68
  end
78
69
 
79
- private
70
+ def connected_trips # rubocop:disable Metrics/MethodLength
71
+ result = SpreeCmCommissioner::TripConnection
72
+ .joins('
73
+ INNER JOIN spree_variants variant1 ON variant1.id = cm_trip_connections.from_trip_id
74
+ INNER JOIN spree_variants variant2 ON variant2.id = cm_trip_connections.to_trip_id
75
+ INNER JOIN spree_products AS routes1 ON routes1.id = variant1.product_id
76
+ INNER JOIN spree_products AS routes2 ON routes2.id = variant2.product_id
77
+ INNER JOIN cm_trips AS trip1 ON trip1.variant_id = cm_trip_connections.from_trip_id
78
+ INNER JOIN cm_trips AS trip2 ON trip2.variant_id = cm_trip_connections.to_trip_id
79
+ INNER JOIN cm_trip_stops trip1_origin ON trip1_origin.trip_id = variant1.id AND trip1_origin.stop_type = 0
80
+ INNER JOIN cm_trip_stops trip2_origin ON trip2_origin.trip_id = variant2.id AND trip2_origin.stop_type = 0
81
+ INNER JOIN cm_trip_stops trip2_destination ON trip2_destination.trip_id = variant2.id AND trip2_destination.stop_type = 1
82
+ INNER JOIN spree_vendors AS vendor1 ON vendor1.id = variant1.vendor_id
83
+ INNER JOIN spree_vendors AS vendor2 ON vendor2.id = variant2.vendor_id'
84
+ )
85
+ .select('cm_trip_connections.id AS id,
86
+ trip1.variant_id AS trip1_id,
87
+ trip1.origin_id AS trip1_origin_id,
88
+ trip1.destination_id AS trip1_destination_id,
89
+ trip1.departure_time AS trip1_departure_time,
90
+ trip1.duration AS trip1_duration,
91
+ routes1.short_name AS route1_short_name,
92
+ routes1.name AS route1_name,
93
+ trip1.vehicle_id AS trip1_vehicle,
94
+ vendor1.name AS trip1_vendor_name,
95
+ trip2.variant_id AS trip2_id,
96
+ trip2.origin_id AS trip2_origin_id,
97
+ trip2.destination_id AS trip2_destination_id,
98
+ trip2.departure_time AS trip2_departure_time,
99
+ trip2.duration AS trip2_duration,
100
+ trip2.vehicle_id AS trip2_vehicle,
101
+ routes2.short_name AS route2_short_name,
102
+ routes2.name AS route2_name,
103
+ trip1_origin.stop_name AS trip1_origin,
104
+ trip2_origin.stop_name AS trip2_origin,
105
+ trip2_destination.stop_name AS trip2_destination,
106
+ vendor2.name AS trip2_vendor_name'
107
+ ).where('trip1_origin.stop_id = ? AND trip2_destination.stop_id = ?', origin_id, destination_id)
108
+ result = result.where('vendor1.id = ? OR vendor2.id = ?', params[:vendor_id], params[:vendor_id]) if params[:vendor_id].present?
109
+ result = result.where('trip1.departure_time > ? AND trip1.departure_time <= ?', travel_date.strftime('%H:%M:%S'),
110
+ travel_date.end_of_day.strftime('%H:%M:%S')
111
+ ).uniq
80
112
 
81
- def cached_inventory_sql
82
- @inventory_sql ||= product_inventory_totals
83
- end
113
+ return [] if result.blank?
84
114
 
85
- def build_trip_result(trip)
86
- vehicle = trip&.vehicle
87
- vendor = trip&.vendor
88
- trip_result_options = {
89
- id: trip&.id,
90
- departure_time: trip&.departure_time,
91
- duration: trip&.duration,
92
- allow_seat_selection: trip&.allow_seat_selection,
93
- origin_place: {
94
- id: trip&.origin_place_id,
95
- name: trip&.origin_place_name
96
- },
97
- destination_place: {
98
- id: trip&.destination_place_id,
99
- name: trip&.destination_place_name
100
- },
101
- vehicle_id: trip&.vehicle_id,
102
- vehicle: vehicle,
103
- vendor_id: trip&.vendor_id,
104
- vendor: vendor,
105
- product_id: trip&.product_id,
106
- price: trip&.amount,
107
- currency: trip&.currency,
108
- compare_at_amount: trip&.compare_at_amount,
109
- boarding: build_boarding_info(trip),
110
- drop_off: build_drop_off_info(trip),
111
- quantity_available: trip&.quantity_available,
112
- max_capacity: trip&.max_capacity,
113
- amenities: (trip.vehicle&.option_values || [])
114
- }
115
- SpreeCmCommissioner::TripResult.new(trip_result_options)
115
+ build_trip_query_result(result)
116
116
  end
117
117
 
118
- def build_boarding_info(trip)
119
- {
120
- stop_id: trip&.boarding_stop_id,
121
- stop_name: trip&.boarding_stop_name,
122
- departure_time: trip&.boarding_departure_time
123
- }
124
- end
118
+ private
125
119
 
126
- def build_drop_off_info(trip)
127
- {
128
- stop_id: trip&.drop_off_stop_id,
129
- stop_name: trip&.drop_off_stop_name,
130
- arrival_time: trip&.drop_off_arrival_time
131
- }
120
+ def build_trip_query_result(connections)
121
+ connections.map do |trip|
122
+ from_trip = {
123
+ trip_id: trip[:trip1_id],
124
+ origin_id: trip[:trip1_origin_id],
125
+ destination_id: trip[:trip1_destination_id],
126
+ departure_time: parse_time(trip[:trip1_departure_time]),
127
+ duration: trip[:trip1_duration],
128
+ vendor_name: trip[:trip1_vendor_name],
129
+ route_name: trip[:route1_name],
130
+ short_name: trip[:route1_short_name],
131
+ vehicle_id: trip[:trip1_vehicle],
132
+ origin: trip[:trip1_origin],
133
+ destination: trip[:trip2_origin]
134
+ }
135
+ to_trip = {
136
+ trip_id: trip[:trip2_id],
137
+ origin_id: trip[:trip2_origin_id],
138
+ destination_id: trip[:trip2_destination_id],
139
+ departure_time: parse_time(trip[:trip2_departure_time]),
140
+ duration: trip[:trip2_duration],
141
+ vendor_name: trip[:trip2_vendor_name],
142
+ route_name: trip[:route2_name],
143
+ short_name: trip[:route2_short_name],
144
+ vehicle_id: trip[:trip2_vehicle],
145
+ origin: trip[:trip2_origin],
146
+ destination: trip[:trip2_destination]
147
+ }
148
+ data = [SpreeCmCommissioner::TripResult.new(from_trip),
149
+ SpreeCmCommissioner::TripResult.new(to_trip)
150
+ ]
151
+ SpreeCmCommissioner::TripQueryResult.new(data, connection_id: trip[:id])
152
+ end
132
153
  end
133
154
  end
134
155
  end
@@ -0,0 +1,76 @@
1
+ module SpreeCmCommissioner
2
+ class TripSearchQuery
3
+ attr_reader :origin_id, :destination_id, :vendor_id, :date
4
+
5
+ def initialize(origin_id:, destination_id:, date:, vendor_id: nil)
6
+ @origin_id = origin_id
7
+ @destination_id = destination_id
8
+ @vendor_id = vendor_id
9
+ @date = date
10
+ end
11
+
12
+ def call
13
+ trips_info.map do |trip|
14
+ trip_result_options = {
15
+ trip_id: trip.trip_id,
16
+ vendor_id: trip.vendor_id,
17
+ vendor_name: trip.vendor_name,
18
+ route_name: trip.route_name,
19
+ short_name: trip.short_name,
20
+ detail: trip.trip_id,
21
+ origin_id: trip.origin_id,
22
+ origin: trip.origin,
23
+ destination_id: trip.destination_id,
24
+ destination: trip.destination,
25
+ total_sold: trip.total_sold,
26
+ total_seats: trip.total_seats,
27
+ vehicle_id: trip.vehicle_id,
28
+ departure_time: trip.departure_time.strftime('%H:%M'),
29
+ duration: trip.duration
30
+ }
31
+ SpreeCmCommissioner::TripResult.new(trip_result_options)
32
+ end
33
+ end
34
+
35
+ def trips_info
36
+ result = Spree::Variant.select('spree_variants.id as trip_id,
37
+ spree_vendors.id as vendor_id,
38
+ spree_vendors.name as vendor_name,
39
+ routes.name as route_name,
40
+ routes.short_name as short_name,
41
+ details.id as detail_id,
42
+ boarding.stop_id as origin_id,
43
+ drop_off.stop_id as destination_id,
44
+ details.departure_time as departure_time,
45
+ details.duration as duration,
46
+ boarding.stop_name as origin,
47
+ drop_off.stop_name as destination,
48
+ COALESCE(ts.total_sold, 0) as total_sold,
49
+ cm_vehicles.number_of_seats as total_seats,
50
+ cm_vehicles.id as vehicle_id
51
+ '
52
+ )
53
+ .joins('INNER JOIN spree_products routes ON routes.id = spree_variants.product_id')
54
+ .joins('INNER JOIN cm_trips details on details.product_id = routes.id')
55
+ .joins('INNER JOIN cm_vehicles ON cm_vehicles.id = details.vehicle_id')
56
+ .joins("INNER JOIN cm_trip_stops boarding ON boarding.trip_id = details.id AND boarding.stop_type = '0'")
57
+ .joins("INNER JOIN cm_trip_stops drop_off ON drop_off.trip_id = details.id AND drop_off.stop_type = '1'")
58
+ .joins('INNER JOIN spree_vendors ON spree_vendors.id = spree_variants.vendor_id')
59
+ .joins("LEFT JOIN (#{total_sold.to_sql}) ts ON spree_variants.id = ts.trip_id")
60
+
61
+ # TODO: migrat to new table: vehicle, orign and destination
62
+ result = result.where(boarding: { stop_id: origin_id }, drop_off: { stop_id: destination_id })
63
+ result = result.where(vendor_id: vendor_id) if vendor_id.present?
64
+ result
65
+ end
66
+
67
+ def total_sold
68
+ Spree::Variant.select('spree_variants.id as trip_id, SUM(spree_line_items.quantity) as total_sold')
69
+ .joins('INNER JOIN spree_line_items ON spree_line_items.variant_id = spree_variants.id')
70
+ .joins('INNER JOIN spree_orders ON spree_orders.id = spree_line_items.order_id')
71
+ .where(spree_orders: { state: 'complete' })
72
+ .where(spree_line_items: { date: date })
73
+ .group('spree_variants.id')
74
+ end
75
+ end
76
+ end
@@ -0,0 +1,45 @@
1
+ module SpreeCmCommissioner
2
+ module VariantAvailability
3
+ class NonPermanentStockQuery
4
+ attr_reader :variant, :except_line_item_id, :error_message
5
+
6
+ def initialize(variant:, except_line_item_id: nil)
7
+ @variant = variant
8
+ @except_line_item_id = except_line_item_id
9
+ @error_message = nil
10
+ end
11
+
12
+ def available?(quantity)
13
+ reserve_variants =
14
+ Spree::LineItem
15
+ .complete
16
+ .select('(SUM(DISTINCT spree_stock_items.count_on_hand) - SUM(spree_line_items.quantity)) AS available_quantity')
17
+ .joins(variant: :stock_items)
18
+ .where(variant_id: variant.id)
19
+ .where.not(id: except_line_item_id)
20
+ .group(:variant_id)
21
+
22
+ # there is a case when variant does not have any purchaces yet, it will return empty & always available true.
23
+ # in this case, we check with stock items directly.
24
+
25
+ available_quantity = if reserve_variants.any?
26
+ reserve_variants.sum(&:available_quantity)
27
+ else
28
+ variant.stock_items.sum(:count_on_hand)
29
+ end
30
+ if available_quantity >= quantity
31
+ true
32
+ elsif available_quantity == 1
33
+ @error_message = I18n.t('variant_availability.item_available_instock')
34
+ false
35
+ elsif available_quantity <= 0
36
+ @error_message = I18n.t('variant_availability.items_out_of_stock')
37
+ false
38
+ else
39
+ @error_message = I18n.t('variant_availability.items_available_instock', available_quantity: available_quantity)
40
+ false
41
+ end
42
+ end
43
+ end
44
+ end
45
+ end
@@ -0,0 +1,55 @@
1
+ module SpreeCmCommissioner
2
+ module VariantAvailability
3
+ class PermanentStockQuery
4
+ attr_reader :variant, :from_date, :to_date, :except_line_item_id
5
+
6
+ def initialize(variant:, from_date:, to_date:, except_line_item_id: nil)
7
+ @variant = variant
8
+ @from_date = from_date
9
+ @to_date = to_date
10
+ @except_line_item_id = except_line_item_id
11
+ end
12
+
13
+ def available?(quantity)
14
+ (from_date..from_date).all? do |booking_date|
15
+ booked_date_quantity[booking_date].nil? ||
16
+ (booked_date_quantity[booking_date] - quantity) >= 0
17
+ end
18
+ end
19
+
20
+ def booked_date_quantity
21
+ dates_sql = ApplicationRecord.sanitize_sql_array(
22
+ [
23
+ 'SELECT date FROM generate_series(?::date, ?::date, ?) AS date',
24
+ from_date,
25
+ to_date,
26
+ date_interval
27
+ ]
28
+ )
29
+
30
+ @booked_variants ||=
31
+ Spree::LineItem
32
+ .complete
33
+ .select(
34
+ '(SUM(DISTINCT spree_stock_items.count_on_hand) - SUM(spree_line_items.quantity)) AS available_quantity',
35
+ 'dates.date AS reservation_date'
36
+ )
37
+ .joins(variant: :stock_items)
38
+ .where(variant_id: variant.id)
39
+ .where.not(id: except_line_item_id)
40
+ .joins("INNER JOIN (#{dates_sql}) dates ON dates.date >= spree_line_items.from_date AND dates.date < spree_line_items.to_date")
41
+ .group(:variant_id, :reservation_date)
42
+ .order(:reservation_date)
43
+ .each_with_object({}) do |record, hash|
44
+ hash[record.reservation_date.to_date] = record.available_quantity
45
+ end
46
+ end
47
+
48
+ # override this for product that have
49
+ # different date time interval than 1 day.
50
+ def date_interval
51
+ '1 day'
52
+ end
53
+ end
54
+ end
55
+ end
@@ -0,0 +1,54 @@
1
+ module SpreeCmCommissioner
2
+ class VendorStopPlaceQuery
3
+ attr_reader :query, :vendor_id, :stop_type, :reference_stop_id
4
+
5
+ def initialize(query:, vendor_id:, stop_type: :boarding, reference_stop_id: nil)
6
+ @query = query.to_s.strip
7
+ @vendor_id = vendor_id
8
+ @stop_type = stop_type
9
+ @reference_stop_id = reference_stop_id
10
+ end
11
+
12
+ def call
13
+ results = vendor_stops
14
+ return [] if results.empty?
15
+
16
+ places = results.includes(:stop).map(&:stop).compact.uniq
17
+
18
+ format_places(places)
19
+ end
20
+
21
+ private
22
+
23
+ def vendor_stops
24
+ scope = base_scope
25
+ return scope if query.blank?
26
+
27
+ scope = scope.where.not(stop_id: reference_stop_id) if reference_stop_id.present?
28
+ scope.where('cm_places.name ILIKE ?', "%#{query}%")
29
+ end
30
+
31
+ def base_scope
32
+ SpreeCmCommissioner::VendorStop
33
+ .joins(:stop)
34
+ .where(vendor_id: vendor_id)
35
+ .where(stop_type: stop_type)
36
+ .order(trip_count: :desc)
37
+ .where.not(trip_count: 0)
38
+ end
39
+
40
+ def format_places(places)
41
+ places
42
+ .sort_by { |p| [-p.depth, -p.lft] }
43
+ .filter_map do |place|
44
+ next if place.depth.zero?
45
+
46
+ {
47
+ id: place.id,
48
+ parent_id: place.parent_id,
49
+ name: place.self_and_ancestors.map(&:name).reverse.join(', ')
50
+ }
51
+ end
52
+ end
53
+ end
54
+ end
@@ -3,9 +3,6 @@ module SpreeCmCommissioner
3
3
  params do
4
4
  required(:from_date).value(:date)
5
5
  required(:to_date).value(:date)
6
- required(:province_id).value(:integer)
7
- required(:adult).value(:integer)
8
- required(:children).value(:integer)
9
6
  end
10
7
 
11
8
  rule(:from_date, :to_date) do
@@ -11,7 +11,7 @@ module SpreeCmCommissioner
11
11
  end
12
12
 
13
13
  def error_message
14
- errors.map { |error| "#{error.path.join(', ')}: #{error.text}" }.to_sentence
14
+ errors.map(&:text).join(', ')
15
15
  end
16
16
 
17
17
  private
@@ -9,12 +9,10 @@ module Spree
9
9
 
10
10
  attributes :total_inventory, :service_availabilities
11
11
 
12
- # Deprecated
13
12
  attribute :total_booking do |vendor|
14
13
  vendor.respond_to?(:total_booking) ? vendor.total_booking : 0
15
14
  end
16
15
 
17
- # Deprecated
18
16
  attribute :remaining do |vendor|
19
17
  vendor.respond_to?(:remaining) ? vendor.remaining : vendor.total_inventory
20
18
  end
@@ -4,7 +4,6 @@ module Spree
4
4
  module LineItemSerializerDecorator
5
5
  def self.prepended(base)
6
6
  base.attributes :from_date, :to_date, :need_confirmation, :product_type, :event_status, :amount, :display_amount,
7
- :checkin_date, :checkout_date,
8
7
  :number, :qr_data,
9
8
  :kyc, :kyc_fields, :remaining_total_guests, :number_of_guests,
10
9
  :completion_steps, :available_social_contact_platforms, :allow_anonymous_booking, :discontinue_on,
@@ -44,6 +44,8 @@ module Spree
44
44
  end
45
45
 
46
46
  base.cache_options store: nil
47
+
48
+ base.attribute :action_button, &:action_button
47
49
  end
48
50
  end
49
51
  end
@@ -7,7 +7,7 @@ module SpreeCmCommissioner
7
7
  attributes :first_name, :last_name, :dob, :gender, :kyc_fields, :other_occupation, :created_at, :updated_at,
8
8
  :qr_data, :social_contact_platform, :social_contact, :available_social_contact_platforms,
9
9
  :age, :emergency_contact, :other_organization, :expectation, :upload_later, :address, :formatted_bib_number, :phone_number,
10
- :token, :country_code, :contact
10
+ :token, :country_code, :contact, :data_fill_stage_phase
11
11
 
12
12
  # temporary, once app release after cm-app v1.9.1, we no longer need this.
13
13
  attribute :seat_number do |object|
@@ -22,8 +22,6 @@ module SpreeCmCommissioner
22
22
  belongs_to :nationality, serializer: Spree::V2::Storefront::TaxonSerializer
23
23
  belongs_to :line_item, serializer: Spree::V2::Storefront::LineItemSerializer
24
24
 
25
- has_many :guest_dynamic_fields, serializer: SpreeCmCommissioner::V2::Storefront::GuestDynamicFieldSerializer
26
-
27
25
  has_one :id_card, serializer: Spree::V2::Storefront::IdCardSerializer
28
26
  has_one :check_in
29
27
 
@@ -0,0 +1,11 @@
1
+ module SpreeCmCommissioner
2
+ class VehicleOptionValueCreator
3
+ def self.call(vehicle)
4
+ vehicle_option_type = Spree::OptionType.vehicle
5
+
6
+ value = vehicle_option_type.option_values.where(name: vehicle.id).first_or_initialize
7
+ value.presentation = vehicle.code
8
+ value.save
9
+ end
10
+ end
11
+ end
@@ -17,11 +17,9 @@
17
17
  </td>
18
18
  <td class="text-center d-flex flex-column align-items-center justify-content-center">
19
19
  <div style="width: 90px;">
20
- <%= form_tag admin_product_stock_managements_path(product_id: params[:product_id], variant_id: variant.id, stock_location_id: stock_location.id), method: :post do %>
20
+ <%= form_tag admin_stock_items_path(variant_id: variant.id, stock_location_id: stock_location.id), method: :post do %>
21
21
  <div class="input-group input-group-sm">
22
22
  <%= number_field_tag 'stock_movement[quantity]', 0, class: 'form-control text-center p-0' %>
23
- <%= hidden_field_tag 'stock_movement[originator_id]', spree_current_user.id %>
24
- <%= hidden_field_tag 'stock_movement[originator_type]', spree_current_user.class.name %>
25
23
  <div class="input-group-append">
26
24
  <%= button_tag(class: 'btn btn-outline-success pl-2 pr-1') do %>
27
25
  <%= svg_icon(name: 'arrow-left-right.svg', classes: "icon", width: 14, height: 14) %>
@@ -34,10 +32,7 @@
34
32
  <td class="text-center">
35
33
  <% if item.persisted? && can?(:update, item) %>
36
34
  <%= form_tag admin_stock_item_path(item), method: :put, class: 'toggle_stock_item_backorderable' do %>
37
- <%= check_box_tag 'stock_item[backorderable]', true, item.backorderable?,
38
- class: 'stock_item_backorderable',
39
- id: "stock_item_backorderable_#{stock_location.id}",
40
- onclick: "if (!confirm('Are you sure to change backorderable status?')) { this.checked = !this.checked; }" %>
35
+ <%= check_box_tag 'stock_item[backorderable]', true, item.backorderable?, class: 'stock_item_backorderable', id: "stock_item_backorderable_#{stock_location.id}" %>
41
36
  <% end %>
42
37
  <% else %>
43
38
  <%= 'N/A' %>