stay_commerce 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7666bce8280d873c254de1000f27e045c0de5fd8a3dec3bcae2ffbc3b5b0e321
-  data.tar.gz: 0e217c0d0723fda01c66d307b3296b581a9e786ed333d279033668cbcda6889e
+  metadata.gz: 21d65148be51476482fe86e79472e2e0bf311f49f9def7ee1be0d94cc908484e
+  data.tar.gz: d930047ffebe22e514475ee2a965c840ec7961265d2e3dd48126ac27551b01ef
 SHA512:
-  metadata.gz: cdd0be0c0dc98f8b3227f5f7636db735df93a329ce0e7ba604aa2c9a82c3dda5a36d36ab016e04ead29e3517030971357fd65f76861538cc10ffccaf7c108007
-  data.tar.gz: ba03f68fdcb000c05c39904ccd94afea3732eeb8cb2f26667b31324259b31e8166ba4ed3088d4592a94dce0b1b723f9040226d59285b501e38356f7e2cd829f5
+  metadata.gz: f4edf72e5d17bd18491b58f3b84b945ea297c01c7a0eb85e309a6899ed69a99cd92f96f81b121d387f22082fed143fe08ccc505fd9210849293f43fde2b5a405
+  data.tar.gz: 5fa10e530142899cffc424179a44001aabd2eb4e6897c836a76537b1c3323540005ba646212c74f9867f6c10740329396eedfa389fa19da0689018f96599294f

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

@@ -93,26 +93,18 @@ module Stay
       def determine_next_step(current_step)
         case current_step
         when "description"
-          "price"
-        when "price"
           "images"
         when "images"
           "details"
         when "details"
           "location"
-        when "location"
-          "amenities"
-        when "amenities"
-          "features"
-        when "features"
-          "calendar"
         else
           "description"
         end
       end
 
       def valid_step?(step)
-        %w[description price images details location amenities features calendar].include?(step)
+        %w[description images details location].include?(step)
       end
     end
   end

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/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/amenity.rb

@@ -7,7 +7,5 @@ module Stay
 
     has_many :room_amenities, class_name: "Stay::RoomAmenity"
     has_many :rooms, through: :room_amenities, class_name: "Stay::Room"
-
-    validates :name, presence: true, uniqueness: { case_sensitive: false }
   end
 end

data/app/models/stay/feature.rb

@@ -6,6 +6,5 @@ module Stay
     has_many :rooms, through: :room_features, class_name: "Stay::Room"
 
     enum :feature_type, { property: 0, room: 1 }
-    validates :name, presence: true, uniqueness: { case_sensitive: false }
   end
 end

data/app/models/stay/property.rb

@@ -1,5 +1,6 @@
 module Stay
   class Property < ApplicationRecord
+    STATUSES = %w[active inactive].freeze
     ACTIVE_STATUS = "active".freeze
     APPROVED = "approved".freeze
     PROPERTY = "property".freeze
@@ -58,7 +59,6 @@ module Stay
 
     after_restore :restore_associated_rooms
     after_restore :restore_active_storage_files
-    after_create :create_default_room
     after_update :update_prices
     after_create :create_store_property
     geocoded_by :combine_address

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/feature_serializer.rb

@@ -0,0 +1,3 @@
+class FeatureSerializer < ActiveModel::Serializer
+  attributes :id, :name, :feature_type
+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

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

data/app/serializers/room_serializer.rb

@@ -1,5 +1,5 @@
 class RoomSerializer < ActiveModel::Serializer
-  attributes :id, :max_guests, :price_per_month, :status, :booked_dates,
+  attributes :id, :name,:max_guests, :price_per_month, :status, :booked_dates,
              :booking_start, :booking_end, :description,
              :size, :bed_type, :room_type, :amenities, :features, :room_images
 
@@ -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/views/stay/admin/amenities/index.html.erb

@@ -33,8 +33,8 @@
         <% @amenities.each_with_index do |amenity, index| %>
           <tr>
             <td><%= index + 1%></td>
-            <td><%= amenity.name %></td>
-            <th scope="col"><%= amenity.amenity_type%></th>
+            <td><%= amenity.name&.humanize %></td>
+            <th scope="col"><%= amenity.amenity_type&.humanize%></th>
             <td class="text-end d-flex justify-content-center">
               <%= link_to edit_admin_amenity_path(amenity), class: 'btn d-inline-flex btn-sm btn-neutral mx-1' do %>
                 <i class="bi bi-pencil"></i>

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

@@ -33,8 +33,8 @@
         <% @features.each_with_index do |feature, index| %>
           <tr>
             <td><%= index + 1%></td>
-            <td><%= feature.name %></td>
-            <td><%= feature.feature_type %></td>
+            <td><%= feature.name&.humanize  %></td>
+            <td><%= feature.feature_type&.humanize %></td>
             <td class="text-end d-flex justify-content-center">
               <%= link_to edit_admin_feature_path(feature), class: 'btn d-inline-flex btn-sm btn-neutral mx-1' do %>
                 <i class="bi bi-pencil"></i>

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

@@ -13,15 +13,15 @@
   <div class="row">
     <div class="col-md-6">
       <div class="field">
-        <%= f.label :title, '*Title (mandatory)', class: "form-label" %>
+        <%= f.label :title, '*Title', class: "form-label" %>
         <%= f.text_field :title, required: true, class: 'form-control' %>
       </div>
     </div>
 
     <div class="col-md-6">
       <div class="field">
-        <%= f.label :description, 'Description', class: "form-label" %>
-        <%= f.text_area :description, class: 'form-control' %>
+        <%= f.label :description, '*Description', class: "form-label" %>
+        <%= f.text_area :description,required: true,  class: 'form-control' %>
       </div>
     </div>
   </div>
@@ -29,14 +29,14 @@
   <div class="row">
     <div class="col-md-6">
       <div class="field">
-        <%= f.label :property_category, '*Category (mandatory)', class: "form-label" %>
+        <%= f.label :property_category, '*Category', class: "form-label" %>
         <%= f.select :property_category_id, Stay::PropertyCategory.all.collect { |pc| [pc.name, pc.id] }, { include_blank: 'None' }, required: true, class: 'form-control custom-select-box', selected: @property.property_category&.name %>
       </div>
     </div>
     <div class="col-md-6">
       <div class="field">
-        <%= f.label :property_type, class:"form-label" %>
-        <%= f.select :property_type_id, Stay::PropertyType.all.collect { |rt| [rt.name, rt.id] }, { include_blank: 'Select Property Type' }, class: 'form-control custom-select-box', selected: @property.property_category&.name %>
+        <%= f.label :property_type, '*Type', class:"form-label" %>
+        <%= f.select :property_type_id, Stay::PropertyType.all.collect { |rt| [rt.name, rt.id] }, { include_blank: 'Select Property Type' },required: true,  class: 'form-control custom-select-box', selected: @property.property_category&.name %>
       </div>
     </div>
   </div>
@@ -44,15 +44,15 @@
   <div class="row">
     <div class="col-md-6">
       <div class="field">
-        <%= f.label :city, '*City (mandatory)', class: "form-label" %>
+        <%= f.label :city, '*City', class: "form-label" %>
         <%= f.text_field :city, value: property.city, required: true, class: "form-control" %>
       </div>
     </div>
 
     <div class="col-md-6">
       <div class="field">
-        <%= f.label :address, 'Address', class: "form-label" %>
-        <%= f.text_field :address, value: property.address, class: 'form-control' %>
+        <%= f.label :address, '*Address', class: "form-label" %>
+        <%= f.text_field :address, value: property.address, required: true, class: 'form-control' %>
       </div>
     </div>
   </div>
@@ -60,60 +60,19 @@
   <div class="row">
     <div class="col-md-6">
       <div class="field">
-        <%= f.label :guest_number, '*Guest No (mandatory)', class: "form-label" %>
-        <%= f.number_field :guest_number, value: property.guest_number, required: true, min: 0, class: "form-control" %>
-      </div>
-    </div>
-
-    <div class="col-md-6">
-      <div class="field">
-        <%= f.label :country, class: "form-label" %>
+        <%= f.label :country, '*Country',class: "form-label" %>
         <%= f.text_field :country, value: property.country, required: true, class: "form-control" %>
         <%#= f.select :country_id, options_from_collection_for_select(Stay::Country.all, :id, :name, property.country_id), { include_blank: 'Select Country' }, id: 'country_select', class: 'form-control custom-select-box' %>
       </div>
     </div>
-  </div>
-
-  <div class="row">
-    <div class="col-md-6">
-      <div class="field">
-        <%= f.label :bedroom_description, class: "form-label" %>
-        <%= f.text_field :bedroom_description, value: property.bedroom_description, class: "form-control" %>
-      </div>
-    </div>
-
     <div class="col-md-6">
       <div class="field">
-        <%= f.label :university_nearby, class: "form-label" %>
-        <%= f.text_field :university_nearby, value: property.university_nearby, class: "form-control" %>
+        <%= f.label :status, class: "form-label" %>
+        <%= f.select :status, Stay::Property::STATUSES.map { |status| [status.humanize, status] }, {}, class: 'form-control custom-select-box' %>
       </div>
     </div>
   </div>
-  <div class="row">
-    <div class="col-md-6">
-      <div class="field">
-        <%= f.label :about_neighbourhoods, class: "form-label" %>
-        <%= f.text_field :about_neighbourhoods, value: property.about_neighbourhoods, class: "form-control" %>
-      </div>
-    </div>
-
-    <div class="col-md-6">
-      <div class="field">
-        <%= f.check_box :active %>
-        <%= f.label :active, class:"form-label mt-8" %>
-      </div>
-    </div>
 
-  </div>
-
-  <div class="row">
-    <div class="col-md-6">
-      <div class="field">
-        <%= f.check_box :instant_booking %>
-        <%= f.label :instant_booking, "Allow instant booking", class:"form-label" %>
-      </div>
-    </div>
-  </div>
 
   <div class="row">
     <div class="col-md-12">