stay_commerce 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5861ce1241022b986eecc6189dbb408fc598a09d8918711c0c9610f917d24a6
-  data.tar.gz: 061efeee0f6282c67ac3dcaf4e578f25032dcee4a173b46ccccf1073b09e7116
+  metadata.gz: e8ab666ef6621d55e7d2aac249f86d0ea9e2c0ccb902bda7de026a5013181372
+  data.tar.gz: 432b2ded3073a63f4757e7721dec5c9e21203f3a51377382f23eb5a503650d52
 SHA512:
-  metadata.gz: 745c862563d5b73069e9e17b9f4a98a6c67bc3f3034dcf5c166ee425a79fd16fc95806d80752f212b92fa8d368bff27224b5ed8a37792f4f542fae3c94e2c1db
-  data.tar.gz: c508c74362a75aa3a0d2dbc5f5f01e6172dc3df0928fc10ebf8112a2565a80d2ba01ec8b1aa660890e5cb0f42ada171dc12b7e8072796cc9bff7671dddbb3215
+  metadata.gz: d046d3c8f75dc3e92614d66d991770d3d03a606458aec4c81fc3a3a9108fc1d2c5f8e45aea562cc8d62b50d55b8f9325949a16451daf41683ef59e33f20a0014
+  data.tar.gz: aa34ce806d5e6f5300f7386f359dcc57d25e1920a869b2181e327710480cd88007846930e378dc2e77256e2b528dd784ddbf1c5b46a545c368c92c8b3853e66c

data/app/assets/javascripts/stay/admin/property.js

@@ -25,13 +25,13 @@ $(document).ready(function() {
   const roomTypeField = document.getElementById('room_type_field');
   const propertyCategoryData = document.getElementById('property-category-data');
 
-  // const roomTypesByCategory = JSON.parse(propertyCategoryData.getAttribute('data-room-types'));
+  const roomTypesByCategory = JSON.parse(propertyCategoryData.getAttribute('data-room-types'));
 
-  // window.updateRoomType = function(selectedCategoryId) {
-  //   if (roomTypesByCategory[selectedCategoryId]) {
-  //     roomTypeField.value = roomTypesByCategory[selectedCategoryId];
-  //   } else {
-  //     roomTypeField.value = '';
-  //   }
-  // };
+  window.updateRoomType = function(selectedCategoryId) {
+    if (roomTypesByCategory[selectedCategoryId]) {
+      roomTypeField.value = roomTypesByCategory[selectedCategoryId];
+    } else {
+      roomTypeField.value = '';
+    }
+  };
 });

data/app/controllers/concerns/stay/image_resizer_concern.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+module Stay
+  module ImageResizerConcern
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :resize_image, only: %i[update create]
+    end
+
+    private
+
+    def resize_image
+      image_params = resize_param_name
+      return unless image_params
+    
+      Array(image_params).each do |image_param|
+        next unless image_param.respond_to?(:tempfile)
+    
+        content_type = Marcel::MimeType.for(image_param.tempfile)
+    
+        next unless content_type&.start_with?("image")
+    
+        begin
+          ImageProcessing::MiniMagick
+            .source(image_param.tempfile)
+            .quality(85)
+            .call(destination: image_param.tempfile.path)
+        rescue StandardError => e
+          Rails.logger.error "Image processing failed: #{e.message}"
+          next
+        end
+      end
+    end
+
+    def resize_param_name
+      case controller_name
+      when "properties"
+        params[:property][:place_images] || params[:property][:cover_image]
+      else
+        params[:attachment]
+      end
+    end
+  end
+end

data/app/controllers/devise/api/tokens_controller.rb

@@ -27,12 +27,10 @@ module Devise
           token = service.success
 
           call_devise_trackable!(token.resource_owner)
-
           token_response = Devise::Api::Responses::TokenResponse.new(request, token: token, action: __method__)
           Devise.api.config.after_successful_sign_up.call(token.resource_owner, token, request)
           assign_role(token.resource_owner) if token.resource_owner
           data = ActiveModelSerializers::SerializableResource.new(token.resource_owner, serializer: UserSerializer).as_json
-          UserMailer.welcome_email(token.resource_owner).deliver_later if token.resource_owner
           return render json: { access_token: token_response&.token.access_token, success: true }, status: token_response.status
         end
 
@@ -157,8 +155,6 @@ module Devise
       def assign_role(user)
         role  = Stay::Role.find_by(name: params[:type])
         user.role_users.create(role_id: role&.id) if role.present?
-        token = Random.hex(16)
-        user.update(confirmation_token: token)
       end
 
       def sign_in_params

data/app/controllers/stay/admin/properties_controller.rb

@@ -1,6 +1,7 @@
 module Stay
   module Admin
     class PropertiesController < Stay::Admin::BaseController
+      include Stay::ImageResizerConcern
       before_action :set_property, only: %i[show edit update destroy approve reject]
 
       def index

data/app/controllers/stay/admin/rooms_controller.rb

@@ -5,7 +5,7 @@ module Stay
       before_action :set_room, only: %i[show edit update destroy]
 
       def index
-        @rooms = @property.rooms
+        @rooms = @property.rooms.page(params[:page]).per(10)
       end
 
       def show
@@ -51,7 +51,7 @@ module Stay
       end
 
       def room_params
-        params.require(:room).permit(:property_id, :max_guests, :price_per_month, :room_type_id, :booking_start, :booking_end, :description,
+        params.require(:room).permit(:property_id, :max_guests, :price_per_month, :room_type_id, :booking_start, :booking_end, :description, :name,
                                       :size, :bed_type_id, :status, amenity_ids: [], feature_ids: [], room_images: [],
                                       room_amenities_attributes: [ :id, :amenity_id, :_destroy ],
                                       room_features_attributes: [ :id, :name, :feature_id, :_destroy ],

data/app/controllers/stay/api/v1/amenities_controller.rb

@@ -1,13 +1,45 @@
 class Stay::Api::V1::AmenitiesController < ApplicationController
-  before_action :authenticate_devise_api_token!
-
   def property
-    amenities = Stay::Amenity.where(amenity_type: "property").all
-    render json: { data: ActiveModelSerializers::SerializableResource.new(amenities, each_serializer: AmenitySerializer) }
+    amenities = Stay::Amenity.property
+
+    if amenities.exists?
+      render json: {
+        success: true,
+        data: ActiveModelSerializers::SerializableResource.new(amenities, each_serializer: AmenitySerializer)
+      }, status: :ok
+    else
+      render json: {
+        success: false,
+        message: "No property amenities found"
+      }, status: :not_found
+    end
+  rescue => e
+    render json: {
+      success: false,
+      error: "Failed to fetch property amenities",
+      message: e.message
+    }, status: :internal_server_error
   end
 
   def room
-    amenities = Stay::Amenity.where(amenity_type: "room").all
-    render json: { data: ActiveModelSerializers::SerializableResource.new(amenities, each_serializer: AmenitySerializer) }
+    amenities = Stay::Amenity.room
+
+    if amenities.exists?
+      render json: {
+        success: true,
+        data: ActiveModelSerializers::SerializableResource.new(amenities, each_serializer: AmenitySerializer)
+      }, status: :ok
+    else
+      render json: {
+        success: false,
+        message: "No room amenities found"
+      }, status: :not_found
+    end
+  rescue => e
+    render json: {
+      success: false,
+      error: "Failed to fetch room amenities",
+      message: e.message
+    }, status: :internal_server_error
   end
 end

data/app/controllers/stay/api/v1/features_controller.rb

@@ -3,19 +3,45 @@ class Stay::Api::V1::FeaturesController < Stay::BaseApiController
 
   def property
     features = Stay::Feature.property
-    if features.any?
-    render json: { data:ActiveModelSerializers::SerializableResource.new(features, each_serializer: PropertyFeatureSerializer) ,success: true }, status: :ok
+
+    if features.exists?
+      render json: {
+        success: true,
+        data: ActiveModelSerializers::SerializableResource.new(features, each_serializer: FeatureSerializer)
+      }, status: :ok
     else
-      render json: { error:"no feature found", success: false }, status: :unprocessable_entity
+      render json: {
+        success: false,
+        message: "No property features found"
+      }, status: :not_found
     end
+  rescue => e
+    render json: {
+      success: false,
+      error: "Failed to fetch property features",
+      message: e.message
+    }, status: :internal_server_error
   end
 
   def room
     features = Stay::Feature.room
-    if features.any?
-      render json: { data:ActiveModelSerializers::SerializableResource.new(features, each_serializer: PropertyFeatureSerializer) ,success: true }, status: :ok
+
+    if features.exists?
+      render json: {
+        success: true,
+        data: ActiveModelSerializers::SerializableResource.new(features, each_serializer: FeatureSerializer)
+      }, status: :ok
     else
-      render json: { error:"no feature found", success: false }, status: :unprocessable_entity
+      render json: {
+        success: false,
+        message: "No room features found"
+      }, status: :not_found
     end
+  rescue => e
+    render json: {
+      success: false,
+      error: "Failed to fetch room features",
+      message: e.message
+    }, status: :internal_server_error
   end
 end

data/app/controllers/stay/api/v1/properties_controller.rb

@@ -1,4 +1,5 @@
 class Stay::Api::V1::PropertiesController < Stay::BaseApiController
+    include Stay::ImageResizerConcern
     before_action :authenticate_devise_api_token!
     before_action :set_property, only: [ :show, :update, :destroy ]
     before_action :check_create_access, only: [ :create, :update ]

data/app/controllers/stay/api/v1/property_categories_controller.rb

@@ -2,13 +2,51 @@ class Stay::Api::V1::PropertyCategoriesController < Stay::BaseApiController
   before_action :authenticate_devise_api_token!
 
   def index
-    @type = Stay::PropertyCategory.all
-    return render json: { error: "no data found", success: false }, status: :not_found unless @type.any?
-    render json: { data: ActiveModelSerializers::SerializableResource.new(@type, each_serializer: PropertyCategorySerializer), message: "data found", success: true }, status: :ok
+    categories = Stay::PropertyCategory.all
+
+    if categories.exists?
+      serialized_data = ActiveModelSerializers::SerializableResource.new(categories, each_serializer: PropertyCategorySerializer)
+      render json: {
+        data: serialized_data,
+        message: "Property categories found",
+        success: true
+      }, status: :ok
+    else
+      render json: {
+        data: [],
+        message: "No property categories found",
+        success: false
+      }, status: :not_found
+    end
+  rescue => e
+    render json: {
+      error: "Failed to fetch property categories",
+      message: e.message,
+      success: false
+    }, status: :internal_server_error
   end
 
   def show
-    @type = Stay::PropertyCategory.find_by(id: params[:id])
-    render json: { data:  PropertyCategorySerializer.new(@type), message: "data found", success: true },  status: :ok
+    category = Stay::PropertyCategory.find_by(id: params[:id])
+
+    if category.present?
+      render json: {
+        data: PropertyCategorySerializer.new(category),
+        message: "Property category found",
+        success: true
+      }, status: :ok
+    else
+      render json: {
+        data: {},
+        message: "Property category not found",
+        success: false
+      }, status: :not_found
+    end
+  rescue => e
+    render json: {
+      error: "Failed to fetch property category",
+      message: e.message,
+      success: false
+    }, status: :internal_server_error
   end
 end

data/app/controllers/stay/api/v1/property_types_controller.rb

@@ -3,13 +3,13 @@ class Stay::Api::V1::PropertyTypesController < Stay::BaseApiController
 
   def index
     property_types = Stay::PropertyType.all
-  
-    if property_types.any?
+
+    if property_types.exists?
       serialized_data = ActiveModelSerializers::SerializableResource.new(property_types, each_serializer: PropertyTypeSerializer)
-  
+
       render json: {
         data: serialized_data,
-        message: "Data found",
+        message: "Property types found",
         success: true
       }, status: :ok
     else
@@ -17,14 +17,37 @@ class Stay::Api::V1::PropertyTypesController < Stay::BaseApiController
         data: [],
         message: "No property types found",
         success: false
-      }, status: :ok
+      }, status: :not_found
     end
+  rescue => e
+    render json: {
+      error: "Failed to fetch property types",
+      message: e.message,
+      success: false
+    }, status: :internal_server_error
   end
-  
 
   def show
-    @type = Stay::PropertyType.find_by(id: params[:id])
-    return render json: { error: "no data found", success: false }, status: :unprocessable_entity if @type.nil?
-    render json: { data:  PropertyTypeSerializer.new(@type), message: "data found", success: true },  status: :ok
+    type = Stay::PropertyType.find_by(id: params[:id])
+
+    if type.present?
+      render json: {
+        data: PropertyTypeSerializer.new(type),
+        message: "Property type found",
+        success: true
+      }, status: :ok
+    else
+      render json: {
+        data: {},
+        message: "Property type not found",
+        success: false
+      }, status: :not_found
+    end
+  rescue => e
+    render json: {
+      error: "Failed to fetch property type",
+      message: e.message,
+      success: false
+    }, status: :internal_server_error
   end
 end

data/app/controllers/stay/users/registrations_controller.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Stay::Users::RegistrationsController < Devise::RegistrationsController
+  before_action :redirects
+
   # before_action :configure_sign_up_params, only: [:create]
   # before_action :configure_account_update_params, only: [:update]
 
@@ -59,4 +61,9 @@ class Stay::Users::RegistrationsController < Devise::RegistrationsController
   # def after_inactive_sign_up_path_for(resource)
   #   super(resource)
   # end
+  private
+
+  def redirects
+    redirect_to "/admin/login"
+  end
 end

data/app/controllers/stay/users/sessions_controller.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class Stay::Users::SessionsController < Devise::SessionsController
+  before_action :redirects
   # before_action :configure_sign_in_params, only: [:create]
 
   # GET /resource/sign_in
@@ -24,4 +25,10 @@ class Stay::Users::SessionsController < Devise::SessionsController
   # def configure_sign_in_params
   #   devise_parameter_sanitizer.permit(:sign_in, keys: [:attribute])
   # end
+
+  private
+
+  def redirects
+    redirect_to "/admin/login"
+  end
 end

data/app/helpers/stay/application_helper.rb

@@ -3,8 +3,38 @@ module Stay
     include CurrencyHelper
       ICON_SIZE = 14
 
-    def svg_icon(name:, classes: '', width:, height:)
-      if name.ends_with?('.svg')
+      def badge_class(state)
+        case state
+        when "approved"
+          "green"
+        when "rejected"
+          "red"
+        when "accepted"
+          "orange"
+        when "confirmed"
+          "green"
+        when "booking_request"
+          "orange"
+        when "invoice_sent"
+          "orange"
+        when "canceled"
+          "red"
+        end
+      end
+
+      def icon_class(state)
+        case state
+        when "approved"
+          "icon-check-circle"
+        when "rejected"
+          "icon-times-circle"
+        else
+          "icon-exclamation-circle"
+        end
+      end
+
+    def svg_icon(name:, classes: "", width:, height:)
+      if name.ends_with?(".svg")
         icon_name = File.basename(name, File.extname(name))
         inline_svg_tag "#{icon_name}.svg", class: "icon-#{icon_name} #{classes}", size: "#{width}px*#{height}px"
       else
@@ -14,8 +44,8 @@ module Stay
 
     def active_badge(condition, options = {})
       label = options[:label]
-      label ||= condition ? I18n.t('admin.say_yes') : I18n.t('admin.say_no')
-      css_class = condition ? 'badge-active' : 'badge-inactive'
+      label ||= condition ? I18n.t("admin.say_yes") : I18n.t("admin.say_no")
+      css_class = condition ? "badge-active" : "badge-inactive"
 
       content_tag(:small, class: "badge badge-pill #{css_class}") do
         label
@@ -25,16 +55,16 @@ module Stay
     def link_to_with_icon(icon_name, text, url, options = {})
       options[:class] = (options[:class].to_s + " icon-link with-tip action-#{icon_name}").strip
       options[:title] = text if options[:no_text]
-      text = options[:no_text] ? '' : content_tag(:span, text)
+      text = options[:no_text] ? "" : content_tag(:span, text)
       options.delete(:no_text)
       options[:width] ||= ICON_SIZE
       options[:height] ||= ICON_SIZE
       if icon_name
-        icon = if icon_name.ends_with?('.svg')
+        icon = if icon_name.ends_with?(".svg")
                  svg_icon(name: icon_name, classes: "#{'mr-2' unless text.empty?} icon icon-#{icon_name}", width: options[:width], height: options[:height])
-               else
-                 content_tag(:span, '', class: "#{'mr-2' unless text.empty?} icon icon-#{icon_name}")
-               end
+        else
+                 content_tag(:span, "", class: "#{'mr-2' unless text.empty?} icon icon-#{icon_name}")
+        end
         text = "#{icon} #{text}"
       end
       link_to(text.html_safe, url, options)
@@ -43,17 +73,17 @@ module Stay
     def button_to_with_icon(icon_name, text, url, options = {})
       options[:class] = (options[:class].to_s + " icon-link with-tip action-#{icon_name}").strip
       options[:title] = text if options[:no_text]
-      text = options[:no_text] ? '' : content_tag(:span, text)
+      text = options[:no_text] ? "" : content_tag(:span, text)
       options.delete(:no_text)
       options[:width] ||= ICON_SIZE
       options[:height] ||= ICON_SIZE
 
       if icon_name
-        icon = if icon_name.ends_with?('.svg')
+        icon = if icon_name.ends_with?(".svg")
                  svg_icon(name: icon_name, classes: "#{'mr-2' unless text.empty?} icon icon-#{icon_name}", width: options[:width], height: options[:height])
-               else
-                 content_tag(:span, '', class: "#{'mr-2' unless text.empty?} icon icon-#{icon_name}")
-               end
+        else
+                 content_tag(:span, "", class: "#{'mr-2' unless text.empty?} icon icon-#{icon_name}")
+        end
         text = "#{icon} #{text}".html_safe
       end
 

data/app/models/stay/property.rb

@@ -2,6 +2,7 @@ module Stay
   class Property < ApplicationRecord
     ACTIVE_STATUS = "active".freeze
     APPROVED = "approved".freeze
+    PROPERTY = "property".freeze
     include Rails.application.routes.url_helpers
     include CurrencyHelper
     include Stay::ControllerHelpers::Currency
@@ -29,15 +30,15 @@ module Stay
     has_many :prices, through: :rooms
     has_many :line_items, through: :variants_including_master
     has_many :bookings
-    belongs_to :property_category, class_name: "Stay::PropertyCategory", optional: true
+    belongs_to :property_category, class_name: "Stay::PropertyCategory"
     belongs_to :property_type, class_name: "Stay::PropertyType"
     has_many :property_amenities, class_name: "Stay::PropertyAmenity", dependent: :destroy
-    has_many :amenities, through: :property_amenities, class_name: "Stay::Amenity"
+    has_many :property_type_amenities, -> { where(amenity_type: PROPERTY) }, through: :property_amenities, source: :amenity, class_name: "Stay::Amenity"
     has_many :additional_rules, class_name: "Stay::AdditionalRule", dependent: :destroy
     has_many :property_house_rules, class_name: "Stay::PropertyHouseRule", dependent: :destroy
     has_many :house_rules, through: :property_house_rules, class_name: "Stay::HouseRule"
     has_many :property_features, class_name: "Stay::PropertyFeature", dependent: :destroy
-    has_many :features, through: :property_features, class_name: "Stay::Feature"
+    has_many :property_type_features,-> { where(feature_type: PROPERTY) },through: :property_features,source: :feature, class_name: "Stay::Feature"
     has_many :property_taxes, class_name: "Stay::PropertyTax", dependent: :destroy
     has_many :taxes, through: :property_taxes, class_name: "Stay::Tax"
     has_many :store_properties, class_name: "Stay::StoreProperty", dependent: :destroy

data/app/models/stay/property_category.rb

@@ -1,6 +1,7 @@
 module Stay
   class PropertyCategory < ApplicationRecord
     has_many :properties, class_name: "Stay::Property", dependent: :nullify
-    validates :name,  presence: true, uniqueness: { case_sensitive: false }, format: { without: /\s/, message: "must contain no spaces" }
+    validates :name,  presence: true, uniqueness: { case_sensitive: false },
+    format: { without: /_/, message: "must not contain underscores" }
   end
 end

data/app/models/stay/property_type.rb

@@ -1,9 +1,9 @@
 module Stay
   class PropertyType < ApplicationRecord
-    validates :name,  presence: true, uniqueness: { case_sensitive: false }, format: { without: /\s/, error: "must contain no spaces" }
+    validates :name,  presence: true, uniqueness: { case_sensitive: false }, 
+    format: { without: /_/, message: "must not contain underscores" }
 
-
-    has_many :properties
+    has_many :properties, class_name: "Stay::Property", dependent: :nullify
     def self.ransackable_attributes(auth_object = nil)
       %w[id name created_at updated_at]
     end

data/app/models/stay/room_type.rb

@@ -1,7 +1,8 @@
 module Stay
   class RoomType < ApplicationRecord
-    has_many :rooms, class_name: "Stay::Room"
+    has_many :rooms, class_name: "Stay::Room", dependent: :destroy
 
-    validates :name,  presence: true, uniqueness: { case_sensitive: false }, format: { without: /\s/, message: "must contain no spaces" }
+    validates :name,  presence: true, uniqueness: { case_sensitive: false },
+    format: { without: /_/, message: "must not contain underscores" }
   end
 end

data/app/serializers/credit_card_serializer.rb

@@ -1,7 +1,4 @@
 class CreditCardSerializer < ActiveModel::Serializer
   attributes :id, :month, :year, :cc_number, :cc_type, :name, :user
   belongs_to :user
-  # def user
-  #   UserSerializer.new(object.user)
-  # end
 end

data/app/serializers/feature_serializer.rb

@@ -0,0 +1,3 @@
+class FeatureSerializer < ActiveModel::Serializer
+  attributes :id, :name, :feature_type
+end

data/app/serializers/property_category_serializer.rb

@@ -1,7 +1,3 @@
 class PropertyCategorySerializer < ActiveModel::Serializer
-  attributes :id, :name, :property_count
-
-  def property_count
-    object.properties.approved.active.count
-  end
+  attributes :id, :name
 end

data/app/serializers/property_listing_serializer.rb

@@ -1,7 +1,7 @@
 class PropertyListingSerializer < ActiveModel::Serializer
   attributes :id, :title, :price_per_month, :place_images, :total_rooms,
               :availability_end, :availability_start, :extra_guest, :latitude,
-              :longitude, :address, :city, :state, :country, :active, :property_state
+              :longitude, :address, :city, :state, :country, :active, :property_state, :slug
 
   belongs_to :property_category, Serializer: :PropertyCategorySerializer
   belongs_to :property_type, Serializer: :PropertyTypeSerializer

data/app/serializers/property_serializer.rb

@@ -12,11 +12,11 @@ class PropertySerializer < ActiveModel::Serializer
   belongs_to :user
 
   def amenities
-    ActiveModelSerializers::SerializableResource.new(object.amenities.property.uniq, each_serializer: AmenitySerializer)
+    ActiveModelSerializers::SerializableResource.new(object.property_type_amenities, each_serializer: AmenitySerializer)
   end
 
   def features
-    ActiveModelSerializers::SerializableResource.new(object.features.property.uniq, each_serializer: PropertyFeatureSerializer)
+    ActiveModelSerializers::SerializableResource.new(object.property_type_features, each_serializer: FeatureSerializer)
   end
 
   def is_shared_property

data/app/serializers/property_type_serializer.rb

@@ -1,7 +1,3 @@
 class PropertyTypeSerializer < ActiveModel::Serializer
-  attributes :id, :name, :property_count
-
-  def property_count
-    object.properties.approved.active.count
-  end
+  attributes :id, :name
 end

data/app/serializers/room_serializer.rb

@@ -16,7 +16,7 @@ class RoomSerializer < ActiveModel::Serializer
   end
 
   def features
-    ActiveModelSerializers::SerializableResource.new(object.features.distinct, each_serializer: PropertyFeatureSerializer)
+    ActiveModelSerializers::SerializableResource.new(object.features.distinct, each_serializer: FeatureSerializer)
   end
 
   def room_images

data/app/serializers/user_serializer.rb

@@ -1,7 +1,8 @@
 class UserSerializer < ActiveModel::Serializer
   include Rails.application.routes.url_helpers
+  
   attributes :id, :email, :first_name, :full_name, :last_name,  :phone, :gender, :is_user, :is_host, :date_of_birth,
-               :image, :whatsapp_notification, :sms_notification, :image_file_name,
+               :image, :image_file_name, :about_me, :country, :country_code
 
   def full_name
     object.full_name
@@ -23,14 +24,6 @@ class UserSerializer < ActiveModel::Serializer
     object.profile_image.url || nil
   end
 
-  def whatsapp_notification
-    object&.preferences.present? ? object&.preferences["whatsapp_notification"]: false
-  end
-
-  def sms_notification
-    object&.preferences.present? ? object&.preferences["sms_notification"]: false
-  end
-
   def image_file_name
     object.profile_image&.filename&.to_s || nil
   end

data/app/views/stay/admin/properties/index.html.erb

@@ -2,81 +2,81 @@
   <div class="card-header">
     <div class="row align-items-center">
       <div class="col-sm-6 col-12 mb-4 mb-sm-0">
-          <!-- Title -->
-          <h1 class="h3 mb-0 ls-tight">Properties</h1>
+        <h1 class="h3 mb-0 ls-tight">Properties</h1>
       </div>
       <div class="col-sm-6 col-12 text-sm-end">
-          <div class="mx-n1">
+        <div class="mx-n1">
           <%= link_to new_admin_property_path, class:"btn d-inline-flex btn-sm btn-primary mx-1" do %>
-              <span class=" pe-2">
+            <span class=" pe-2">
               <i class="bi bi-plus"></i>
-              </span>
-              <span>Create New</span>
+            </span>
+            <span>Create New</span>
           <%end%>
-          </div>
+        </div>
       </div>
       <div class="row g-3 mt-4">
-        <div class="col-lg-3">
+        <div class="col-3 mt-6">
           <%= search_form_for @q, url: admin_properties_path, method: :get, local: true, class: "input-group" do |f| %>
-            <%= f.search_field :title_cont, placeholder: "Search by title", class: "form-control" %>
+            <%= f.search_field :title_cont, placeholder: "Search by Name", class: "form-control" %>
             <%= f.submit "Search", class: "btn btn-primary" %>
           <% end %>
         </div>
-      </div>
+        <div class="col-9 d-flex justify-content-end">
+          <%= form_with url: admin_properties_path, method: :get, local: true, class: "row g-3 align-items-center" do |f| %>
+            <div class="col-auto mt-4">
+              <%= f.label :status, "Filter", class: "form-label" %>
+              <%= f.select :property_state, options_for_select([["All", ""], ["Waiting for Approval", "waiting_for_approval"], ["Approved", "approved"], ["Rejected", "rejected"]], params[:property_state]), {}, class: "form-select" %>
+            </div>
+            <div class="col-auto">
+              <%= f.submit "Filter", class: "btn btn-primary mt-3" %>
+            </div>
+          <% end %>
+        </div>
+      </div>   
     </div>  
   </div>
   <div class="table-responsive">
-    <table class="table table-hover table-nowrap">
+    <table class="table table-hover table-nowrap text-center align-middle">
       <thead class="table-light">
-    <tr>
-      <th scope="col">Image</th>
-      <th scope="col">Title</th>
-      <th scope="col">Description</th>
-      <th scope="col">Availability Start</th>
-      <th scope="col">Availability End</th>
-      <th scope="col">State</th>
-      <th scope="col">Active</th>
-      <th></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @properties.each do |property| %>
-      <tr>
-        <td>
-          <%= image_tag main_app.url_for(property.cover_image), size: "25x25" if property.cover_image.attached? %>
-        </td>
-        <td><%= property.title %></td>
-        <td><%= sanitize property.description %></td>
-        <td><%= property.availability_start %></td>
-        <td><%= property.availability_end %></td>
-        <td><%= property.property_state %></td>
-        <td>
-          <%= property.active %>
-          <span class="badge badge-lg badge-dot <%= property.active ? 'badge-primary' : 'badge-warning' %>">
-            <i class="<%= property.active ? 'bg-primary' : 'bg-warning' %>"></i>
-          </span>
-        </td>
-        <td class="text-end d-flex justify-content-end">
-          <%= link_to edit_admin_property_path(property), class: 'btn d-inline-flex btn-sm btn-neutral mx-1' do %>
-            <i class="bi bi-pencil"></i>
-          <% end %>  
-          <%= link_to admin_property_path(property), class: 'btn d-inline-flex btn-sm btn-neutral mx-1' do %>
-            <i class="bi bi-eye"></i>
-          <% end %>
-          <%= button_to admin_property_path(property), method: :delete, data: { turbo_method: :delete, turbo_confirm: 'Are you sure?' }, class: 'btn btn-sm btn-neutral mx-1 text-danger-hover' do %>
-            <i class="bi bi-trash"></i>
-          <% end %>                
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-</div>
-</div>  
-<div class="card-footer border-0 py-5">
-  <span class="text-muted text-sm">Showing <%= @properties.count > 0 ? @properties.count : 0%> items out of <%=  @properties.count||0%> results found</span>
+        <tr>
+          <th scope="col">Sr.No</th>
+          <th scope="col">Title</th>
+          <th scope="col">Availability Start</th>
+          <th scope="col">Availability End</th>
+          <th scope="col">Status</th>
+          <th scope="col">Action</th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @properties.each_with_index do |property, index| %>
+          <tr>
+            <td><%= index + 1 %></td>
+            <td><%= property.title %></td>
+            <td><%= property.availability_start && property.availability_start.strftime("%b %d, %Y") %></td>
+            <td><%= property.availability_end && property.availability_end.strftime("%b %d, %Y") %></td>
+            <td style = "color: <%= badge_class(property.property_state) %>">
+              <%= property.property_state.humanize %>
+              <span class="badge badge-lg badge-dot">
+                <i class="<%= icon_class(property.property_state) %>"></i>
+              </span>
+            </td>
+            <td class="d-flex justify-content-center">
+              <%= link_to edit_admin_property_path(property), class: 'btn d-inline-flex btn-sm btn-neutral mx-1' do %>
+                <i class="bi bi-pencil"></i>
+              <% end %>  
+              <%= link_to admin_property_path(property), class: 'btn d-inline-flex btn-sm btn-neutral mx-1' do %>
+                <i class="bi bi-eye"></i>
+              <% end %>
+              <%= button_to admin_property_path(property), method: :delete, data: { turbo_method: :delete, turbo_confirm: 'Are you sure?' }, class: 'btn btn-sm btn-neutral mx-1 text-danger-hover' do %>
+                <i class="bi bi-trash"></i>
+              <% end %>                
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
 </div>
 <div class="d-flex justify-content-center">
-      <%= paginate @properties %>
+  <%= paginate @properties %>
 </div>

data/app/views/stay/admin/rooms/index.html.erb

@@ -2,68 +2,67 @@
   <div class="card-header">
     <div class="row align-items-center">
       <div class="col-sm-6 col-12 mb-4 mb-sm-0">
-          <!-- Title -->
-          <h1 class="h3 mb-0 ls-tight">Rooms</h1>
+        <!-- Title -->
+        <h1 class="h3 mb-0 ls-tight">Rooms</h1>
       </div>
       <!-- Actions -->
       <div class="col-sm-6 col-12 text-sm-end">
-          <div class="mx-n1">
+        <div class="mx-n1">
           <%= link_to new_admin_property_room_path(@property), class:"btn d-inline-flex btn-sm btn-primary mx-1" do %>
-              <span class=" pe-2">
+            <span class=" pe-2">
               <i class="bi bi-plus"></i>
-              </span>
-              <span>Create New</span>
+            </span>
+            <span>Create New</span>
           <%end%>
-          </div>
+        </div>
       </div>
     </div>  
   </div>
   <div class="table-responsive">
     <table class="table table-hover table-nowrap">
       <thead class="table-light">
-    <tr>
-      <th scope="col">Image</th>
-      <th scope="col">Max Guests</th>
-      <th scope="col">Price Per Night</th>
-      <th scope="col">Room Type</th>
-      <th scope="col">Booking Start</th>
-      <th scope="col">Booking End</th>
-      <th scope="col">Status</th>
-
-      <th></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @rooms.each do |room| %>
-      <tr>
-        <td>
-          <%= image_tag main_app.url_for(room.room_images.first), size: "25x25" if room.room_images.attached? %>
-        </td>
-        <td><%= room.max_guests %></td>
-        <td><%= currency_symbol(current_currency) %> <%= room.price_per_month %></td>
-        <td><%= room.room_type&.name %></td>
-        <td><%= room.booking_start%></td>
-        <td><%= room.booking_end%></td>
-        <td><%= room.status%></td>
-        <td class="text-end d-flex justify-content-end">
-          <%= link_to edit_admin_property_room_path(@property, room), class: 'btn d-inline-flex btn-sm btn-neutral mx-1' do %>
-            <i class="bi bi-pencil">Edit</i>
-          <% end %>  
-          <%= link_to admin_property_room_path(@property, room), class: 'btn d-inline-flex btn-sm btn-neutral mx-1' do %>
-            <i class="bi bi-eye">View</i>
-          <% end %>
-          <%= button_to admin_property_room_path(@property, room), method: :delete, data: { turbo_method: :delete, turbo_confirm: 'Are you sure?' }, class: 'btn btn-sm btn-neutral mx-1 text-danger-hover' do %>
-            <i class="bi bi-trash">Destroy</i>
-          <% end %>                
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-</div>
-
-  <div class="card-footer border-0 py-5">
-    <span class="text-muted text-sm">Showing 10 items out of 250 results found</span>
+        <tr>
+          <th scope="col">Image</th>
+          <th scope="col">Max Guests</th>
+          <th scope="col">Price Per Night</th>
+          <th scope="col">Room Type</th>
+          <th scope="col">Booking Start</th>
+          <th scope="col">Booking End</th>
+          <th scope="col">Status</th>
+          <th scope="col">Action</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @rooms.each do |room| %>
+          <tr>
+            <td>
+              <%= image_tag main_app.url_for(room.room_images.first.url), size: "25x25" if room.room_images.attached? %>
+            </td>
+            <td><%= room.max_guests %></td>
+            <td><%= currency_symbol(current_currency) %> <%= room.price_per_month %></td>
+            <td><%= room.room_type&.name %></td>
+            <td><%= room.booking_start&.strftime("%b %d, %Y")%></td>
+            <td><%= room.booking_end&.strftime("%b %d, %Y")%></td>
+            <td><%= room.status%></td>
+            <td class="text-end d-flex justify-content-end">
+              <%= link_to edit_admin_property_room_path(@property, room), class: 'btn d-inline-flex btn-sm btn-neutral mx-1' do %>
+                <i class="bi bi-pencil">Edit</i>
+              <% end %>  
+              <%= link_to admin_property_room_path(@property, room), class: 'btn d-inline-flex btn-sm btn-neutral mx-1' do %>
+                <i class="bi bi-eye">View</i>
+              <% end %>
+              <%= button_to admin_property_room_path(@property, room), method: :delete, data: { turbo_method: :delete, turbo_confirm: 'Are you sure?' }, class: 'btn btn-sm btn-neutral mx-1 text-danger-hover' do %>
+                <i class="bi bi-trash">Destroy</i>
+              <% end %>                
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
-</div>  
+</div> 
+<div class="d-flex justify-content-center">
+  <%= paginate @rooms %>
+</div>
+ 

data/app/views/stay/admin/users/show.html.erb

@@ -6,12 +6,15 @@
           <h2 class="text-xl font-semibold mb-0">User Details</h2> 
         </div>
         <div class="card-body">
-          <p><strong>Full Name: </strong><%= @user.first_name %> <%= @user.last_name %></p>
+          <%if @user.profile_image.attached?%>
+            <p><strong>Profile Image: </strong><%= image_tag main_app.url_for(@user.profile_image), size: "100x100", class: "mt-2"  %></p>
+          <%end%>
+          <p><strong>Full Name: </strong><%= @user.full_name %></p>
           <p><strong>Email: </strong><%= @user.email %></p> 
           <p><strong>Phone: </strong><%= @user.phone %></p>
-          <p><strong>Date of Birth: </strong><%= @user.date_of_birth %></p>
+          <p><strong>Date of Birth: </strong><%= @user.date_of_birth&.strftime("%b %d, %Y") %></p>
           <p><strong>Gender: </strong><%= @user.gender %></p>
-          <p><strong>Roles: </strong><%= @user.stay_roles.map(&:name).join(", ") %></p>
+          <p><strong>Role: </strong><%= @user.stay_roles.map(&:name).join(", ").capitalize %></p>
           <div class="d-flex mt-4 p-4 justify-content-center">  
             <%= link_to 'Edit', edit_admin_user_path(@user), class: 'btn btn-warning me-3' %> 
             <%= link_to 'Back', admin_users_path, class: 'btn btn-secondary' %>

data/db/migrate/20250407101335_add_field_to_stay_users.rb

@@ -0,0 +1,7 @@
+class AddFieldToStayUsers < ActiveRecord::Migration[8.0]
+  def change
+    add_column :stay_users, :country, :string
+    add_column :stay_users, :about_me, :text
+    add_column :stay_users, :country_code, :string
+  end
+end

data/lib/stay/version.rb

@@ -1,3 +1,3 @@
 module Stay
-  VERSION = "0.1.11"
+  VERSION = "0.1.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stay_commerce
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.13
 platform: ruby
 authors:
 - w3villa-vikaspal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-07 00:00:00.000000000 Z
+date: 2025-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -479,6 +479,7 @@ files:
 - app/assets/stylesheets/stay/webpixels.css
 - app/channels/chat_channel.rb
 - app/controllers/concerns/stay/booking_validations.rb
+- app/controllers/concerns/stay/image_resizer_concern.rb
 - app/controllers/concerns/stay/stripe_concern.rb
 - app/controllers/devise/api/tokens_controller.rb
 - app/controllers/stay/admin/addresses_controller.rb
@@ -610,13 +611,13 @@ files:
 - app/serializers/cancellation_policy_serializer.rb
 - app/serializers/chat_serializer.rb
 - app/serializers/credit_card_serializer.rb
+- app/serializers/feature_serializer.rb
 - app/serializers/house_rules_serializer.rb
 - app/serializers/invoice_serializer.rb
 - app/serializers/last_5_messages_serializer.rb
 - app/serializers/line_item_serializer.rb
 - app/serializers/message_serializer.rb
 - app/serializers/property_category_serializer.rb
-- app/serializers/property_feature_serializer.rb
 - app/serializers/property_listing_serializer.rb
 - app/serializers/property_serializer.rb
 - app/serializers/property_type_serializer.rb
@@ -935,6 +936,7 @@ files:
 - db/migrate/20241205092943_create_friendly_id_slugs.rb
 - db/migrate/20241217044817_add_deleted_atto_stay_property.rb
 - db/migrate/20241230064432_modify_property_category_on_properties.rb
+- db/migrate/20250407101335_add_field_to_stay_users.rb
 - db/seeds.rb
 - lib/stay.rb
 - lib/stay/controller_helpers/currency.rb

data/app/serializers/property_feature_serializer.rb

@@ -1,5 +0,0 @@
-class PropertyFeatureSerializer < ActiveModel::Serializer
-  attributes :id , :name, :feature_type
-  # has_many :properties, serializer: PropertySerializer
-
-end