stay_commerce 0.1.13 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8ab666ef6621d55e7d2aac249f86d0ea9e2c0ccb902bda7de026a5013181372
-  data.tar.gz: 432b2ded3073a63f4757e7721dec5c9e21203f3a51377382f23eb5a503650d52
+  metadata.gz: 9d0d6e7e7fd52f6bc5e4fc1cc93e67e3c25f0189e68819f5ccfd6960000f19c3
+  data.tar.gz: 30020c4ff02d737546258c180fd61ae13993381cca5889864573761c9713c3ad
 SHA512:
-  metadata.gz: d046d3c8f75dc3e92614d66d991770d3d03a606458aec4c81fc3a3a9108fc1d2c5f8e45aea562cc8d62b50d55b8f9325949a16451daf41683ef59e33f20a0014
-  data.tar.gz: aa34ce806d5e6f5300f7386f359dcc57d25e1920a869b2181e327710480cd88007846930e378dc2e77256e2b528dd784ddbf1c5b46a545c368c92c8b3853e66c
+  metadata.gz: 00070b66f223b1df2595071ce2afe1852f36c090794240a91a898bbd6edb5349149715398da5e2f80762ac032f2e9699ea1e4c89ee85a86f514402e10aa80ff0
+  data.tar.gz: c6b7951b2199d3e61d31ae9dde5482c48b915b9cfa1e8d2362ae4a48b934c77c82e7413f7f8aaf00249fa9c5dadb6f2caf7a869da5d04dba3d428b3c2ec9b2b8

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

@@ -1,72 +1,107 @@
+require "openssl"
+require "base64"
+require "dotenv/load"
 module Stay
     module StripeConcern
-        extend ActiveSupport::Concern
-        def user
-            current_devise_api_user || current_user
-        end
+      extend ActiveSupport::Concern
 
-        def create_payment_method
-            Stripe::PaymentMethod.create({
-                type: params[:payment_method_type],
-                card: {
-                    number: params[:number],
-                    exp_month: params[:exp_month],
-                    exp_year: params[:exp_year],
-                    cvc: params[:cvc],
-                },
-            })
-        end
-        def create_customer
-            Stripe::Customer.create({
-                email: user.email,
-                name: "#{user.first_name} #{user.last_name}",
-                address: {
-                    city: user.addresses.last&.city,
-                    state: user.addresses.last&.state.name,
-                    country: user.addresses.last&.country.name,
-                    line1: user.addresses.last&.address1,
-                    line2: user.addresses.last&.address2,
-                    postal_code: user.addresses.last&.zipcode
-                },
-                metadata: { order_id: user.id }
-            })
-        end
+      included do
+        Stripe.api_key = Rails.configuration.stripe[:secret_key]
+      end
 
-        def create_or_retrieve_customer
-            customers = Stripe::Customer.list(email: user.email).data
-            if customers.empty?
-                create_customer
-            else
-                customers.first
-            end
-        end
+      def user
+        current_devise_api_user || current_user
+      end
+
+      def create_payment_method
+        Stripe::PaymentMethod.create({
+          type: params[:payment_method_type],
+          card: {
+            number: params[:number],
+            exp_month: params[:exp_month],
+            exp_year: params[:exp_year],
+            cvc: params[:cvc]
+          }
+        })
+      end
+
+      def create_customer
+       customer =  Stripe::Customer.create({
+          email: user.email,
+          name: "#{user.first_name} #{user.last_name}",
+          address: {
+            city: user.addresses.last&.city,
+            state: user.addresses.last&.state&.name,
+            country: user.addresses.last&.country&.name,
+            line1: user.addresses.last&.address1,
+            line2: user.addresses.last&.address2,
+            postal_code: user.addresses.last&.zipcode
+          },
+          metadata: { order_id: user.id }
+        })
+        user.update(stripe_customer_id: customer.id)
+      end
 
-        def create_payment_intent 
-            Stripe::PaymentIntent.create(
-                amount: @booking.total.to_i* 100,
-                description: @booking.user.email,
-                currency: params[:currency] || 'INR',
-                payment_method: params[:payment_method_id],
-                automatic_payment_methods: { enabled: true },
-                receipt_email: user.email,
-                customer: @customer,
-                confirm: params[:confirm],
-                return_url: params[:redirect_url]
-            )
+      def create_or_retrieve_customer
+        if user.stripe_customer_id.present?
+          @customer  = Stripe::Customer.retrieve(user.stripe_customer_id)
+        else
+          @customer =  create_customer
         end
+      end
+
+      def create_payment_intent
+        payment_method_id = params[:payment_method_id]
+        payment_intent = Stripe::PaymentIntent.create(
+          amount: (@booking.total_amount * 100).to_i,
+          description: @booking.user.email,
+          currency: params[:currency] || "usd",
+          payment_method: payment_method_id,
+          receipt_email: user.email,
+          customer: @customer,
+          confirm: false
+        )
+        if payment_intent.status == "requires_confirmation"
+          payment_intent = confirm_payment_intent(payment_intent.id, payment_method_id)
+        end      
+      end
+
+      def get_payment_intent
+        Stripe::PaymentIntent.retrieve(@booking.payment_intent_id)
+      end
+
+      def attach_payment_method_to_customer(payment_method_token, customer_id)
+        Stripe::PaymentMethod.attach(
+          payment_method_token,{ customer: customer_id }
+        )
+      end
+
+      def create_payment_method_from_token(token)
+        payment_method = Stripe::PaymentMethod.create({
+            type: "card",
+            card: { token: token }  
+        })
         
-        def get_payment_intent
-            Stripe::PaymentIntent.retrieve(@booking.payment_intent_id)
-        end
+        attach_payment_method_to_customer( payment_method.id, current_devise_api_user.stripe_customer_id)
+        payment_method.id
+      end
 
-        def confirm_payment_intent
-            Stripe::PaymentIntent.confirm(
-            params[:payment_intent_id],
-            {
-                payment_method: params[:payment_method_id], 
-                return_url: params[redirect_url],
-            })
-        end    
-                        
-    end
-end
+      def confirm_payment_intent(payment_intent_id, payment_method_id)
+        Stripe::PaymentIntent.confirm(
+          payment_intent_id,
+        {
+            payment_method: payment_method_id,
+            # return_url: params[redirect_url]
+        })
+      end
+      
+      def destroy_payment_method(payment_method_token)
+        begin
+          Stripe::PaymentMethod.detach(payment_method_token)
+        rescue Stripe::InvalidRequestError => e
+          raise "Failed to detach payment method: #{e.message}"
+        end
+      end
+      
+  end
+end

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/api/v1/credit_cards_controller.rb

@@ -1,6 +1,7 @@
 class Stay::Api::V1::CreditCardsController < Stay::BaseApiController
   before_action :authenticate_devise_api_token!
-  before_action :set_credit_card, only: %i[show edit update]
+  before_action :set_credit_card, only: %i[show edit update destroy]
+  include Stay::StripeConcern
 
   def index
     @credit_cards = current_devise_api_user.credit_cards
@@ -25,11 +26,17 @@ class Stay::Api::V1::CreditCardsController < Stay::BaseApiController
   end
 
   def create
-    @credit_card = current_devise_api_user.credit_cards.build(credit_card_params)
-    if @credit_card.save
-      render json: { message: "Credit card saved successfully", data: CreditCardSerializer.new(@credit_card), success: true }, status: :ok
-    else
-      render json: { error: "Credit card not saved", success: false, errors: @credit_card.errors.full_messages }, status: :unprocessable_entity
+    begin
+      token = create_payment_method_from_token(credit_card_params[:card_token])
+      @credit_card = current_devise_api_user.credit_cards.build(credit_card_params.merge(payment_method_token: token))
+
+      if @credit_card.save
+        render json: { message: "Credit card saved successfully", data: CreditCardSerializer.new(@credit_card), success: true }, status: :ok
+      else
+        render json: { error: "Credit card not saved", success: false, errors: @credit_card.errors.full_messages }, status: :unprocessable_entity
+      end
+    rescue Stripe::InvalidRequestError => e
+      render json: { error: e.message, success: false }, status: :unprocessable_entity
     end
   end
 
@@ -38,17 +45,31 @@ class Stay::Api::V1::CreditCardsController < Stay::BaseApiController
   end
 
   def update
-    if @credit_card.update(credit_card_params)
+    if @credit_card.update(credit_card_params.except(:card_token))
       render json: { message: "Credit card updated successfully", data: CreditCardSerializer.new(@credit_card), success: true }, status: :ok
     else
       render json: { error: "Credit card not updated", success: false, errors: @credit_card.errors.full_messages }, status: :unprocessable_entity
     end
   end
 
-  # def destroy
-  #   @credit_card.destroy
-  #   render json: { message: "Credit card successfully deleted", success: true }, status: :ok
-  # end
+  def destroy
+    begin
+      destroy_payment_method(@credit_card.payment_method_token)
+
+      if @credit_card.destroy
+        render json: { message: "Credit card successfully deleted", success: true }, status: :ok
+      else
+        render json: { error: "Failed to delete credit card", success: false, errors: @credit_card.errors.full_messages }, status: :unprocessable_entity
+      end
+    rescue Stripe::InvalidRequestError => e
+      render json: { error: "Stripe error: #{e.message}", success: false }, status: :unprocessable_entity
+    rescue ActiveRecord::RecordNotFound
+      render json: { error: "Credit card not found", success: false }, status: :not_found
+    rescue StandardError => e
+      render json: { error: "An unexpected error occurred: #{e.message}", success: false }, status: :internal_server_error
+    end
+  end
+
 
   private
 
@@ -57,6 +78,6 @@ class Stay::Api::V1::CreditCardsController < Stay::BaseApiController
   end
 
   def credit_card_params
-    params.require(:credit_card).permit(:month, :year, :cc_number, :cc_type, :name)
+    params.require(:credit_card).permit(:month, :year, :cc_number, :cc_type, :name, :card_token, :payment_method_token)
   end
 end

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

@@ -19,22 +19,26 @@ class Stay::Api::V1::MessagesController < Stay::BaseApiController
       total_pages = (total_count.to_f / per_page).ceil
 
       messages = @chat.messages
-                     .order(created_at: :asc)
-                     .limit(cumulative_limit)
+                      .order(created_at: :desc)
+                      .limit(cumulative_limit)
 
-      chat_json = ChatSerializer.new(
-        @chat,
-        scope: { current_user: current_devise_api_user }
-      ).as_json
+      grouped_messages = messages
+                           .select("DATE(created_at) as message_date, stay_messages.*")
+                           .group_by { |message| message.created_at.to_date }
 
-      messages_json = messages.map do |message|
-        MessageSerializer.new(message, scope: current_devise_api_user).as_json
+      grouped_messages_json = grouped_messages.transform_keys(&:to_s).map do |date, msgs|
+        {
+          date: formatted_date(date.to_date),
+          messages: ActiveModelSerializers::SerializableResource.new(msgs, each_serializer: MessageSerializer)
+        }
       end
 
+      serialized_chat = ActiveModelSerializers::SerializableResource.new(@chat, serializer: ChatSerializer, scope: { current_user: current_devise_api_user })
+
       render json: {
         data: "Messages Found",
-        chat: chat_json,
-        message: messages_json,
+        chat: serialized_chat,
+        message: grouped_messages_json,
         success: true,
         meta: {
           total_pages: total_pages,
@@ -48,6 +52,7 @@ class Stay::Api::V1::MessagesController < Stay::BaseApiController
       render json: { error: e.message, success: false }, status: :internal_server_error
     end
   end
+
   def new
     @message = @chat.messages.new
     render json: { data: "Message form loaded", message: @message, success: true }, status: :ok

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

@@ -1,5 +1,5 @@
 class Stay::Api::V1::PaymentsController < Stay::BaseApiController
-  include Stay::StripeConcern 
+  include Stay::StripeConcern
 
     before_action :set_booking, except: :payment_method
     before_action :authenticate_devise_api_token!
@@ -13,33 +13,80 @@ class Stay::Api::V1::PaymentsController < Stay::BaseApiController
         render json: { error: "no method found", success: false }, status: :unprocessable_entity
       end
     end
-    
+
+    def create_payment_method
+      payment_method = create_payment_method(payment_method_params)
+      attach_payment_method(payment_method.id)
+      render json: { message: "Payment method created and attached successfully.", payment_method: payment_method }
+    rescue Stripe::StripeError => e
+      render json: { error: e.message }, status: :unprocessable_entity
+    end
+
+    def list_payment_methods
+      payment_methods = list_payment_methods
+      render json: { payment_methods: payment_methods.data }
+    rescue Stripe::StripeError => e
+      render json: { error: e.message }, status: :unprocessable_entity
+    end
+
     def create
-        begin
-            customer = create_or_retrieve_customer
-            payment_intent = @booking.payment_intent_id ? get_payment_intent : create_payment_intent.tap { |pi| @booking.update(payment_intent_id: pi.id) }
-            if params[:confirm]
-                if payment_intent.status == 'succeeded'
-                    render json: { message: "Payment successful", payment_intent: payment_intent }, status: :ok
-                elsif payment_intent.status == 'requires_action'
-                    render json: { message: "Payment requires further action", client_secret: payment_intent.client_secret, payment_intent_id: payment_intent["id"] }, status: :ok
-                else
-                    render json: { message: "Payment failed", error: payment_intent.last_payment_error }, status: :unprocessable_entity
-                end
-            else 
-                render json: {payment_intent: payment_intent, client_secret: payment_intent.client_secret}, status: :ok
-            end
-        rescue Stripe::CardError => e
-          render json: { error: e.message }, status: :unprocessable_entity
-        rescue => e
-          render json: { error: "Something went wrong" }, status: :internal_server_error
+      begin
+        customer = create_or_retrieve_customer
+    
+        payment_intent = if @booking.payment_intent_id && @booking.payment_state == "confirmed"
+                           get_payment_intent
+                         else
+                           create_payment_intent
+                         end
+    
+        payment_status = case payment_intent.status
+                         when "succeeded"
+                           "confirmed"
+                         when "requires_action"
+                           "pending"
+                         else
+                           "failed"
+                         end
+        create_payment(payment_intent, payment_status, @booking)
+        @booking.update(payment_intent_id: payment_intent.id, payment_state:payment_status)
+    
+        if payment_intent.status == "requires_action"
+          render json: {
+            message: "Payment requires further action",
+            client_secret: payment_intent.client_secret,
+            payment_intent_id: payment_intent.id
+          }, status: :ok
+        elsif payment_intent.status == "succeeded"
+          render json: {
+            message: "Payment successful",
+            payment_intent: payment_intent
+          }, status: :ok
+        else
+          render json: {
+            message: "Payment failed",
+            error: payment_intent.last_payment_error
+          }, status: :unprocessable_entity
         end
+      rescue Stripe::CardError => e
+        render json: { error: e.message }, status: :unprocessable_entity
+      rescue => e
+        render json: { error: e.message }, status: :internal_server_error
+      end
+    end
+    
+    def create_payment(payment_intent, status, booking)
+      Stay::Payment.create!(
+        booking: booking,
+        payment_method: Stay::PaymentMethod.last,
+        amount: booking.total_amount,
+        state: status,
+      )
     end
-  
+
     def confirm
       payment_intent = get_payment_intent
-      if payment_intent.status == 'succeeded'
-        @booking.update(status: 'completed')
+      if payment_intent.status == "succeeded"
+        @booking.update(status: "completed")
         render json: { success: true, redirect_url: params[:redirect_url] }
       else
         render json: { error: payment_intent.last_payment_error.message }, status: 422
@@ -48,14 +95,12 @@ class Stay::Api::V1::PaymentsController < Stay::BaseApiController
 
     private
 
-  
+
     def payment_params
       params.require(:payment).permit(:amount, :currency, :payment_method_id, :description, :customer_email)
     end
-    
+
     def set_booking
       @booking = Stay::Booking.find(params[:booking_id])
     end
-
-  end
-
+end

data/app/controllers/stay/payments_controller.rb

@@ -1,11 +1,11 @@
 class Stay::PaymentsController < ApplicationController
   include Stay::StripeConcern
-
-  before_action :authenticate_user!
+  skip_before_action :verify_authenticity_token
+  before_action :authenticate_devise_api_token!
   before_action :set_property_and_booking
-  
+
   def new
-    render layout: 'stay/application'
+    render layout: "stay/application"
   end
 
   def create
@@ -13,28 +13,28 @@ class Stay::PaymentsController < ApplicationController
         @customer = create_or_retrieve_customer
         payment_intent = @booking.payment_intent_id ? get_payment_intent : create_payment_intent.tap { |pi| @booking.update(payment_intent_id: pi.id) }
         if params[:confirm]
-            if payment_intent.status == 'succeeded'
+            if payment_intent.status == "succeeded"
                 render json: { success: true, redirect_url: params[:redirect_url] }, status: :ok
-            elsif payment_intent.status == 'requires_action'
+            elsif payment_intent.status == "requires_action"
                 render json: { message: "Payment requires further action", client_secret: payment_intent.client_secret }, status: :ok
             else
                 render json: { message: "Payment failed", error: payment_intent.last_payment_error }, status: :unprocessable_entity
             end
-        else 
-            render json: {payment_intent: payment_intent, client_secret: payment_intent.client_secret}, status: :ok
+        else
+            render json: { payment_intent: payment_intent, client_secret: payment_intent.client_secret }, status: :ok
         end
     rescue Stripe::CardError => e
       render json: { error: e.message }, status: :unprocessable_entity
     rescue => e
-      render json: { error: e.message}, status: :internal_server_error
+      render json: { error: e.message }, status: :internal_server_error
     end
   end
 
   def confirm
       payment_intent = get_payment_intent
-      if payment_intent.status == 'succeeded'
-        @booking.update(status: 'completed')
-        flash[:notice] = 'Payment Completed Successfully'
+      if payment_intent.status == "succeeded"
+        @booking.update(status: "completed")
+        flash[:notice] = "Payment Completed Successfully"
         render json: { success: true, redirect_url: params[:redirect_url] }
       else
         flash[:alert] = payment_intent.last_payment_error.message
@@ -47,4 +47,4 @@ class Stay::PaymentsController < ApplicationController
     @property = Stay::Property.find(params[:property_id])
     @booking = Stay::Booking.find(params[:booking_id])
   end
-end
+end

data/app/models/stay/amenity.rb

@@ -1,13 +1,11 @@
 module Stay
   class Amenity < ApplicationRecord
     belongs_to :amenity_category, class_name: "Stay::AmenityCategory", optional: true
-    has_many :property_amenities, class_name: "Stay::PropertyAmenity"
+    has_many :property_amenities, class_name: "Stay::PropertyAmenity", dependent: :destroy
     has_many :properties, through: :property_amenities, class_name: "Stay::Property"
     enum :amenity_type, { property: 0, room: 1 }
 
-    has_many :room_amenities, class_name: "Stay::RoomAmenity"
+    has_many :room_amenities, class_name: "Stay::RoomAmenity", dependent: :destroy
     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

@@ -1,11 +1,10 @@
 module Stay
   class Feature < ApplicationRecord
-    has_many :property_features, class_name: "Stay::PropertyFeature"
+    has_many :property_features, class_name: "Stay::PropertyFeature", dependent: :destroy
     has_many :properties, through: :property_features, class_name: "Stay::Property"
-    has_many :room_features, class_name: "Stay::RoomFeature"
+    has_many :room_features, class_name: "Stay::RoomFeature", dependent: :destroy
     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/serializers/credit_card_serializer.rb

@@ -1,4 +1,3 @@
 class CreditCardSerializer < ActiveModel::Serializer
-  attributes :id, :month, :year, :cc_number, :cc_type, :name, :user
-  belongs_to :user
+  attributes :id, :month, :year, :cc_number, :cc_type, :name, :payment_method_token, :card_token
 end

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
 

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>