ishapi 0.1.8.247 → 0.1.8.249

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aacf8a72aa5ec583348564983e0f4669c77cfe34e5fc2937ec2fd034035da67
-  data.tar.gz: 86176dafc89e2950c1fcdbcf05b109025cf8daac11419ec456c1d2016d9b1779
+  metadata.gz: 7a2fa517bcafd99d966e6766dd6208f5de27e50c933abf3ec2da3ddc818ccad7
+  data.tar.gz: 12db5b785227dbd18112ce8d054d935a547071edde7bf827009e0063f6bc3706
 SHA512:
-  metadata.gz: 122a756190be6286e6ea4859aba9b2a7122ef9299c3d43b382d2633be8797b4b6fa24a1631acb37f351d872ff8b325f52f34748e052a5bb890e09bca69bfe6d0
-  data.tar.gz: 559b8e6c0b1bc7c2124aa7e3b57056212db0db13c6631952e4d7abfec41f891aa04301b74606f7a1b2f1668b4b5dacc61a408025053714005bac1e600c1a9825
+  metadata.gz: aa23ab17391b6f2fe2cf51c359be661dbe3856c38a847d6d7387ed025402f953f33164d26268c48bdad7de95737399830e615d427e620b873688c52b3a22678d
+  data.tar.gz: bafad99ab0371992514d11f1be613a36d79cce650d6f9da2588880b63ec27e784f484c2dad30b029e9f4128825d13e5b38fbc10125488ae2748f9e96125388b4

data/app/controllers/ishapi/application_controller.rb

@@ -61,7 +61,7 @@ class ::Ishapi::ApplicationController < ActionController::Base
 
   private
 
-  ## This returns an empty profile if not logged in!
+  ## This returns an empty profile if not logged in
   def check_profile
     begin
       decoded = decode(params[:jwt_token])

data/app/controllers/ishapi/payments_controller.rb

@@ -1,132 +1,100 @@
 require_dependency "ishapi/application_controller"
-module Ishapi
-  class PaymentsController < ApplicationController
-
-    before_action :check_profile, only: %i| create2 unlock |
-
-    # alphabetized : )
-
-    ##
-    ## this was for invoices on wasya.co
-    ## 20200712
-    ##
-    def create
-      authorize! :open_permission, ::Ishapi
-      begin
-        invoice = Ish::Invoice.where( :email => params[:email], :number => params[:number] ).first
-        payment = Ish::Payment.new :invoice => invoice, :email => params[:email], :amount => params[:amount]
-        amount_cents  = ( params[:amount].to_f * 100 ).to_i
-
-        ::Stripe.api_key = STRIPE_SK
-        acct = Stripe::Account.create(
-          :country => 'US',
-          :type => 'custom'
-        )
-        charge = ::Stripe::Charge.create(
-          :amount => amount_cents,
-          :currency => 'usd',
-          :source => params[:token][:id],
-          :destination => {
-            :account => acct,
-          }
-        )
-
-        payment.charge = JSON.parse( charge.to_json )
-        if payment.save
-          render :json => { :status => :ok }
-        else
-          render :status => 404, :json => {}
-        end
-      rescue Mongoid::Errors::DocumentNotFound => e
-        puts! e, 'e'
-        render :status => 404, :json => {}
-      end
+class Ishapi::PaymentsController < ApplicationController
+
+  before_action :check_profile, only: %i| create unlock |
+
+  # alphabetized : )
+
+  ## _vp_ 2020-07-21 This is for guyd
+  ## _vp_ 2022-03-01 It's been a while!
+  ## _vp_ 2022-09-04 continue
+  ##
+  ## @TODO: cannot proceed if already is_purchasing?
+  ## @TODO: and this doesn't say what you're buying! herehere
+  ##
+  def create
+    authorize! :create, ::Ish::Payment
+
+    puts! @current_profile, 'current_profile'
+
+    @current_profile.update_attributes({ is_purchasing: true })
+
+    begin
+      amount_cents  = params[:amount_cents].to_i # @TODO: change
+
+      ::Stripe.api_key = ::STRIPE_SK
+      intent = Stripe::PaymentIntent.create({
+        amount: amount_cents,
+        currency: 'usd',
+        metadata: { integration_check: "accept_a_payment" },
+      })
+
+      payment = Ish::Payment.create!(
+        client_secret: intent.client_secret,
+        email: @current_profile.email,
+        payment_intent_id: intent.id,
+        profile_id: @current_profile.id,
+      )
+      render json: {
+        client_secret: intent.client_secret,
+        clientSecret: intent.client_secret,
+      }
+
+    rescue Mongoid::Errors::DocumentNotFound => e
+      puts! e, '#create2 Mongoid::Errors::DocumentNotFound'
+      render :status => 404, :json => e
     end
+  end
 
-    ## _vp_ 2020-07-21 This is for guyd
-    ## _vp_ 2022-03-01 It's been a while!
-    ## _vp_ 2022-09-04 continue
-    ##
-    ## @TODO: cannot proceed if already is_purchasing?
-    ##
-    def create2
-      authorize! :create, ::Ish::Payment
-      @current_profile.update_attributes({ is_purchasing: true })
-
-      begin
-        amount_cents  = params[:amount_cents].to_i # @TODO: change
-
-        ::Stripe.api_key = ::STRIPE_SK
-        intent = Stripe::PaymentIntent.create({
-          amount: amount_cents,
-          currency: 'usd',
-          metadata: { integration_check: "accept_a_payment" },
-        })
-
-        payment = Ish::Payment.create!(
-          client_secret: intent.client_secret,
-          email: @current_profile.email,
-          payment_intent_id: intent.id,
-          profile_id: @current_profile.id,
-        )
-
-        render json: { client_secret: intent.client_secret }
-      rescue Mongoid::Errors::DocumentNotFound => e
-        puts! e, '#create2 Mongoid::Errors::DocumentNotFound'
-        render :status => 404, :json => e
-      end
+  ##
+  ## webhook
+  ##
+  def stripe_confirm
+    authorize! :open_permission, ::Ishapi
+    payload = request.body.read
+    event = nil
+    begin
+      event = Stripe::Event.construct_from(JSON.parse(payload, symbolize_names: true))
+    rescue StandardError => err
+      puts! err, 'could not #stripe_confirm'
+      render status: 400, json: { status: :not_ok }
+      return
     end
 
-    ##
-    ## webhook
-    ##
-    def stripe_confirm
-      authorize! :open_permission, ::Ishapi
-      payload = request.body.read
-      event = nil
-      begin
-        event = Stripe::Event.construct_from(JSON.parse(payload, symbolize_names: true))
-      rescue StandardError => e
-        puts! e, 'could not #stripe_confirm'
-        render status: 400, json: { status: :not_ok }
-        return
-      end
-
-      payment_intent = event.data.object
-
-      payment = Ish::Payment.where( payment_intent_id: payment_intent.id ).first
-      if payment && payment_intent['status'] == 'succeeded'
-
-        payment.update_attributes( status: :confirmed )
-        n_unlocks = payment.profile.n_unlocks + 1 # @TODO: it's not always 5? adjust
-
-        payment.profile.update_attributes!( n_unlocks: n_unlocks, is_purchasing: false )
-      end
-
-      render status: 200, json: { status: :ok }
-    end
+    payment_intent = event.data.object
 
-    ##
-    ## Spend an unlock without spending money. _vp_ 2022-03-01
-    ##
-    def unlock
-      authorize! :unlock, ::Ish::Payment
-      item = Object::const_get(params['kind']).find params['id']
+    payment = Ish::Payment.where( payment_intent_id: payment_intent.id ).first
+    if payment && payment_intent['status'] == 'succeeded'
 
-      existing = Purchase.where( user_profile: @current_profile, item: item ).first
-      if existing
-        render status: 200, json: { status: :ok, message: 'already purchased' }
-        return
-      end
+      payment.update_attributes( status: :confirmed )
+      n_unlocks = payment.profile.n_unlocks + 1 # @TODO: it's not always 5, adjust! herehere
 
-      @current_profile.inc( n_unlocks: -item.premium_tier )
+      payment.profile.update_attributes!( n_unlocks: n_unlocks, is_purchasing: false )
+    end
 
-      purchase = ::Gameui::PremiumPurchase.create!( item: item, user_profile: @current_profile, )
+    render status: 200, json: { status: :ok }
+  end
 
-      @profile = @current_profile
-      render 'ishapi/user_profiles/account'
+  ##
+  ## Spend an unlock without spending money. _vp_ 2022-03-01
+  ##
+  def unlock
+    authorize! :unlock, ::Ish::Payment
+    item = Object::const_get(params['kind']).find params['id']
+
+    existing = Purchase.where( user_profile: @current_profile, item: item ).first
+    if existing
+      render status: 200, json: { status: :ok, message: 'already purchased' }
+      return
     end
 
+    @current_profile.inc( n_unlocks: -item.premium_tier )
+
+    purchase = ::Gameui::PremiumPurchase.create!( item: item, user_profile: @current_profile, )
+
+    @profile = @current_profile
+    render 'ishapi/user_profiles/account'
   end
+
 end
 

data/app/jobs/ishapi/email_message_intake_job.rb

@@ -1,17 +1,6 @@
 
-=begin
-
-m_id_2 = "2021-07-12T19_17_26Fpedidos_jmc2_gmail_com"
-stub = Stub.new( object_key: m_id_2 )
-stub = Stub.find_by( object_key: m_id_2 )
-stub.update_attribute(:state, 'state_pending')
-Ishapi::EmailMessageIntakeJob.perform_now( stub.id.to_s )
-
-=end
-
-
 ##
-## 2023-02-26 _vp_ let's go
+## 2023-02-26 _vp_ Let's go
 ## 2023-03-02 _vp_ Continue
 ## 2023-03-07 _vp_ Continue
 ##

data/config/routes.rb

@@ -4,9 +4,6 @@ Ishapi::Engine.routes.draw do
   root :to => 'application#home'
   post 'home', :to => 'application#home'
 
-  # A
-  resources :addresses
-
   # E
   post 'email_messages',    to: 'email_messages#receive'
   get 'email_messages/:id', to: 'email_messages#show', as: :email_message
@@ -47,10 +44,8 @@ Ishapi::Engine.routes.draw do
 
   post 'do_purchase', to: 'gameui#do_purchase' # @TODO: rename to just purchase, or destroy endpoint
   post 'payments', :to => 'payments#create'
-  post 'payments2', :to => 'payments#create2' # @TODO: change
-  get  'payments2', to: 'payments#create2'
   post 'payments/unlock', to: 'payments#unlock' # do_purchase
-  post  'stripe_confirm', to: 'payments#stripe_confirm' # @TODO: test-drive
+  post 'payments/stripe_confirm', to: 'payments#stripe_confirm' # @TODO: test-drive herehere
 
   get 'photos/view/:id', to: 'photos#show'
   get 'profiles/view/:username', :to => 'user_profiles#show'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.247
+  version: 0.1.8.249
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-28 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -208,7 +208,6 @@ files:
 - app/assets/stylesheets/ishapi/galleries.scss
 - app/assets/stylesheets/ishapi/locations.scss
 - app/assets/stylesheets/scaffold.css
-- app/controllers/ishapi/addresses_controller.rb
 - app/controllers/ishapi/application_controller.rb
 - app/controllers/ishapi/email_conversations_controller.rb
 - app/controllers/ishapi/email_messages_controller.rb

data/app/controllers/ishapi/addresses_controller.rb

@@ -1,23 +0,0 @@
-require_dependency "ishapi/application_controller"
-
-module Ishapi
-  class AddressesController < ApplicationController
-    before_action :check_profile, :only => [ :create ]
-
-    def create
-      if @current_profile.addresses.length == 0
-        @address = CoTailors::Address.new({ :profile_id => @current_profile.id })
-      else
-        @address = @current_profile.addresses[0]
-      end
-      authorize! :update, @address
-      flag = @address.update_attributes( params[:address].permit(:name, :phone, :address_1, :address_2, :city, :state, :zipcode ) )
-      if flag
-        render :json => { :status => :ok, :message => 'Successfully put an address.' }
-      else
-        render :json => { :status => :not_ok, :error => @address.errors.messages }
-      end
-    end
-
-  end
-end