spree_cm_commissioner 2.0.3.pre.pre2 → 2.0.3.pre.pre3
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.
- checksums.yaml +4 -4
- data/.github/workflows/test_and_build_gem.yml +16 -2
- data/.gitignore +2 -1
- data/Gemfile.lock +28 -1
- data/Rakefile +33 -4
- data/app/assets/stylesheets/spree_cm_commissioner/backend/calendar.scss +8 -11
- data/app/controllers/spree/admin/inventory_items_controller.rb +83 -0
- data/app/controllers/spree/admin/stock_managements_controller.rb +63 -1
- data/app/controllers/spree/api/v2/operator/event_charts_controller.rb +9 -3
- data/app/controllers/spree/api/v2/storefront/accommodations/variants_controller.rb +42 -0
- data/app/controllers/spree/api/v2/storefront/accommodations_controller.rb +14 -31
- data/app/controllers/spree/api/v2/storefront/queue_cart/line_items_controller.rb +2 -2
- data/app/controllers/spree/api/v2/storefront/trip_search_controller.rb +60 -0
- data/app/finders/spree_cm_commissioner/accommodations/find.rb +37 -0
- data/app/finders/spree_cm_commissioner/accommodations/find_variant.rb +32 -0
- data/app/interactors/spree_cm_commissioner/ensure_correct_product_type.rb +40 -0
- data/app/interactors/spree_cm_commissioner/inventory_item_syncer.rb +25 -0
- data/app/interactors/spree_cm_commissioner/stock/inventory_item_resetter.rb +44 -0
- data/app/interactors/spree_cm_commissioner/stock/inventory_items_adjuster.rb +13 -0
- data/app/interactors/spree_cm_commissioner/stock/inventory_items_generator.rb +15 -0
- data/app/interactors/spree_cm_commissioner/stock/permanent_inventory_items_generator.rb +75 -0
- data/app/interactors/spree_cm_commissioner/stock/stock_movement_creator.rb +32 -0
- data/app/interactors/spree_cm_commissioner/taxi_trip_creator.rb +66 -0
- data/app/interactors/spree_cm_commissioner/variant_block_updater.rb +62 -0
- data/app/interactors/spree_cm_commissioner/vehicle_updater.rb +41 -0
- data/app/jobs/spree_cm_commissioner/application_job.rb +20 -0
- data/app/jobs/spree_cm_commissioner/application_unique_job.rb +20 -0
- data/app/jobs/spree_cm_commissioner/ensure_correct_product_type_job.rb +7 -0
- data/app/jobs/spree_cm_commissioner/inventory_item_syncer_job.rb +7 -0
- data/app/jobs/spree_cm_commissioner/stock/inventory_items_adjuster_job.rb +11 -0
- data/app/jobs/spree_cm_commissioner/stock/inventory_items_generator_job.rb +11 -0
- data/app/jobs/spree_cm_commissioner/stock/permanent_inventory_items_generator_job.rb +9 -0
- data/app/models/concerns/spree_cm_commissioner/line_item_durationable.rb +9 -15
- data/app/models/concerns/spree_cm_commissioner/option_type_attr_type.rb +2 -12
- data/app/models/concerns/spree_cm_commissioner/order_seatable.rb +44 -0
- data/app/models/concerns/spree_cm_commissioner/order_state_machine.rb +39 -0
- data/app/models/concerns/spree_cm_commissioner/product_delegation.rb +1 -3
- data/app/models/concerns/spree_cm_commissioner/product_type.rb +10 -0
- data/app/models/concerns/spree_cm_commissioner/route_type.rb +1 -1
- data/app/models/concerns/spree_cm_commissioner/taxon_kind.rb +1 -1
- data/app/models/concerns/spree_cm_commissioner/vehicle_type.rb +11 -0
- data/app/models/spree_cm_commissioner/block.rb +43 -0
- data/app/models/spree_cm_commissioner/guest.rb +18 -0
- data/app/models/spree_cm_commissioner/inventory.rb +11 -0
- data/app/models/spree_cm_commissioner/inventory_item.rb +69 -0
- data/app/models/spree_cm_commissioner/line_item_decorator.rb +46 -78
- data/app/models/spree_cm_commissioner/notification_taxon.rb +1 -1
- data/app/models/spree_cm_commissioner/option_type_decorator.rb +1 -11
- data/app/models/spree_cm_commissioner/order_decorator.rb +30 -1
- data/app/models/spree_cm_commissioner/place.rb +1 -4
- data/app/models/spree_cm_commissioner/price_decorator.rb +9 -0
- data/app/models/spree_cm_commissioner/product_decorator.rb +10 -6
- data/app/models/spree_cm_commissioner/redis_stock/cached_inventory_items_builder.rb +41 -0
- data/app/models/spree_cm_commissioner/redis_stock/inventory_updater.rb +126 -0
- data/app/models/spree_cm_commissioner/redis_stock/line_items_cached_inventory_items_builder.rb +36 -0
- data/app/models/spree_cm_commissioner/redis_stock/variant_cached_inventory_items_builder.rb +25 -0
- data/app/models/spree_cm_commissioner/reserved_block.rb +30 -0
- data/app/models/spree_cm_commissioner/seat_layout.rb +20 -0
- data/app/models/spree_cm_commissioner/seat_section.rb +16 -0
- data/app/models/spree_cm_commissioner/seats/blocks_canceler.rb +30 -0
- data/app/models/spree_cm_commissioner/seats/blocks_holder.rb +53 -0
- data/app/models/spree_cm_commissioner/seats/blocks_reserver.rb +49 -0
- data/app/models/spree_cm_commissioner/seats/errors/blocks_are_on_hold_by_other_guest.rb +4 -0
- data/app/models/spree_cm_commissioner/seats/errors/blocks_are_reserved_by_other_guest.rb +4 -0
- data/app/models/spree_cm_commissioner/seats/errors/blocks_are_reserved_by_same_guest.rb +4 -0
- data/app/models/spree_cm_commissioner/seats/errors/unable_to_save_reserved_block_record.rb +4 -0
- data/app/models/spree_cm_commissioner/service_calendar.rb +0 -2
- data/app/models/spree_cm_commissioner/state_decorator.rb +0 -1
- data/app/models/spree_cm_commissioner/stock/availability_checker.rb +26 -25
- data/app/models/spree_cm_commissioner/stock/availability_validator_decorator.rb +2 -1
- data/app/models/spree_cm_commissioner/stock/line_item_availability_checker.rb +3 -3
- data/app/models/spree_cm_commissioner/stock/order_availability_checker.rb +44 -0
- data/app/models/spree_cm_commissioner/stock_item_decorator.rb +17 -0
- data/app/models/spree_cm_commissioner/taxon_decorator.rb +0 -1
- data/app/models/spree_cm_commissioner/taxonomy_decorator.rb +0 -6
- data/app/models/spree_cm_commissioner/trip.rb +12 -10
- data/app/models/spree_cm_commissioner/trip_connection.rb +5 -5
- data/app/models/spree_cm_commissioner/trip_stop.rb +10 -21
- data/app/models/spree_cm_commissioner/variant_block.rb +9 -0
- data/app/models/spree_cm_commissioner/variant_decorator.rb +37 -47
- data/app/models/spree_cm_commissioner/variant_options.rb +0 -23
- data/app/models/spree_cm_commissioner/vehicle.rb +11 -16
- data/app/models/spree_cm_commissioner/vendor_decorator.rb +11 -14
- data/app/models/spree_cm_commissioner/vendor_place.rb +13 -3
- data/app/queries/spree_cm_commissioner/trip_query.rb +110 -131
- data/app/request_schemas/spree_cm_commissioner/accommodation_request_schema.rb +3 -0
- data/app/request_schemas/spree_cm_commissioner/application_request_schema.rb +1 -1
- data/app/request_schemas/spree_cm_commissioner/trip_search_request_schema.rb +20 -0
- data/app/request_schemas/spree_cm_commissioner/variant_request_schema.rb +19 -0
- data/app/serializers/spree/v2/storefront/accommodation_serializer.rb +2 -0
- data/app/serializers/spree/v2/storefront/amenity_serializer.rb +15 -0
- data/app/serializers/spree/v2/storefront/line_item_serializer_decorator.rb +1 -0
- data/app/serializers/spree/v2/storefront/trip_query_result_serializer.rb +14 -0
- data/app/serializers/spree/v2/storefront/trip_result_serializer.rb +16 -0
- data/app/serializers/spree/v2/storefront/trip_vehicle_serializer.rb +11 -0
- data/app/serializers/spree/v2/storefront/trip_vendor_serializer.rb +13 -0
- data/app/views/spree/admin/inventory_items/show.html.erb +72 -0
- data/app/views/spree/admin/stock_managements/_variant_stock_items.html.erb +7 -2
- data/app/views/spree/admin/stock_managements/calendar.html.erb +56 -0
- data/app/views/spree/admin/stock_managements/index.html.erb +55 -6
- data/config/initializers/paper_trail.rb +1 -0
- data/config/initializers/spree_permitted_attributes.rb +5 -0
- data/config/routes.rb +24 -2
- data/db/migrate/20240202080634_update_counter_cache_of_vehicle_type.rb +3 -1
- data/db/migrate/20250122000000_move_route_type_from_vehicles_to_trips.rb +7 -0
- data/db/migrate/20250304293518_create_cm_inventory_items.rb +21 -0
- data/db/migrate/20250429094228_add_lock_version_to_cm_inventory_items.rb +5 -0
- data/db/migrate/20250502025848_add_index_to_spree_products.rb +5 -0
- data/db/migrate/20250502030001_add_product_type_to_spree_variants.rb +5 -0
- data/db/migrate/20250502030002_add_product_type_to_spree_line_items.rb +5 -0
- data/db/migrate/20250603035256_add_inventory_item_to_spree_prices.rb +7 -0
- data/db/migrate/20250619073724_drop_table_cm_line_item_seats.rb +5 -0
- data/db/migrate/20250619073812_drop_table_cm_vehicle_seats.rb +5 -0
- data/db/migrate/20250619073844_drop_table_cm_vehicle_types.rb +9 -0
- data/db/migrate/20250619073957_drop_table_cm_option_value_vehicle_types.rb +5 -0
- data/db/migrate/20250619082354_remove_unnecessary_fields_from_cm_places.rb +9 -0
- data/db/migrate/20250619082736_remove_route_type_from_spree_products.rb +5 -0
- data/db/migrate/20250619083055_remove_unnecessary_fields_from_spree_taxons.rb +5 -0
- data/db/migrate/20250620083055_remove_variant_id_from_cm_trips.rb +5 -0
- data/db/migrate/20250620090000_update_cm_trip_connections_to_use_cm_trips.rb +6 -0
- data/db/migrate/20250620090001_create_cm_seat_layouts.rb +17 -0
- data/db/migrate/20250620090002_create_cm_seat_sections.rb +18 -0
- data/db/migrate/20250620090003_create_cm_blocks.rb +18 -0
- data/db/migrate/20250624091005_create_cm_reserved_blocks.rb +29 -0
- data/db/migrate/20250626083642_create_cm_variant_blocks.rb +24 -0
- data/db/migrate/20250627023314_add_block_id_to_cm_guests.rb +13 -0
- data/db/migrate/20250716022821_add_location_reference_to_cm_vendor_places.rb +5 -0
- data/db/migrate/20250716031743_drop_table_cm_vendor_stops.rb +5 -0
- data/db/migrate/20250717023824_add_vendor_reference_to_cm_trips.rb +5 -0
- data/db/migrate/20250717041414_add_location_place_reference_to_cm_trip_stops.rb +5 -0
- data/db/migrate/20250717042539_rename_cm_trip_stops_stop_id_column_to_stop_place_id.rb +7 -0
- data/db/migrate/20250717042707_rename_cm_trips_origin_and_destination_to_origin_place_and_destination_place.rb +11 -0
- data/db/migrate/20250721080738_add_vehicle_type_to_cm_vehicles.rb +7 -0
- data/db/migrate/20250725092713_add_block_type_to_cm_blocks.rb +5 -0
- data/db/migrate/20250731062816_add_departure_time_and_arrival_time_to_trip_stop.rb +6 -0
- data/docker-compose.yml +1 -1
- data/lib/cm_app_logger.rb +11 -4
- data/lib/generators/spree_cm_commissioner/install/install_generator.rb +14 -11
- data/lib/generators/spree_cm_commissioner/install/templates/app/javascript/{spree_cm_commissioner → spree_dashboard/spree_cm_commissioner}/utilities.js +4 -0
- data/lib/spree_cm_commissioner/cached_inventory_item.rb +23 -0
- data/lib/spree_cm_commissioner/calendar_event.rb +11 -1
- data/lib/spree_cm_commissioner/test_helper/factories/block_factory.rb +16 -0
- data/lib/spree_cm_commissioner/test_helper/factories/guest_factory.rb +10 -0
- data/lib/spree_cm_commissioner/test_helper/factories/homepage_section_relatable_factory.rb +1 -1
- data/lib/spree_cm_commissioner/test_helper/factories/inventory_item_factory.rb +9 -0
- data/lib/spree_cm_commissioner/test_helper/factories/line_item_factory.rb +1 -1
- data/lib/spree_cm_commissioner/test_helper/factories/option_type_factory.rb +6 -30
- data/lib/spree_cm_commissioner/test_helper/factories/order_factory.rb +0 -36
- data/lib/spree_cm_commissioner/test_helper/factories/product_factory.rb +18 -34
- data/lib/spree_cm_commissioner/test_helper/factories/reserved_block_factory.rb +27 -0
- data/lib/spree_cm_commissioner/test_helper/factories/seat_layout_factory.rb +11 -0
- data/lib/spree_cm_commissioner/test_helper/factories/seat_section_factory.rb +16 -0
- data/lib/spree_cm_commissioner/test_helper/factories/stock_location_factory.rb +2 -2
- data/lib/spree_cm_commissioner/test_helper/factories/trip_connection_factory.rb +6 -0
- data/lib/spree_cm_commissioner/test_helper/factories/trip_factory.rb +11 -3
- data/lib/spree_cm_commissioner/test_helper/factories/trip_stop_factory.rb +10 -0
- data/lib/spree_cm_commissioner/test_helper/factories/variant_block_factory.rb +7 -0
- data/lib/spree_cm_commissioner/test_helper/factories/variant_factory.rb +41 -19
- data/lib/spree_cm_commissioner/test_helper/factories/vehicle_factory.rb +1 -1
- data/lib/spree_cm_commissioner/test_helper/factories/vendor_factory.rb +6 -1
- data/lib/spree_cm_commissioner/test_helper/factories/vendor_place_factory.rb +13 -1
- data/lib/spree_cm_commissioner/trip_query_result.rb +16 -0
- data/lib/spree_cm_commissioner/trip_result.rb +12 -10
- data/lib/spree_cm_commissioner/version.rb +1 -1
- data/lib/spree_cm_commissioner.rb +35 -1
- data/lib/tasks/create_default_non_permanent_inventory_items.rake +16 -0
- data/lib/tasks/ensure_correct_product_type.rake +7 -0
- data/lib/tasks/generate_inventory_items.rake +7 -0
- data/spree_cm_commissioner.gemspec +7 -0
- metadata +153 -25
- data/app/controllers/concerns/spree_cm_commissioner/transit/taxon_bitwise.rb +0 -44
- data/app/finders/spree_cm_commissioner/line_items/find_by_variant_decorator.rb +0 -20
- data/app/models/spree_cm_commissioner/branch.rb +0 -12
- data/app/models/spree_cm_commissioner/line_item_seat.rb +0 -10
- data/app/models/spree_cm_commissioner/option_value_vehicle_type.rb +0 -8
- data/app/models/spree_cm_commissioner/stop.rb +0 -23
- data/app/models/spree_cm_commissioner/vehicle_seat.rb +0 -11
- data/app/models/spree_cm_commissioner/vehicle_type.rb +0 -76
- data/app/models/spree_cm_commissioner/vendor_stop.rb +0 -10
- data/app/queries/spree_cm_commissioner/trip_search_query.rb +0 -76
- data/app/queries/spree_cm_commissioner/variant_availability/non_permanent_stock_query.rb +0 -45
- data/app/queries/spree_cm_commissioner/variant_availability/permanent_stock_query.rb +0 -55
- data/app/queries/spree_cm_commissioner/vendor_stop_place_query.rb +0 -54
- data/app/services/spree_cm_commissioner/vehicle_option_value_creator.rb +0 -11
- data/lib/spree_cm_commissioner/test_helper/factories/branch_factory.rb +0 -12
- data/lib/spree_cm_commissioner/test_helper/factories/departure_time_option_type_factory.rb +0 -8
- data/lib/spree_cm_commissioner/test_helper/factories/duration_option_type_factory.rb +0 -8
- data/lib/spree_cm_commissioner/test_helper/factories/line_item_seat_factory.rb +0 -7
- data/lib/spree_cm_commissioner/test_helper/factories/stop_factory.rb +0 -14
- data/lib/spree_cm_commissioner/test_helper/factories/transit_place_factory.rb +0 -8
- data/lib/spree_cm_commissioner/test_helper/factories/vehicle_option_type_factory.rb +0 -8
- data/lib/spree_cm_commissioner/test_helper/factories/vehicle_type_factory.rb +0 -96
- data/lib/spree_cm_commissioner/trip_seat_layout_result.rb +0 -11
@@ -1,155 +1,134 @@
|
|
1
1
|
module SpreeCmCommissioner
|
2
2
|
class TripQuery
|
3
|
-
|
3
|
+
attr_reader :origin_id, :destination_id, :date
|
4
4
|
|
5
|
-
|
6
|
-
|
7
|
-
def initialize(origin_id:, destination_id:, travel_date:, params: {})
|
5
|
+
def initialize(origin_id:, destination_id:, date:, params: {})
|
8
6
|
@origin_id = origin_id
|
9
7
|
@destination_id = destination_id
|
10
|
-
@
|
11
|
-
@travel_date = Time.zone.now if travel_date.to_date == Time.zone.now.to_date
|
8
|
+
@date = date.to_date == Time.zone.now.to_date ? Time.zone.now : Time.zone.parse(date.to_s)
|
12
9
|
@params = params
|
10
|
+
@page = (params[:page] || 1).to_i
|
11
|
+
@per_page = (params[:per_page] || 25).to_i
|
13
12
|
end
|
14
13
|
|
15
14
|
def call
|
16
|
-
return [] if
|
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
|
17
24
|
|
18
|
-
|
19
|
-
|
20
|
-
|
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
|
+
)
|
21
31
|
end
|
22
32
|
|
23
33
|
def direct_trips
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
.
|
39
|
-
.joins(
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
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")
|
49
62
|
|
50
|
-
result.
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
duration: trip[:duration]
|
65
|
-
}
|
66
|
-
SpreeCmCommissioner::TripResult.new(trip_result_options)
|
67
|
-
end
|
63
|
+
result = result.where(vendor_id: @params[:vendor_id]) if @params[:vendor_id].present?
|
64
|
+
result.page(@page).per(@per_page)
|
65
|
+
end
|
66
|
+
|
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')
|
68
77
|
end
|
69
78
|
|
70
|
-
|
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
|
79
|
+
private
|
112
80
|
|
113
|
-
|
81
|
+
def cached_inventory_sql
|
82
|
+
@inventory_sql ||= product_inventory_totals
|
83
|
+
end
|
114
84
|
|
115
|
-
|
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)
|
116
116
|
end
|
117
117
|
|
118
|
-
|
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
|
119
125
|
|
120
|
-
def
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
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
|
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
|
+
}
|
153
132
|
end
|
154
133
|
end
|
155
134
|
end
|
@@ -0,0 +1,20 @@
|
|
1
|
+
module SpreeCmCommissioner
|
2
|
+
class TripSearchRequestSchema < ApplicationRequestSchema
|
3
|
+
params do
|
4
|
+
required(:origin_id).value(:integer)
|
5
|
+
required(:destination_id).value(:integer)
|
6
|
+
required(:date).value(:date)
|
7
|
+
end
|
8
|
+
|
9
|
+
rule(:date) do
|
10
|
+
key.failure(:must_be_in_future) if value < Time.zone.today
|
11
|
+
end
|
12
|
+
|
13
|
+
rule(:origin_id, :destination_id) do
|
14
|
+
origin_id = values[:origin_id]
|
15
|
+
destination_id = values[:destination_id]
|
16
|
+
|
17
|
+
key.failure(:must_be_different) if origin_id == destination_id
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
@@ -0,0 +1,19 @@
|
|
1
|
+
module SpreeCmCommissioner
|
2
|
+
class VariantRequestSchema < ApplicationRequestSchema
|
3
|
+
params do
|
4
|
+
required(:from_date).value(:date)
|
5
|
+
required(:to_date).value(:date)
|
6
|
+
required(:adult).value(:integer)
|
7
|
+
required(:children).value(:integer)
|
8
|
+
end
|
9
|
+
|
10
|
+
rule(:from_date, :to_date) do
|
11
|
+
from_date = values[:from_date]
|
12
|
+
to_date = values[:to_date]
|
13
|
+
|
14
|
+
key.failure(:must_be_in_future) if from_date < Time.zone.today
|
15
|
+
key.failure(:must_be_later_than_start_date) if from_date > to_date
|
16
|
+
key.failure(:stay_is_too_long) if (to_date - from_date).to_i > ENV.fetch('ACCOMMODATION_MAX_STAY_DAYS', 10).to_i
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
@@ -9,10 +9,12 @@ module Spree
|
|
9
9
|
|
10
10
|
attributes :total_inventory, :service_availabilities
|
11
11
|
|
12
|
+
# Deprecated
|
12
13
|
attribute :total_booking do |vendor|
|
13
14
|
vendor.respond_to?(:total_booking) ? vendor.total_booking : 0
|
14
15
|
end
|
15
16
|
|
17
|
+
# Deprecated
|
16
18
|
attribute :remaining do |vendor|
|
17
19
|
vendor.respond_to?(:remaining) ? vendor.remaining : vendor.total_inventory
|
18
20
|
end
|
@@ -0,0 +1,15 @@
|
|
1
|
+
module Spree
|
2
|
+
module V2
|
3
|
+
module Storefront
|
4
|
+
class AmenitySerializer < BaseSerializer
|
5
|
+
set_type :amenity
|
6
|
+
attributes :name, :presentation
|
7
|
+
attribute :display_icon do |option_value|
|
8
|
+
ActionController::Base.helpers.image_url(option_value.display_icon)
|
9
|
+
rescue StandardError
|
10
|
+
nil
|
11
|
+
end
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
@@ -4,6 +4,7 @@ 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,
|
7
8
|
:number, :qr_data,
|
8
9
|
:kyc, :kyc_fields, :remaining_total_guests, :number_of_guests,
|
9
10
|
:completion_steps, :available_social_contact_platforms, :allow_anonymous_booking, :discontinue_on,
|
@@ -0,0 +1,14 @@
|
|
1
|
+
module Spree
|
2
|
+
module V2
|
3
|
+
module Storefront
|
4
|
+
class TripQueryResultSerializer < BaseSerializer
|
5
|
+
set_type :trip_query_result
|
6
|
+
|
7
|
+
attributes :quantity_available, :max_capacity
|
8
|
+
|
9
|
+
attribute :direct, &:direct?
|
10
|
+
has_many :trips, serializer: Spree::V2::Storefront::TripResultSerializer
|
11
|
+
end
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
@@ -0,0 +1,16 @@
|
|
1
|
+
module Spree
|
2
|
+
module V2
|
3
|
+
module Storefront
|
4
|
+
class TripResultSerializer < BaseSerializer
|
5
|
+
set_type :trip_result
|
6
|
+
|
7
|
+
attributes :origin_place, :destination_place, :boarding, :drop_off, :price, :compare_at_amount, :currency, :quantity_available, :max_capacity,
|
8
|
+
:allow_seat_selection, :departure_time
|
9
|
+
attribute :duration_in_hms, &:duration_in_hms
|
10
|
+
belongs_to :vendor, serializer: Spree::V2::Storefront::TripVendorSerializer
|
11
|
+
belongs_to :vehicle, serializer: Spree::V2::Storefront::TripVehicleSerializer
|
12
|
+
has_many :amenities, serializer: Spree::V2::Storefront::AmenitySerializer
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
@@ -0,0 +1,13 @@
|
|
1
|
+
module Spree
|
2
|
+
module V2
|
3
|
+
module Storefront
|
4
|
+
class TripVendorSerializer < BaseSerializer
|
5
|
+
set_type :vendor
|
6
|
+
|
7
|
+
attributes :name, :star_rating
|
8
|
+
|
9
|
+
has_one :logo, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
|
10
|
+
end
|
11
|
+
end
|
12
|
+
end
|
13
|
+
end
|
@@ -0,0 +1,72 @@
|
|
1
|
+
<%= turbo_frame_tag "inventory_item" do %>
|
2
|
+
<div>
|
3
|
+
<h5 class="modal-title">Inventory</h5>
|
4
|
+
<p>
|
5
|
+
<% if @inventory_item.inventory_date.present? %>
|
6
|
+
<span><%= @inventory_item.inventory_date %></span><br>
|
7
|
+
<% end %>
|
8
|
+
<%= @inventory_item.variant.options_text %>
|
9
|
+
</p>
|
10
|
+
|
11
|
+
<ul class="list-group mb-1">
|
12
|
+
<li class="list-group-item d-flex justify-content-between align-items-center">
|
13
|
+
Max capacity
|
14
|
+
<span class="badge badge-primary badge-pill"><%= @inventory_item.max_capacity %></span>
|
15
|
+
</li>
|
16
|
+
<li class="list-group-item d-flex justify-content-between align-items-center">
|
17
|
+
Quantity available
|
18
|
+
<span class="badge badge-primary badge-pill"><%= @inventory_item.quantity_available %></span>
|
19
|
+
</li>
|
20
|
+
</ul>
|
21
|
+
|
22
|
+
<small class="text-muted">
|
23
|
+
<%= inventory_item_message(@inventory_item, @cached_inventory_item) %>
|
24
|
+
</small>
|
25
|
+
|
26
|
+
<%= link_to_with_icon('arrow-counterclockwise.svg', "Reset Inventory Item", reset_admin_product_variant_inventory_item_path(@product, @inventory_item.variant_id, @inventory_item.id),
|
27
|
+
method: :patch,
|
28
|
+
remote: false,
|
29
|
+
class: 'icon_link btn btn-sm outline text-dark',
|
30
|
+
data: { confirm: "Only reset if stock is incorrect. Are you sure?" }, no_text: true
|
31
|
+
) %>
|
32
|
+
</div>
|
33
|
+
|
34
|
+
<hr />
|
35
|
+
|
36
|
+
<div class="mt-2">
|
37
|
+
<h6 class="modal-title mb-1 d-flex flex-row justify-content-between">
|
38
|
+
Custom Prices
|
39
|
+
<%= link_to_with_icon('delete.svg', Spree.t(:remove),
|
40
|
+
delete_prices_admin_product_variant_inventory_item_path(@product, @inventory_item.variant_id, @inventory_item.id),
|
41
|
+
method: :delete, remote: false, class: 'icon_link btn btn-sm text-danger', data: { action: :remove, confirm: "Are you sure to remove these prices & use base price?" }, no_text: true
|
42
|
+
) if @prices.any?(&:persisted?) %>
|
43
|
+
</h6>
|
44
|
+
|
45
|
+
<%= form_with url: update_prices_admin_product_variant_inventory_item_path(@product, @inventory_item.variant_id, @inventory_item.id), method: :patch, local: true, html: { class: 'inventory-item-prices-form' } do |form| %>
|
46
|
+
<table class="table">
|
47
|
+
<tbody>
|
48
|
+
<% @prices.each do |price| %>
|
49
|
+
<% currency = price.currency %>
|
50
|
+
<% default_price = @default_prices[currency] || Spree::Price.new %>
|
51
|
+
<tr id="inventory-item_prices_row_<%= currency %>" data-hook="inventory-item_prices_row">
|
52
|
+
<td><%= form.label "price_#{currency}", currency, class: 'form-label' %></td>
|
53
|
+
<td>
|
54
|
+
<%= form.hidden_field "prices[#{currency}][currency]", value: currency %>
|
55
|
+
<%= form.text_field "prices[#{currency}][price]", value: price.amount, placeholder: "Default: #{default_price.amount || 'N/A'}", class: 'form-control' %>
|
56
|
+
</td>
|
57
|
+
<td>
|
58
|
+
<%= form.text_field "prices[#{currency}][compare_at_price]", value: price.compare_at_price, placeholder: "Default: #{default_price.compare_at_price || 'N/A'}", class: 'form-control' %>
|
59
|
+
</td>
|
60
|
+
</tr>
|
61
|
+
<% end %>
|
62
|
+
</tbody>
|
63
|
+
</table>
|
64
|
+
|
65
|
+
<div class="d-flex flex-row justify-content-end mt-2">
|
66
|
+
<div class="form-actions" data-hook="buttons">
|
67
|
+
<%= button Spree.t('actions.save'), 'save.svg', 'submit', { class: 'btn-outline-success', data: { disable_with: "#{ Spree.t(:saving) }...", turbo_frame: "_top" } } %>
|
68
|
+
</div>
|
69
|
+
</div>
|
70
|
+
<% end %>
|
71
|
+
</div>
|
72
|
+
<% end %>
|
@@ -17,9 +17,11 @@
|
|
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
|
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 %>
|
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 %>
|
23
25
|
<div class="input-group-append">
|
24
26
|
<%= button_tag(class: 'btn btn-outline-success pl-2 pr-1') do %>
|
25
27
|
<%= svg_icon(name: 'arrow-left-right.svg', classes: "icon", width: 14, height: 14) %>
|
@@ -32,7 +34,10 @@
|
|
32
34
|
<td class="text-center">
|
33
35
|
<% if item.persisted? && can?(:update, item) %>
|
34
36
|
<%= form_tag admin_stock_item_path(item), method: :put, class: 'toggle_stock_item_backorderable' do %>
|
35
|
-
<%= check_box_tag 'stock_item[backorderable]', true, item.backorderable?,
|
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; }" %>
|
36
41
|
<% end %>
|
37
42
|
<% else %>
|
38
43
|
<%= 'N/A' %>
|
@@ -0,0 +1,56 @@
|
|
1
|
+
<%= turbo_frame_tag "calendar" do %>
|
2
|
+
<%= form_with url: admin_product_stock_managements_path, method: :get, class: "mt-4" do %>
|
3
|
+
<%= select_year(params[:year]&.to_i || @year, { start_year: 2025, end_year: @year + 3 }, { name: "year", onchange: "this.form.submit()" }) %>
|
4
|
+
<% end %>
|
5
|
+
|
6
|
+
<div class="c-annual-calendar-container mt-2">
|
7
|
+
<div class="c-annual-calendar">
|
8
|
+
<% (1..12).each do |month| %>
|
9
|
+
<%= month_calendar(start_date: Date.new(@year, month, 1), attribute: :from_date, end_attribute: :to_date, events: @events) do |date, events| %>
|
10
|
+
<div class="c-annual-day" data-date="<%= date.strftime '%Y-%m-%d' %>">
|
11
|
+
<%= date.day %>
|
12
|
+
<ul class="p-0 m-0 list-unstyled">
|
13
|
+
<% events = events.sort_by { |e| e.options[:inventory_item]&.variant_id.to_i } %>
|
14
|
+
<% events.each do |event| %>
|
15
|
+
<% inventory_item = event.options[:inventory_item] %>
|
16
|
+
<% synced = inventory_item.quantity_available == @cached_inventory_items[inventory_item.id].quantity_available %>
|
17
|
+
|
18
|
+
<% classes = 'badge ' %>
|
19
|
+
<% classes += synced ? 'badge-primary ' : 'badge-danger ' %>
|
20
|
+
<% classes += 'badge-success ' if inventory_item.prices.any? %>
|
21
|
+
|
22
|
+
<li class="<%= classes %>"
|
23
|
+
data-toggle="modal"
|
24
|
+
data-target="#inventoryItemModal"
|
25
|
+
role="button"
|
26
|
+
onclick="updateModalTurboFrameSrc('<%= admin_product_variant_inventory_item_path(@product, inventory_item.variant_id, inventory_item.id) %>')">
|
27
|
+
<%= inventory_item.quantity_available %>
|
28
|
+
<%= inventory_item.prices.first.display_amount if inventory_item.prices.any? %>
|
29
|
+
</li>
|
30
|
+
<% end %>
|
31
|
+
</ul>
|
32
|
+
</div>
|
33
|
+
<% end %>
|
34
|
+
<% end %>
|
35
|
+
</div>
|
36
|
+
</div>
|
37
|
+
|
38
|
+
<div class="modal fade" id="inventoryItemModal" tabindex="-1" role="dialog">
|
39
|
+
<div class="modal-dialog" role="document">
|
40
|
+
<div class="modal-content">
|
41
|
+
<div class="modal-body">
|
42
|
+
<%= turbo_frame_tag "inventory_item" %>
|
43
|
+
</div>
|
44
|
+
</div>
|
45
|
+
</div>
|
46
|
+
</div>
|
47
|
+
|
48
|
+
<script>
|
49
|
+
function updateModalTurboFrameSrc(url) {
|
50
|
+
let frame = document.getElementById('inventory_item');
|
51
|
+
frame.src = null;
|
52
|
+
frame.innerHTML = `<div class="spinner-border mt-2" role="status"></div>`;
|
53
|
+
frame.src = url
|
54
|
+
}
|
55
|
+
</script>
|
56
|
+
<% end %>
|