spree_cm_commissioner 2.0.0.pre.pre → 2.0.0

data/app/queries/spree_cm_commissioner/variant_availability/non_permanent_stock_query.rb

@@ -0,0 +1,45 @@
+module SpreeCmCommissioner
+  module VariantAvailability
+    class NonPermanentStockQuery
+      attr_reader :variant, :except_line_item_id, :error_message
+
+      def initialize(variant:, except_line_item_id: nil)
+        @variant = variant
+        @except_line_item_id = except_line_item_id
+        @error_message = nil
+      end
+
+      def available?(quantity)
+        reserve_variants =
+          Spree::LineItem
+          .complete
+          .select('(SUM(DISTINCT spree_stock_items.count_on_hand) - SUM(spree_line_items.quantity)) AS available_quantity')
+          .joins(variant: :stock_items)
+          .where(variant_id: variant.id)
+          .where.not(id: except_line_item_id)
+          .group(:variant_id)
+
+        # there is a case when variant does not have any purchaces yet, it will return empty & always available true.
+        # in this case, we check with stock items directly.
+
+        available_quantity = if reserve_variants.any?
+                               reserve_variants.sum(&:available_quantity)
+                             else
+                               variant.stock_items.sum(:count_on_hand)
+                             end
+        if available_quantity >= quantity
+          true
+        elsif available_quantity == 1
+          @error_message = I18n.t('variant_availability.item_available_instock')
+          false
+        elsif available_quantity <= 0
+          @error_message = I18n.t('variant_availability.items_out_of_stock')
+          false
+        else
+          @error_message = I18n.t('variant_availability.items_available_instock', available_quantity: available_quantity)
+          false
+        end
+      end
+    end
+  end
+end

data/app/queries/spree_cm_commissioner/variant_availability/permanent_stock_query.rb

@@ -0,0 +1,55 @@
+module SpreeCmCommissioner
+  module VariantAvailability
+    class PermanentStockQuery
+      attr_reader :variant, :from_date, :to_date, :except_line_item_id
+
+      def initialize(variant:, from_date:, to_date:, except_line_item_id: nil)
+        @variant = variant
+        @from_date = from_date
+        @to_date = to_date
+        @except_line_item_id = except_line_item_id
+      end
+
+      def available?(quantity)
+        (from_date..from_date).all? do |booking_date|
+          booked_date_quantity[booking_date].nil? ||
+            (booked_date_quantity[booking_date] - quantity) >= 0
+        end
+      end
+
+      def booked_date_quantity
+        dates_sql = ApplicationRecord.sanitize_sql_array(
+          [
+            'SELECT date FROM generate_series(?::date, ?::date, ?) AS date',
+            from_date,
+            to_date,
+            date_interval
+          ]
+        )
+
+        @booked_variants ||=
+          Spree::LineItem
+          .complete
+          .select(
+            '(SUM(DISTINCT spree_stock_items.count_on_hand) - SUM(spree_line_items.quantity)) AS available_quantity',
+            'dates.date AS reservation_date'
+          )
+          .joins(variant: :stock_items)
+          .where(variant_id: variant.id)
+          .where.not(id: except_line_item_id)
+          .joins("INNER JOIN (#{dates_sql}) dates ON dates.date >= spree_line_items.from_date AND dates.date < spree_line_items.to_date")
+          .group(:variant_id, :reservation_date)
+          .order(:reservation_date)
+          .each_with_object({}) do |record, hash|
+            hash[record.reservation_date.to_date] = record.available_quantity
+          end
+      end
+
+      # override this for product that have
+      # different date time interval than 1 day.
+      def date_interval
+        '1 day'
+      end
+    end
+  end
+end

data/app/request_schemas/spree_cm_commissioner/accommodation_request_schema.rb

@@ -3,9 +3,6 @@ module SpreeCmCommissioner
     params do
       required(:from_date).value(:date)
       required(:to_date).value(:date)
-      required(:province_id).value(:integer)
-      required(:adult).value(:integer)
-      required(:children).value(:integer)
     end
 
     rule(:from_date, :to_date) do

data/app/request_schemas/spree_cm_commissioner/application_request_schema.rb

@@ -11,7 +11,7 @@ module SpreeCmCommissioner
     end
 
     def error_message
-      errors.map { |error| "#{error.path.join(', ')}: #{error.text}" }.to_sentence
+      errors.map(&:text).join(', ')
     end
 
     private

data/app/serializers/spree/v2/organizer/invite_crews_serializer.rb

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Organizer
+      class InviteCrewsSerializer < BaseSerializer
+        attributes :token, :expires_at
+        belongs_to :taxon, serializer: Spree::V2::Organizer::TaxonSerializer
+        belongs_to :inviter, serializer: Spree::V2::Organizer::UserSerializer
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/storefront/accommodation_serializer.rb

@@ -9,12 +9,10 @@ module Spree
 
         attributes :total_inventory, :service_availabilities
 
-        # Deprecated
         attribute :total_booking do |vendor|
           vendor.respond_to?(:total_booking) ? vendor.total_booking : 0
         end
 
-        # Deprecated
         attribute :remaining do |vendor|
           vendor.respond_to?(:remaining) ? vendor.remaining : vendor.total_inventory
         end

data/app/serializers/spree/v2/storefront/line_item_serializer_decorator.rb

@@ -4,7 +4,6 @@ module Spree
       module LineItemSerializerDecorator
         def self.prepended(base)
           base.attributes :from_date, :to_date, :need_confirmation, :product_type, :event_status, :amount, :display_amount,
-                          :checkin_date, :checkout_date,
                           :number, :qr_data,
                           :kyc, :kyc_fields, :remaining_total_guests, :number_of_guests,
                           :completion_steps, :available_social_contact_platforms, :allow_anonymous_booking, :discontinue_on,

data/app/serializers/spree/v2/tenant/user_serializer.rb

@@ -11,6 +11,7 @@ module Spree
         has_one :profile, serializer: Spree::V2::Tenant::AssetSerializer
         has_many :device_tokens, serializer: Spree::V2::Tenant::UserDeviceTokenSerializer
         has_many :spree_roles, serializer: Spree::V2::Tenant::RoleSerializer
+        has_many :user_identity_providers, serializer: Spree::V2::Tenant::UserIdentityProviderSerializer
 
         attribute :store_credits, &:total_available_store_credit
 

data/app/serializers/spree_cm_commissioner/v2/operator/dashboard_crew_event_serializer.rb

@@ -2,7 +2,10 @@ module SpreeCmCommissioner
   module V2
     module Operator
       class DashboardCrewEventSerializer < BaseSerializer
-        attributes :id, :name, :permalink, :from_date, :to_date, :updated_at
+        attributes :id, :name, :permalink,
+                   :from_date, :to_date,
+                   :check_in_flows,
+                   :updated_at
 
         has_many :children_classifications, serializer: :classification
         has_one :category_icon, serializer: SpreeCmCommissioner::V2::Storefront::AssetSerializer

data/app/serializers/spree_cm_commissioner/v2/storefront/dynamic_field_option_serializer.rb

@@ -2,9 +2,7 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class DynamicFieldOptionSerializer < BaseSerializer
-        set_type :dynamic_field_option
-
-        attributes :id, :value, :dynamic_field_id, :created_at, :updated_at
+        attributes :id, :value, :dynamic_field_id, :status, :created_at, :updated_at, :position
       end
     end
   end

data/app/serializers/spree_cm_commissioner/v2/storefront/dynamic_field_serializer.rb

@@ -2,9 +2,7 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class DynamicFieldSerializer < BaseSerializer
-        set_type :dynamic_field
-
-        attributes :id, :label, :data_type, :vendor_id, :created_at, :updated_at
+        attributes :id, :label, :data_type, :vendor_id, :multiple_select, :created_at, :updated_at, :position, :data_fill_stage
 
         has_many :dynamic_field_options, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldOptionSerializer
       end

data/app/serializers/spree_cm_commissioner/v2/storefront/guest_dynamic_field_serializer.rb

@@ -4,9 +4,10 @@ module SpreeCmCommissioner
       class GuestDynamicFieldSerializer < BaseSerializer
         set_type :guest_dynamic_field
 
-        attributes :id, :value, :guest_id, :dynamic_field_id, :created_at, :updated_at
+        attributes :id, :value, :guest_id, :dynamic_field_id, :dynamic_field_option_id, :created_at, :updated_at
 
         belongs_to :dynamic_field, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldSerializer
+        belongs_to :dynamic_field_option, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldOptionSerializer
       end
     end
   end

data/app/services/spree_cm_commissioner/organizer/export_guest_csv_service.rb

@@ -1,11 +1,12 @@
 module SpreeCmCommissioner
   module Organizer
     class ExportGuestCsvService
-      attr_reader :event_id, :columns
+      attr_reader :event_id, :columns, :filters
 
-      def initialize(event_id, columns)
+      def initialize(event_id, columns, filters = {})
         @event_id = event_id
         @columns = columns
+        @filters = filters
       end
 
       def call
@@ -18,7 +19,7 @@ module SpreeCmCommissioner
       private
 
       def headers
-        columns.map(&:humanize).uniq
+        columns.map { |col| col.titleize(keep_id_suffix: true) }.uniq
       end
 
       def build_row(guest)
@@ -28,10 +29,8 @@ module SpreeCmCommissioner
       def fetch_value(guest, column)
         if guest_field?(column)
           fetch_guest_value(guest, column)
-        elsif option_type_field?(column)
-          fetch_option_value(guest, column)
         else
-          ''
+          fetch_option_value(guest, column)
         end
       end
 
@@ -39,19 +38,21 @@ module SpreeCmCommissioner
         SpreeCmCommissioner::KycBitwise::ORDERED_BIT_FIELDS.include?(column.to_sym)
       end
 
-      def option_type_field?(column)
-        Spree::OptionType.exists?(name: column)
-      end
-
       def fetch_guest_value(guest, column)
         column_mappings(guest)[column] || ''
       end
 
-      def fetch_option_value(guest, option_type_name)
-        return guest.formatted_bib_number if option_type_name == 'bib-prefix'
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      def fetch_option_value(guest, column_name)
+        return guest.formatted_bib_number if column_name == 'bib-prefix'
+        return guest.line_item&.number if column_name == 'item_id'
+        return guest.line_item&.order&.number if column_name == 'order_id'
+        return guest.created_at if column_name == 'created_at'
+        return guest.updated_at if column_name == 'updated_at'
 
-        guest.line_item&.variant&.find_option_value_name_for(option_type_name: option_type_name)
+        guest.line_item&.variant&.find_option_value_name_for(option_type_name: column_name) || ''
       end
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       def column_mappings(guest)
         {
@@ -77,12 +78,19 @@ module SpreeCmCommissioner
       end
 
       def guests_with_associations
-        event.guests.includes(
+        scope = event.guests.includes(
           :occupation,
           :nationality,
           :id_card,
           line_item: { variant: { option_values: :option_type } }
-        )
+        ).complete
+        scope = scope.where('cm_guests.created_at >= ?', formatted_date_time(filters[:from_date])) if filters[:from_date].present?
+        scope = scope.where('cm_guests.created_at <= ?', formatted_date_time(filters[:to_date])) if filters[:to_date].present?
+        scope
+      end
+
+      def formatted_date_time(date)
+        Time.zone.parse(date.to_s).strftime('%Y-%m-%d %H:%M:%S %z')
       end
 
       def event

data/app/services/spree_cm_commissioner/user_authenticator.rb

@@ -32,7 +32,7 @@ module SpreeCmCommissioner
         options = { login: params[:username], password: params[:password], tenant_id: tenant_id }
         SpreeCmCommissioner::UserPasswordAuthenticator.call(options)
       when 'social_auth'
-        options = { id_token: params[:id_token] }
+        options = { id_token: params[:id_token], tenant_id: tenant_id }
         SpreeCmCommissioner::UserIdTokenAuthenticator.call(options)
       when 'telegram_web_app_auth'
         options = { telegram_init_data: params[:telegram_init_data], telegram_bot_username: params[:tg_bot] }

data/app/services/spree_cm_commissioner/vehicle_option_value_creator.rb

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  class VehicleOptionValueCreator
+    def self.call(vehicle)
+      vehicle_option_type = Spree::OptionType.vehicle
+
+      value = vehicle_option_type.option_values.where(name: vehicle.id).first_or_initialize
+      value.presentation = vehicle.code
+      value.save
+    end
+  end
+end

data/app/views/blazer/queries/_content.html.erb

@@ -47,6 +47,14 @@
                   class: "btn btn-primary",
                   style: "margin-left: 10px;" %>
     </div>
+  <% elsif !@error && @success && params[:trip_id].present? %>
+    <div>
+      <%= link_to 'Save Trip',
+                  spree.admin_trip_blazer_queries_path(trip_id: params[:trip_id], blazer_query_id: @query.id),
+                  method: :post,
+                  class: "btn btn-primary",
+                  style: "margin-left: 10px;" %>
+    </div>
   <% end %>
 </div>
 

data/app/views/spree/admin/stock_managements/_variant_stock_items.html.erb

@@ -17,11 +17,9 @@
           </td>
           <td class="text-center d-flex flex-column align-items-center justify-content-center">
             <div style="width: 90px;">
-              <%= 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 %>
+              <%= form_tag admin_stock_items_path(variant_id: variant.id, stock_location_id: stock_location.id), method: :post do %>
                 <div class="input-group input-group-sm">
                   <%= number_field_tag 'stock_movement[quantity]', 0, class: 'form-control text-center p-0' %>
-                  <%= hidden_field_tag 'stock_movement[originator_id]', spree_current_user.id %>
-                  <%= hidden_field_tag 'stock_movement[originator_type]', spree_current_user.class.name %>
                   <div class="input-group-append">
                     <%= button_tag(class: 'btn btn-outline-success pl-2 pr-1') do %>
                       <%= svg_icon(name: 'arrow-left-right.svg', classes: "icon", width: 14, height: 14) %>
@@ -34,10 +32,7 @@
           <td class="text-center">
             <% if item.persisted? && can?(:update, item) %>
               <%= form_tag admin_stock_item_path(item), method: :put, class: 'toggle_stock_item_backorderable' do %>
-                <%= check_box_tag 'stock_item[backorderable]', true, item.backorderable?,
-                  class: 'stock_item_backorderable',
-                  id: "stock_item_backorderable_#{stock_location.id}",
-                  onclick: "if (!confirm('Are you sure to change backorderable status?')) { this.checked = !this.checked; }" %>
+                <%= check_box_tag 'stock_item[backorderable]', true, item.backorderable?, class: 'stock_item_backorderable', id: "stock_item_backorderable_#{stock_location.id}" %>
               <% end %>
             <% else %>
               <%= 'N/A' %>

data/app/views/spree/admin/stock_managements/index.html.erb

@@ -19,73 +19,30 @@
       <% @variants.each do |variant| %>
         <tr id="<%= spree_dom_id variant %>" data-hook="admin_product_stock_management_index_rows">
           <td class="image text-center">
-            <%= small_image(variant) %>
+              <%= small_image(variant) %>
+              <div class="mt-4">
+                Reserved Stock: <%= @reserved_stocks[variant.id] || 0 %></strong>
+              </div>
           </td>
           <td>
             <%= variant.sku_and_options_text %>
             <%= form_tag admin_product_variants_including_master_path(@product, variant, format: :js), method: :put, class: 'toggle_variant_track_inventory mt-2' do %>
               <div class="checkbox">
                 <%= label_tag "track_inventory_#{ variant.id }", class: 'm-0' do %>
-                  <%= check_box_tag 'track_inventory', 1, variant.track_inventory?,
-                    class: 'track_inventory_checkbox',
-                    id: "track_inventory_#{ variant.id }",
-                    onclick: "if (!confirm('Are you sure to change track inventory status?')) { this.checked = !this.checked; }" %>
+                  <%= check_box_tag 'track_inventory', 1, variant.track_inventory?, class: 'track_inventory_checkbox', id: "track_inventory_#{ variant.id }" %>
                   <%= Spree.t(:track_inventory) %>
                   <%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?, class: 'variant_track_inventory', id: "variant_track_inventory_#{variant.id}" %>
                 <% end %>
               </div>
             <% end if can?(:update, @product) && can?(:update, variant) %>
-
-            <% if defined?(@reserved_stocks) %>
-              <div>
-                <%= svg_icon name: "cart-check.svg", width: '14', height: '14' %>
-                <%= label_tag "reserved_stock#{variant.id}", "Reserved Stock: #{@reserved_stocks[variant.id] || 0}", class: "m-0" %>
-                <%= link_to_with_icon('capture.svg', "Create Inventory Item", admin_product_stock_management_variant_inventory_items(@product, variant.id),
-                  method: :post,
-                  remote: false,
-                  class: 'icon_link btn btn-sm btn-outline-primary ml-2',
-                  no_text: true
-                ) unless @inventory_items[variant.id].present? %>
-              </div>
-            <% end %>
-
             <% if variant.permanent_stock? %>
               <div>
                 <span type="button" data-toggle="popover" data-trigger="hover" data-placement="right" data-content="This product stock will renew every day">
                     <%= svg_icon name: "info-circle-fill.svg", width: '14', height: '14' %>
                 </span>
-                <%= label_tag "permanent_stock_#{ variant.id }", Spree.t(:permanent_stock), class: "m-0" %>
+                <%= label_tag "permanent_stock_#{ variant.id }", Spree.t(:permanent_stock) %>
               </div>
             <% end %>
-
-            <% if defined?(@inventory_items) %>
-              <% @inventory_items[variant.id]&.each do |inventory_item| %>
-                <div>
-                  <%= svg_icon name: "handbag.svg", width: '14', height: '14' %>
-                  <%= label_tag "max_capacity_#{ inventory_item.id }", "Max capacity: #{inventory_item.max_capacity}", class: "m-0" %>
-                </div>
-                <div>
-                  <%= svg_icon name: "approve.svg", width: '14', height: '14' %>
-                  <%= label_tag "quantity_available_#{ inventory_item.id }", "Quantity available: #{inventory_item.quantity_available}", class: "m-0" %>
-
-                  <% synced = inventory_item.quantity_available == @cached_inventory_items[inventory_item.id].quantity_available %>
-                  <span type="button" data-toggle="popover" data-trigger="hover" data-placement="right" data-content="<%= inventory_item_message(inventory_item, @cached_inventory_items[inventory_item.id]) %>">
-                    <% if synced %>
-                      <%= svg_icon name: "cloud-check.svg", width: '14', height: '14', classes: 'text-success' %>
-                    <% else %>
-                      <%= svg_icon name: "cloud-slash.svg", width: '14', height: '14', classes: 'text-danger' %>
-                    <% end %>
-                  </span>
-
-                  <%= 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),
-                    method: :patch,
-                    remote: false,
-                    class: 'icon_link btn btn-sm outline text-dark',
-                    data: { confirm: "Only reset if stock is incorrect. Are you sure?" }, no_text: true
-                  ) %>
-                </div>
-              <% end %>
-            <% end %>
           </td>
 
           <td colspan="3" class="stock_location_info">
@@ -96,9 +53,3 @@
     </tbody>
   </table>
 </div>
-
-<%= turbo_frame_tag "calendar", src: calendar_admin_product_stock_managements_path(year: params[:year]) do %>
-  <div class="spinner-border mt-2" role="status">
-    <span class="sr-only">Loading...</span>
-  </div>
-<% end if @product.permanent_stock? %>

data/app/views/spree/admin/tenant_vendors/index.html.erb

@@ -1,6 +1,6 @@
 <% content_for :page_title do %>
   <%= page_header_back_button spree.admin_tenants_url %>
-  <%= link_to @tenant.name, spree.admin_tenants_url %> / <%= Spree.t('vendors') %>
+  <%= link_to Spree.t('tenants'), spree.admin_tenants_url %> / <%= link_to @tenant.name, spree.admin_tenants_url%> / <%= Spree.t('vendors') %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -24,13 +24,20 @@
       <tbody>
         <% @vendors.each do |vendor| %>
           <tr id="<%= spree_dom_id vendor %>" data-hook="admin_vendors_index_rows">
-            <td><%= vendor.name %></td>
+            <td>
+              <% if can?(:edit, vendor) %>
+                <%= link_to vendor.name, edit_admin_vendor_path(vendor.slug) %>
+              <% else %>
+                  <td><%= vendor.name %></td>
+              <% end %>
+            </td>
             <td><%= vendor.slug %></td>
             <td><%= vendor.created_at %></td>
             <td><%= vendor.updated_at %></td>
             <td><%= vendor.tenant.name %></td>
             <td data-hook="admin_tenants_index_row_actions" class="actions">
               <span class="d-flex justify-content-end">
+                <%= link_to_edit vendor, url: edit_admin_vendor_path(vendor.slug), no_text: true if can?(:edit, vendor) %>
                 <%= link_to_delete vendor, url: admin_tenant_vendor_path(@tenant, vendor.id), no_text: true if can?(:delete, vendor) %>
               </span>
             </td>