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.
- checksums.yaml +4 -4
- data/.github/workflows/test_and_build_gem.yml +16 -2
- data/.gitignore +2 -1
- data/Gemfile.lock +32 -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/organizer/invite_guests_controller.rb +1 -1
- 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/guests_controller.rb +13 -13
- data/app/controllers/spree/api/v2/storefront/queue_cart/line_items_controller.rb +2 -2
- data/app/factory/spree_cm_commissioner/invite_guest_claimed_telegram_message_factory.rb +81 -23
- 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/create_ticket.rb +5 -6
- 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/pin_code_sender.rb +1 -0
- data/app/interactors/spree_cm_commissioner/sms.rb +1 -1
- 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/user_id_token_authenticator.rb +3 -7
- data/app/interactors/spree_cm_commissioner/user_id_token_checker.rb +3 -11
- data/app/interactors/spree_cm_commissioner/user_identity_checker.rb +6 -12
- data/app/interactors/spree_cm_commissioner/user_registration_with_id_token.rb +1 -7
- 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/sms_pin_code_job.rb +1 -1
- 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/mailers/spree/order_mailer_decorator.rb +3 -18
- 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 +1 -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/taxon_kind.rb +1 -1
- data/app/models/concerns/spree_cm_commissioner/tenant_preference.rb +0 -1
- data/app/models/spree_cm_commissioner/block.rb +23 -0
- data/app/models/spree_cm_commissioner/dynamic_field.rb +0 -20
- data/app/models/spree_cm_commissioner/guest.rb +18 -56
- data/app/models/spree_cm_commissioner/guest_dynamic_field.rb +1 -41
- 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 -28
- 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 +8 -10
- data/app/models/spree_cm_commissioner/trip_connection.rb +5 -5
- data/app/models/spree_cm_commissioner/trip_stop.rb +6 -25
- data/app/models/spree_cm_commissioner/user_identity_provider.rb +4 -26
- 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 +9 -14
- data/app/models/spree_cm_commissioner/vendor_decorator.rb +11 -17
- data/app/models/spree_cm_commissioner/vendor_place.rb +9 -3
- data/app/queries/spree_cm_commissioner/trip_query.rb +70 -44
- 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/variant_request_schema.rb +19 -0
- data/app/serializers/spree/v2/storefront/accommodation_serializer.rb +2 -0
- data/app/serializers/spree/v2/storefront/line_item_serializer_decorator.rb +1 -0
- data/app/serializers/spree/v2/tenant/user_serializer.rb +0 -1
- data/app/serializers/spree_cm_commissioner/v2/storefront/dynamic_field_serializer.rb +1 -1
- data/app/services/spree_cm_commissioner/user_authenticator.rb +1 -1
- 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/app/views/spree/admin/tenant_vendors/index.html.erb +2 -9
- data/app/views/spree/admin/tenants/_form.html.erb +0 -9
- data/app/views/spree/admin/tenants/edit.html.erb +1 -2
- data/app/views/spree/admin/tenants/index.html.erb +1 -7
- data/app/views/spree/admin/vendors/_form.html.erb +0 -14
- data/app/views/spree/order_mailer/confirm_email.html.erb +16 -27
- data/app/views/spree_cm_commissioner/layouts/order_mailer.html.erb +1 -5
- data/app/views/spree_cm_commissioner/order_mailer/_mailer_stylesheets.html.erb +4 -41
- data/config/initializers/paper_trail.rb +1 -0
- data/config/initializers/spree_permitted_attributes.rb +5 -0
- data/config/locales/en.yml +1 -5
- data/config/routes.rb +21 -2
- data/db/migrate/20240202080634_update_counter_cache_of_vehicle_type.rb +3 -1
- 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/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 +15 -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/user_identity_provider_factory.rb +1 -1
- 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 +8 -0
- data/lib/spree_cm_commissioner/trip_result.rb +5 -3
- 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 +141 -38
- data/app/assets/images/mailer/mail.png +0 -0
- data/app/assets/images/mailer/tenant_phone.png +0 -0
- data/app/assets/images/mailer/tenant_user.png +0 -0
- 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/app/views/spree_cm_commissioner/order_mailer/tenant/_customer_info.html.erb +0 -42
- data/app/views/spree_cm_commissioner/order_mailer/tenant/_footer.html.erb +0 -25
- data/app/views/spree_cm_commissioner/order_mailer/tenant/_greeting.html.erb +0 -19
- data/app/views/spree_cm_commissioner/order_mailer/tenant/_support_contact.html.erb +0 -33
- data/db/migrate/20250709073455_add_email_fields_to_spree_vendors.rb +0 -6
- data/db/migrate/20250715103333_remove_indexes_from_cm_user_identity_providers.rb +0 -13
- data/db/migrate/20250718071620_add_data_fill_stage_to_dynamic_fields.rb +0 -5
- 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,16 +1,26 @@
|
|
1
|
-
#
|
1
|
+
# 🎟️ --- [TICKET CLAIMED] ---
|
2
2
|
#
|
3
|
-
#
|
4
|
-
#
|
5
|
-
#
|
3
|
+
# Order Number:
|
4
|
+
# <code>R621016753</code>
|
5
|
+
#
|
6
|
+
# ✅ <b>Ticket Successfully Claimed!</b>
|
6
7
|
#
|
8
|
+
# [ x1 ]
|
9
|
+
# <b>5km Running Ticket</b>
|
10
|
+
# <i>👉 Distance: 5km, T-shirt: M</i>
|
11
|
+
# <i>🗓️ Nov 15, 2023</i>
|
12
|
+
# <i>🏪 Temple Run with Sai</i>
|
13
|
+
#
|
14
|
+
# [ x2 ]
|
7
15
|
# <b>5km Running Ticket</b>
|
8
|
-
# Quantity: 1
|
9
16
|
# <i>👉 Distance: 5km, T-shirt: S</i>
|
10
17
|
# <i>🗓️ Nov 15, 2023 -> Nov 17, 2023</i>
|
18
|
+
# <i>🏪 Temple Run with Sai</i>
|
11
19
|
#
|
12
|
-
#
|
13
|
-
#
|
20
|
+
# <b>🙍 Claimed By</b>
|
21
|
+
# Name: Vaneath Awesome
|
22
|
+
# Tel: <code>+85570760548</code>
|
23
|
+
# Email: <code>admin_dev@cm.com</code>
|
14
24
|
|
15
25
|
module SpreeCmCommissioner
|
16
26
|
class InviteGuestClaimedTelegramMessageFactory < TelegramMessageFactory
|
@@ -26,37 +36,85 @@ module SpreeCmCommissioner
|
|
26
36
|
end
|
27
37
|
|
28
38
|
def selected_line_items
|
29
|
-
|
39
|
+
return order.line_items.for_vendor(vendor) if vendor.present?
|
40
|
+
|
41
|
+
order.line_items
|
30
42
|
end
|
31
43
|
|
32
44
|
# override
|
33
45
|
def body
|
34
46
|
text = []
|
47
|
+
text << "Order Number:\n<code>#{order.number}</code>\n"
|
48
|
+
text << "\n✅ <b>Ticket Successfully Claimed!</b>\n"
|
49
|
+
text << selected_line_items.map { |item| line_item_content(item) }.compact.join("\n\n")
|
50
|
+
text.compact.join("\n")
|
51
|
+
end
|
35
52
|
|
36
|
-
|
37
|
-
text
|
38
|
-
text << "Tel: #{inline_code(guest.phone_number)}"
|
39
|
-
text << ''
|
40
|
-
|
41
|
-
selected_line_items.each do |item|
|
42
|
-
text << bold(item.product.name.to_s)
|
43
|
-
text << "🎟️ Quantity: #{item.quantity}"
|
44
|
-
text << italic("👉 #{item.options_text}") if item.options_text.present?
|
45
|
-
text << italic(pretty_date_for(item)) if item.date_present?
|
46
|
-
text << ''
|
47
|
-
end
|
53
|
+
def line_item_content(line_item)
|
54
|
+
text = []
|
48
55
|
|
49
|
-
text << bold(
|
50
|
-
text <<
|
56
|
+
text << bold(line_item.product.name.to_s)
|
57
|
+
text << "Quantity: #{line_item.quantity}"
|
58
|
+
text << italic("👉 #{line_item.options_text}") if line_item.options_text.present?
|
59
|
+
text << italic(pretty_date_for(line_item)) if pretty_date_for(line_item).present?
|
60
|
+
text << italic("🏪 #{line_item.vendor.name}") if line_item.vendor&.name.present? && vendor.blank?
|
51
61
|
|
52
62
|
text.compact.join("\n")
|
53
63
|
end
|
54
64
|
|
55
65
|
def pretty_date_for(line_item)
|
66
|
+
return nil unless line_item.date_present?
|
67
|
+
|
56
68
|
from_date = pretty_date(line_item.from_date)
|
57
69
|
to_date = pretty_date(line_item.to_date)
|
58
70
|
|
59
|
-
from_date == to_date
|
71
|
+
if from_date == to_date
|
72
|
+
"🗓️ #{from_date}"
|
73
|
+
else
|
74
|
+
"🗓️ #{from_date} -> #{to_date}"
|
75
|
+
end
|
76
|
+
end
|
77
|
+
|
78
|
+
# override
|
79
|
+
def footer
|
80
|
+
text = []
|
81
|
+
|
82
|
+
text << bold('🙍 Claimed By')
|
83
|
+
text << "Name: #{guest.first_name} #{guest.last_name}" if guest.first_name.present? || guest.last_name.present?
|
84
|
+
text << "Tel: #{inline_code(guest.intel_phone_number)}" if guest.intel_phone_number.present?
|
85
|
+
|
86
|
+
if show_details_link && order.guests.any?
|
87
|
+
text << ''
|
88
|
+
text << 'View Tickets:'
|
89
|
+
text += generate_guests_links(order.guests)
|
90
|
+
end
|
91
|
+
|
92
|
+
text.compact.join("\n")
|
93
|
+
end
|
94
|
+
|
95
|
+
# Result:
|
96
|
+
# | No. A24 | No. A24 |
|
97
|
+
# | No. A24 | No. A24 |
|
98
|
+
# | No. A24 | No. A24 |
|
99
|
+
# | No. A24 | No. A24 |
|
100
|
+
# | No. A24 | No. A24 |
|
101
|
+
# | No. A24 |
|
102
|
+
def generate_guests_links(guests, guests_per_row = 2)
|
103
|
+
rows = (guests.size.to_f / guests_per_row).ceil
|
104
|
+
formatted_rows = []
|
105
|
+
|
106
|
+
rows.times do |i|
|
107
|
+
row_guests = guests.slice(i * guests_per_row, guests_per_row)
|
108
|
+
formatted_row = row_guests.map do |guest|
|
109
|
+
button_label = guest.seat_number.present? ? "No. #{guest.seat_number}" : "No. #{guest.formatted_bib_number || 'N/A'}"
|
110
|
+
link = Rails.application.routes.url_helpers.guest_cards_url(guest.token)
|
111
|
+
"| <a href='#{link}'>#{button_label}</a>"
|
112
|
+
end.join(' ')
|
113
|
+
|
114
|
+
formatted_rows << ("#{formatted_row} |")
|
115
|
+
end
|
116
|
+
|
117
|
+
formatted_rows
|
60
118
|
end
|
61
119
|
end
|
62
120
|
end
|
@@ -0,0 +1,37 @@
|
|
1
|
+
module SpreeCmCommissioner
|
2
|
+
module Accommodations
|
3
|
+
class Find
|
4
|
+
attr_reader :from_date, :to_date, :state_id, :number_of_guests
|
5
|
+
|
6
|
+
def initialize(from_date:, to_date:, state_id:, number_of_adults:, number_of_kids:)
|
7
|
+
@from_date = from_date
|
8
|
+
@to_date = to_date
|
9
|
+
@state_id = state_id
|
10
|
+
@number_of_guests = number_of_adults.to_i + number_of_kids.to_i
|
11
|
+
end
|
12
|
+
|
13
|
+
def execute
|
14
|
+
scope
|
15
|
+
.where(default_state_id: state_id)
|
16
|
+
.where(inventory_items: { inventory_date: stay_dates })
|
17
|
+
.where('CAST(spree_variants.public_metadata->\'cm_options\'->>\'number-of-adults\' AS INTEGER) +
|
18
|
+
CAST(spree_variants.public_metadata->\'cm_options\'->>\'number-of-kids\' AS INTEGER) >= ?', number_of_guests
|
19
|
+
)
|
20
|
+
.where('inventory_items.quantity_available > 0')
|
21
|
+
.distinct
|
22
|
+
end
|
23
|
+
|
24
|
+
private
|
25
|
+
|
26
|
+
def scope
|
27
|
+
Spree::Vendor
|
28
|
+
.joins(variants: :inventory_items)
|
29
|
+
.where(primary_product_type: :accommodation, state: :active)
|
30
|
+
end
|
31
|
+
|
32
|
+
def stay_dates
|
33
|
+
from_date..to_date
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
37
|
+
end
|
@@ -0,0 +1,32 @@
|
|
1
|
+
module SpreeCmCommissioner
|
2
|
+
module Accommodations
|
3
|
+
class FindVariant
|
4
|
+
attr_reader :vendor_id, :from_date, :to_date, :number_of_guests
|
5
|
+
|
6
|
+
def initialize(vendor_id:, from_date:, to_date:, number_of_adults:, number_of_kids:)
|
7
|
+
@vendor_id = vendor_id
|
8
|
+
@from_date = from_date
|
9
|
+
@to_date = to_date
|
10
|
+
@number_of_guests = number_of_adults.to_i + number_of_kids.to_i
|
11
|
+
end
|
12
|
+
|
13
|
+
def execute
|
14
|
+
Spree::Variant
|
15
|
+
.joins(:inventory_items)
|
16
|
+
.where(vendor_id: vendor_id)
|
17
|
+
.where(inventory_items: { inventory_date: stay_dates })
|
18
|
+
.where('CAST(public_metadata->\'cm_options\'->>\'number-of-adults\' AS INTEGER) +
|
19
|
+
CAST(public_metadata->\'cm_options\'->>\'number-of-kids\' AS INTEGER) >= ?', number_of_guests
|
20
|
+
)
|
21
|
+
.where('inventory_items.quantity_available > 0')
|
22
|
+
.distinct
|
23
|
+
end
|
24
|
+
|
25
|
+
private
|
26
|
+
|
27
|
+
def stay_dates
|
28
|
+
from_date..to_date
|
29
|
+
end
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
@@ -9,8 +9,7 @@ module SpreeCmCommissioner
|
|
9
9
|
set_option_value
|
10
10
|
create_variant
|
11
11
|
create_stock_item
|
12
|
-
|
13
|
-
upload_image_to(@variant)
|
12
|
+
upload_image
|
14
13
|
create_place
|
15
14
|
end
|
16
15
|
end
|
@@ -78,13 +77,13 @@ module SpreeCmCommissioner
|
|
78
77
|
context.fail!(message: @stock_item.errors.full_messages.join(', '))
|
79
78
|
end
|
80
79
|
|
81
|
-
def
|
80
|
+
def upload_image
|
82
81
|
return if context.params[:ticket_image].blank?
|
83
82
|
|
84
|
-
image =
|
85
|
-
return if image.save
|
83
|
+
@image = @ticket.master.images.new(attachment: context.params[:ticket_image])
|
84
|
+
return if @image.save
|
86
85
|
|
87
|
-
context.fail!(message: image.errors.full_messages.join(', '))
|
86
|
+
context.fail!(message: @image.errors.full_messages.join(', '))
|
88
87
|
end
|
89
88
|
|
90
89
|
def create_place
|
@@ -0,0 +1,40 @@
|
|
1
|
+
module SpreeCmCommissioner
|
2
|
+
class EnsureCorrectProductType < BaseInteractor
|
3
|
+
def call
|
4
|
+
Spree::Product
|
5
|
+
.left_joins(variants_including_master: %i[inventory_items line_items])
|
6
|
+
.where(
|
7
|
+
'spree_variants.product_type IS NULL OR
|
8
|
+
spree_variants.product_type != spree_products.product_type OR
|
9
|
+
|
10
|
+
cm_inventory_items.product_type IS NULL OR
|
11
|
+
cm_inventory_items.product_type != spree_products.product_type OR
|
12
|
+
|
13
|
+
spree_line_items.product_type IS NULL OR
|
14
|
+
spree_line_items.product_type != spree_products.product_type OR
|
15
|
+
|
16
|
+
spree_products.product_type IS NOT NULL
|
17
|
+
'
|
18
|
+
)
|
19
|
+
.distinct.find_each do |product|
|
20
|
+
sync_product_type_for(product)
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
def sync_product_type_for(product)
|
25
|
+
product_type = Spree::Variant.product_types[product.product_type]
|
26
|
+
|
27
|
+
product.variants_including_master
|
28
|
+
.where('spree_variants.product_type IS NULL OR spree_variants.product_type != ?', product_type)
|
29
|
+
.update_all(product_type: product_type) # rubocop:disable Rails/SkipsModelValidations
|
30
|
+
|
31
|
+
product.line_items
|
32
|
+
.where('spree_line_items.product_type IS NULL OR spree_line_items.product_type != ?', product_type)
|
33
|
+
.update_all(product_type: product_type) # rubocop:disable Rails/SkipsModelValidations
|
34
|
+
|
35
|
+
product.inventory_items
|
36
|
+
.where('cm_inventory_items.product_type IS NULL OR cm_inventory_items.product_type != ?', product_type)
|
37
|
+
.update_all(product_type: product_type) # rubocop:disable Rails/SkipsModelValidations
|
38
|
+
end
|
39
|
+
end
|
40
|
+
end
|
@@ -0,0 +1,25 @@
|
|
1
|
+
module SpreeCmCommissioner
|
2
|
+
class InventoryItemSyncer < BaseInteractor
|
3
|
+
# inventory_id_and_quantities = [{ inventory_id: inventory_item1.id, quantity: 5 } ]
|
4
|
+
delegate :inventory_id_and_quantities, to: :context
|
5
|
+
|
6
|
+
def call
|
7
|
+
ActiveRecord::Base.transaction do
|
8
|
+
inventory_items.each do |inventory_item|
|
9
|
+
quantity = inventory_id_and_quantities.find { |item| item[:inventory_id] == inventory_item.id }&.dig(:quantity) || 0
|
10
|
+
adjust_quantity_available(inventory_item, quantity)
|
11
|
+
end
|
12
|
+
end
|
13
|
+
end
|
14
|
+
|
15
|
+
private
|
16
|
+
|
17
|
+
def adjust_quantity_available(inventory_item, quantity)
|
18
|
+
inventory_item.update!(quantity_available: inventory_item.quantity_available + quantity)
|
19
|
+
end
|
20
|
+
|
21
|
+
def inventory_items
|
22
|
+
@inventory_items ||= InventoryItem.where(id: inventory_id_and_quantities.pluck(:inventory_id))
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
@@ -42,7 +42,7 @@ module SpreeCmCommissioner
|
|
42
42
|
end
|
43
43
|
|
44
44
|
def sms_options
|
45
|
-
opts = { to: context.to, body: context.body }
|
45
|
+
opts = { from: context.from, to: context.to, body: context.body }
|
46
46
|
opts[:to] = sanitize(opts[:to]) if opts[:to].present?
|
47
47
|
opts[:from] = from_number
|
48
48
|
opts
|
@@ -0,0 +1,44 @@
|
|
1
|
+
module SpreeCmCommissioner
|
2
|
+
module Stock
|
3
|
+
class InventoryItemResetter < BaseInteractor
|
4
|
+
delegate :inventory_item, to: :context
|
5
|
+
|
6
|
+
def call
|
7
|
+
max_capacity = variant_total_inventory
|
8
|
+
total_purchases = variant_total_purchases
|
9
|
+
quantity_available = [max_capacity - total_purchases, 0].max
|
10
|
+
|
11
|
+
updated = inventory_item.update(max_capacity: max_capacity, quantity_available: quantity_available)
|
12
|
+
return context.fail!(message: 'Failed to update inventory item', errors: inventory_item.errors.full_messages) unless updated
|
13
|
+
|
14
|
+
clear_inventory_cache
|
15
|
+
end
|
16
|
+
|
17
|
+
def variant_total_inventory
|
18
|
+
# for shipment, total_on_hand is not orignal stock. shipment does subtract the stock.
|
19
|
+
# to get desire result, we need to add to total_purchase.
|
20
|
+
if inventory_item.variant.delivery_required?
|
21
|
+
inventory_item.variant.total_on_hand.to_i + variant_total_purchases
|
22
|
+
else
|
23
|
+
inventory_item.variant.total_on_hand.to_i
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
27
|
+
def variant_total_purchases
|
28
|
+
scope = inventory_item.variant.complete_line_items
|
29
|
+
|
30
|
+
if inventory_item.permanent_stock?
|
31
|
+
scope.where('? BETWEEN from_date AND to_date', inventory_item.inventory_date).sum(:quantity).to_i
|
32
|
+
else
|
33
|
+
scope.sum(:quantity).to_i
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
def clear_inventory_cache
|
38
|
+
SpreeCmCommissioner.redis_pool.with do |redis|
|
39
|
+
redis.del(inventory_item.redis_key)
|
40
|
+
end
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
44
|
+
end
|
@@ -0,0 +1,13 @@
|
|
1
|
+
module SpreeCmCommissioner
|
2
|
+
module Stock
|
3
|
+
class InventoryItemsAdjuster < BaseInteractor
|
4
|
+
delegate :variant, :quantity, to: :context
|
5
|
+
|
6
|
+
def call
|
7
|
+
variant.inventory_items.active.find_each do |inventory_item|
|
8
|
+
inventory_item.adjust_quantity!(quantity)
|
9
|
+
end
|
10
|
+
end
|
11
|
+
end
|
12
|
+
end
|
13
|
+
end
|
@@ -0,0 +1,15 @@
|
|
1
|
+
module SpreeCmCommissioner
|
2
|
+
module Stock
|
3
|
+
class InventoryItemsGenerator < BaseInteractor
|
4
|
+
delegate :variant, to: :context
|
5
|
+
|
6
|
+
def call
|
7
|
+
if variant.permanent_stock?
|
8
|
+
SpreeCmCommissioner::Stock::PermanentInventoryItemsGenerator.call(variant_ids: [variant.id])
|
9
|
+
else
|
10
|
+
variant.create_default_non_permanent_inventory_item! unless variant.default_inventory_item_exist?
|
11
|
+
end
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
@@ -0,0 +1,75 @@
|
|
1
|
+
module SpreeCmCommissioner
|
2
|
+
module Stock
|
3
|
+
class PermanentInventoryItemsGenerator < BaseInteractor
|
4
|
+
delegate :variant_ids, to: :context
|
5
|
+
|
6
|
+
def variants_per_batch = 1000
|
7
|
+
|
8
|
+
def pre_inventory_days_for(variant)
|
9
|
+
context.pre_inventory_days || variant.pre_inventory_days
|
10
|
+
end
|
11
|
+
|
12
|
+
def call
|
13
|
+
variants.in_batches(of: variants_per_batch) do |batch|
|
14
|
+
generate_inventory_items_for_batch(batch)
|
15
|
+
end
|
16
|
+
end
|
17
|
+
|
18
|
+
private
|
19
|
+
|
20
|
+
def generate_inventory_items_for_batch(batch)
|
21
|
+
total_on_hand_by_variant = total_on_hand_for(batch)
|
22
|
+
batch.each do |variant|
|
23
|
+
count_on_hand = total_on_hand_by_variant[variant.id] || 0
|
24
|
+
generate_inventory_items_for_variant(variant, count_on_hand)
|
25
|
+
end
|
26
|
+
end
|
27
|
+
|
28
|
+
def generate_inventory_items_for_variant(variant, count_on_hand)
|
29
|
+
inventory_dates_for(variant).each do |inventory_date|
|
30
|
+
next if inventory_exist?(variant, inventory_date)
|
31
|
+
|
32
|
+
create_inventory_item(variant, inventory_date, count_on_hand)
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
36
|
+
def inventory_dates_for(variant)
|
37
|
+
start_date = Time.zone.tomorrow
|
38
|
+
end_date = Time.zone.today + pre_inventory_days_for(variant)
|
39
|
+
|
40
|
+
(start_date..end_date)
|
41
|
+
end
|
42
|
+
|
43
|
+
def inventory_exist?(variant, inventory_date)
|
44
|
+
variant.inventory_items.exists?(inventory_date: inventory_date)
|
45
|
+
end
|
46
|
+
|
47
|
+
def create_inventory_item(variant, inventory_date, count_on_hand)
|
48
|
+
variant.inventory_items.create!(
|
49
|
+
inventory_date: inventory_date,
|
50
|
+
quantity_available: count_on_hand,
|
51
|
+
max_capacity: count_on_hand,
|
52
|
+
product_type: variant.product_type
|
53
|
+
)
|
54
|
+
end
|
55
|
+
|
56
|
+
# Returns a hash: { variant_id => total_on_hand, ... }
|
57
|
+
def total_on_hand_for(variants)
|
58
|
+
variant_ids = variants.pluck(:id)
|
59
|
+
|
60
|
+
Spree::StockItem
|
61
|
+
.joins(:stock_location)
|
62
|
+
.where(deleted_at: nil, variant_id: variant_ids)
|
63
|
+
.where(spree_stock_locations: { active: true })
|
64
|
+
.group(:variant_id)
|
65
|
+
.sum(:count_on_hand)
|
66
|
+
end
|
67
|
+
|
68
|
+
def variants
|
69
|
+
scope = Spree::Variant.active.with_permanent_stock.where(is_master: false)
|
70
|
+
scope = scope.where(id: variant_ids) if variant_ids.present?
|
71
|
+
scope
|
72
|
+
end
|
73
|
+
end
|
74
|
+
end
|
75
|
+
end
|
@@ -0,0 +1,32 @@
|
|
1
|
+
module SpreeCmCommissioner
|
2
|
+
module Stock
|
3
|
+
class StockMovementCreator < BaseInteractor
|
4
|
+
delegate :variant_id, :stock_location_id, :current_store, :stock_movement_params, to: :context
|
5
|
+
|
6
|
+
def call
|
7
|
+
variant = current_store.variants.find(variant_id)
|
8
|
+
|
9
|
+
return context.fail!(message: Spree.t(:doesnt_track_inventory)) unless variant.track_inventory?
|
10
|
+
|
11
|
+
stock_location = Spree::StockLocation.find(stock_location_id)
|
12
|
+
stock_movement = stock_location.stock_movements.build(stock_movement_params)
|
13
|
+
stock_movement.stock_item = stock_location.set_up_stock_item(variant)
|
14
|
+
|
15
|
+
if stock_movement.save
|
16
|
+
adjust_inventory_items_async(variant_id, stock_movement.quantity)
|
17
|
+
context.stock_movement = stock_movement
|
18
|
+
else
|
19
|
+
context.fail!(message: stock_movement.errors.full_messages.join(', '))
|
20
|
+
end
|
21
|
+
end
|
22
|
+
|
23
|
+
private
|
24
|
+
|
25
|
+
def adjust_inventory_items_async(variant_id, quantity)
|
26
|
+
CmAppLogger.log(label: "#{self.class.name}#adjust_inventory_items_async", data: { variant_id: variant_id, quantity: quantity }) do
|
27
|
+
SpreeCmCommissioner::Stock::InventoryItemsAdjusterJob.perform_later(variant_id: variant_id, quantity: quantity)
|
28
|
+
end
|
29
|
+
end
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
module SpreeCmCommissioner
|
2
2
|
class UserIdTokenAuthenticator < BaseInteractor
|
3
|
-
# :id_token
|
3
|
+
# :id_token
|
4
4
|
def call
|
5
5
|
context.user = if checker.user.nil?
|
6
6
|
register_user
|
@@ -14,11 +14,7 @@ module SpreeCmCommissioner
|
|
14
14
|
end
|
15
15
|
|
16
16
|
def register_user
|
17
|
-
register_context = SpreeCmCommissioner::UserRegistrationWithIdToken.call(
|
18
|
-
id_token: context.id_token,
|
19
|
-
tenant_id: context.tenant_id
|
20
|
-
)
|
21
|
-
|
17
|
+
register_context = SpreeCmCommissioner::UserRegistrationWithIdToken.call(id_token: context.id_token)
|
22
18
|
register_context.user
|
23
19
|
end
|
24
20
|
|
@@ -31,7 +27,7 @@ module SpreeCmCommissioner
|
|
31
27
|
end
|
32
28
|
|
33
29
|
def checker
|
34
|
-
@checker ||= SpreeCmCommissioner::UserIdTokenChecker.call(id_token: context.id_token
|
30
|
+
@checker ||= SpreeCmCommissioner::UserIdTokenChecker.call(id_token: context.id_token)
|
35
31
|
@checker
|
36
32
|
end
|
37
33
|
end
|
@@ -1,9 +1,6 @@
|
|
1
1
|
module SpreeCmCommissioner
|
2
2
|
class UserIdTokenChecker < BaseInteractor
|
3
|
-
#
|
4
|
-
# context.id_token
|
5
|
-
# context.tenant_id (optional)
|
6
|
-
|
3
|
+
# :id_token
|
7
4
|
def call
|
8
5
|
firebase_id_token_context = SpreeCmCommissioner::FirebaseIdTokenProvider.call(id_token: context.id_token)
|
9
6
|
|
@@ -14,14 +11,9 @@ module SpreeCmCommissioner
|
|
14
11
|
end
|
15
12
|
end
|
16
13
|
|
17
|
-
# :identity_type, :sub
|
14
|
+
# :identity_type, :sub
|
18
15
|
def validate_user_by_provider(provider)
|
19
|
-
identity_checker = SpreeCmCommissioner::UserIdentityChecker.call(
|
20
|
-
identity_type: provider[:identity_type],
|
21
|
-
sub: provider[:sub],
|
22
|
-
tenant_id: context.tenant_id
|
23
|
-
)
|
24
|
-
|
16
|
+
identity_checker = SpreeCmCommissioner::UserIdentityChecker.call(provider)
|
25
17
|
if identity_checker.success?
|
26
18
|
context.user = identity_checker.user
|
27
19
|
else
|
@@ -1,10 +1,6 @@
|
|
1
1
|
module SpreeCmCommissioner
|
2
2
|
class UserIdentityChecker < BaseInteractor
|
3
|
-
#
|
4
|
-
# context.identity_type
|
5
|
-
# context.sub
|
6
|
-
# context.tenant_id (optional)
|
7
|
-
|
3
|
+
# :identity_type, :sub
|
8
4
|
def call
|
9
5
|
load_user
|
10
6
|
|
@@ -15,14 +11,12 @@ module SpreeCmCommissioner
|
|
15
11
|
end
|
16
12
|
|
17
13
|
def load_user
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
.where(spree_users: { tenant_id: context.tenant_id })
|
23
|
-
.first
|
14
|
+
user_identity_provider = UserIdentityProvider.where(
|
15
|
+
identity_type: context.identity_type,
|
16
|
+
sub: context.sub
|
17
|
+
).first
|
24
18
|
|
25
|
-
context.user = user_identity_provider
|
19
|
+
context.user = (user_identity_provider.user if user_identity_provider.present?)
|
26
20
|
end
|
27
21
|
end
|
28
22
|
end
|
@@ -15,13 +15,7 @@ module SpreeCmCommissioner
|
|
15
15
|
end
|
16
16
|
|
17
17
|
def register_user!(name, email)
|
18
|
-
user = Spree.user_class.new(
|
19
|
-
password: SecureRandom.base64(16),
|
20
|
-
email: email,
|
21
|
-
tenant_id: context.tenant_id,
|
22
|
-
**name_attributes(name)
|
23
|
-
)
|
24
|
-
|
18
|
+
user = Spree.user_class.new(password: SecureRandom.base64(16), email: email, **name_attributes(name))
|
25
19
|
if user.save(validate: false)
|
26
20
|
context.user = user
|
27
21
|
else
|
@@ -1,5 +1,25 @@
|
|
1
1
|
module SpreeCmCommissioner
|
2
2
|
class ApplicationJob < ::ApplicationJob
|
3
3
|
queue_as :default
|
4
|
+
|
5
|
+
around_perform :log_exceptions
|
6
|
+
|
7
|
+
private
|
8
|
+
|
9
|
+
def log_exceptions
|
10
|
+
yield
|
11
|
+
rescue StandardError => e
|
12
|
+
CmAppLogger.log(
|
13
|
+
label: "#{self.class.name} failed",
|
14
|
+
data: {
|
15
|
+
error_class: e.class.name,
|
16
|
+
error_message: e.message,
|
17
|
+
arguments: arguments.inspect,
|
18
|
+
backtrace: e.backtrace&.first(5)&.join("\n")
|
19
|
+
}
|
20
|
+
)
|
21
|
+
|
22
|
+
raise # Re-raise the exception to let Sidekiq handle retries or failure
|
23
|
+
end
|
4
24
|
end
|
5
25
|
end
|
@@ -2,5 +2,25 @@
|
|
2
2
|
module SpreeCmCommissioner
|
3
3
|
class ApplicationUniqueJob < ::ApplicationUniqueJob
|
4
4
|
queue_as :default
|
5
|
+
|
6
|
+
around_perform :log_exceptions
|
7
|
+
|
8
|
+
private
|
9
|
+
|
10
|
+
def log_exceptions
|
11
|
+
yield
|
12
|
+
rescue StandardError => e
|
13
|
+
CmAppLogger.log(
|
14
|
+
label: "#{self.class.name} failed",
|
15
|
+
data: {
|
16
|
+
error_class: e.class.name,
|
17
|
+
error_message: e.message,
|
18
|
+
arguments: arguments.inspect,
|
19
|
+
backtrace: e.backtrace&.first(5)&.join("\n")
|
20
|
+
}
|
21
|
+
)
|
22
|
+
|
23
|
+
raise # Re-raise the exception to let Sidekiq handle retries or failure
|
24
|
+
end
|
5
25
|
end
|
6
26
|
end
|