ishapi 0.1.8.74 → 0.1.8.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fac47d3eaf34f9148446b344c0500078806ddb9
-  data.tar.gz: e0c0533d160f720fdf43da7aa03e5380a495b488
+  metadata.gz: aea33948dc0597f370cec2f06610fa20a092ab0e
+  data.tar.gz: b31f137e9c80e29389c89f921cf7196242b9aeda
 SHA512:
-  metadata.gz: 90dc18a9da6a19f8545bd074536d6d94e0aac6b6529baedd172c01eb84b4643c104e5bd15cca36dcf5a05c85d3749fda3404334e21926c7e4db965681940803d
-  data.tar.gz: 5f3e19fea79a69014f2e43159796f5d167e13cdae74640fbc3101a0e929adc035fc5c4ff901fffdb95e39c7d7f6df918dd779e797509d45a6a8ef2a10ba96e2b
+  metadata.gz: f57e3ad0855e726c9f28dd42b3fb540ad7d87486054127887e7fea599c5247e4b8e976d04cb76ba23327f3049310a9dfe732df69dd6f41c7fc7c5105f495094d
+  data.tar.gz: dc72d641ae76ddede37645d63874fb992713fcd11194f746f547dc7752dd843d806e8fe51251ee95de6adea5b32d4d49a5dff6e537766ca6821507a85412cdfd

data/app/controllers/ishapi/measurements_controller.rb

@@ -0,0 +1,26 @@
+require_dependency "ishapi/application_controller"
+
+module Ishapi
+  class MeasurementsController < ApplicationController
+    before_action :check_profile, :only => [ :update ]
+
+    def update
+      authorize! :update_measurements, CoTailors::Order
+      flag = @current_profile.measurement.update_attributes params[:measurement].permit( CoTailors::Order::MEASUREMENT_PARAMS )
+
+      # byebug
+
+      if flag
+        render :json => { :status => :ok }
+      else
+        render :json => { :status => :not_ok, :error => @current_profile.measurement.errors.messages }
+      end
+    end
+
+    #
+    # private
+    #
+    private
+
+  end
+end

data/app/controllers/ishapi/order_items_controller.rb

@@ -6,22 +6,32 @@ module Ishapi
 
     def create
       authorize! :add, CoTailors::OrderItem
-      @measurement = CoTailors::ProfileMeasurement.create params['order_item'].permit( :neck_around )
       @order_item = CoTailors::OrderItem.new params['order_item'].permit( :quantity, :kind, :fabric )
       @order_item.order_id = @current_order.id
       @order_item.measurement = @measurement
-      @measurement.order_item_id = @order_item.id
-      @measurement.save
+      @order_item.cost = case params[:order_item][:kind]
+                         when CoTailors::OrderItem::KIND_SHIRT
+                           CoTailors::Product.where( :kind => 'shirt' ).first.cost
+                         when CoTailors::OrderItem::KIND_PANTS
+                           CoTailors::Product.where( :kind => 'pants' ).first.cost
+                         when CoTailors::OrderItem::KIND_SUIT
+                           CoTailors::Product.where( :kind => 'suit' ).first.cost
+                         end
+      @order_item.measurement = CoTailors::ProfileMeasurement.create params['order_item'].permit( CoTailors::Order::MEASUREMENT_PARAMS )
+
+      # byebug
 
       if params[:order_item][:saveMeasurement]
-        m = @current_profile.measurements[0] || CoTailors::ProfileMeasurement.create( :profile => @current_profile )
+        m = @current_profile.measurement || CoTailors::ProfileMeasurement.create( :profile => @current_profile )
         flag = m.update_attributes( measurement_params )
-        render :json => { :statuc => :not_ok, :error => m.errors.messages } and return if !flag
+        if !flag
+          render :json => { :statuc => :not_ok, :error => m.errors.messages }
+          return 
+        end
       end
       
       flag = @order_item.save
       if flag
-        puts! @order_item.measurement, 'ok'
         render :json => { :status => :ok, :message => 'Successfully put an order item' }
       else
         render :json => { :status => :not_ok, :error => @order_item.errors.messages }

data/app/controllers/ishapi/orders_controller.rb

@@ -16,6 +16,15 @@ params = {"token"=>{"id"=>"tok_1BoLkRDpn3WurCccVNQK4pfV", "object"=>"token", "ca
 
       @order = CoTailors::Order.where( :profile_id => @current_profile.id, :submitted_at => nil ).first
       @order.submitted_at = Time.now
+
+      Stripe.api_key = STRIPE_SK
+      charge = Stripe::Charge.create :amount => @order.grand_total, :currency => 'usd', :source => params['token']['id']
+      flag = charge.outcome[:type] == 'authorized'
+      if !flag
+        render :json => { :status => :not_ok, :message => "Something went wrong with the charge: " + charge.outcome.to_s }
+        return
+      end
+
       flag = @order.save
       if flag
         render :json => { :status => :ok, :message => 'Successfully placed the order' }

data/app/controllers/ishapi/products_controller.rb

@@ -0,0 +1,12 @@
+require_dependency "ishapi/application_controller"
+module Ishapi
+  class ProductsController < ApplicationController
+
+    def show
+      @product = ::CoTailors::Product.where( :kind => params[:kind] ).first
+      authorize! :show, @product
+    end
+
+  end
+end
+

data/app/models/ishapi/ability.rb

@@ -17,12 +17,11 @@ class Ishapi::Ability
         gallery.user == user
       end
 
-
       can [ :update ], ::CoTailors::Address do |address|
         puts [ user.inspect, address.inspect ], '+++ user in cancancan'
         true
       end
-      
+
     end
     #
     # anonymous user
@@ -33,8 +32,9 @@ class Ishapi::Ability
 
     can [ :update ], ::CoTailors::Address
     can [ :add ], ::CoTailors::OrderItem
-    can [ :create ], ::CoTailors::Order
-    
+    can [ :create, :update_measurements ], ::CoTailors::Order
+    can [ :show ], ::CoTailors::Product
+
     can [ :index, :show ], Event
 
     can [ :index ], Gallery

data/app/views/ishapi/measurements/_show.jbuilder

@@ -1,4 +1,14 @@
 
+# _vp_ 20180309
+# MEASUREMENT_PARAMS = [ :neck_around, :chest_around, :waist_around, :sleeve_length, :shoulder_width, :shirt_length, :bicep_around ]
+#
+
 json.measurement do
-  json.neck_around measurement.neck_around
+  json.neck_around     measurement.neck_around
+  json.chest_around    measurement.chest_around
+  json.waist_around    measurement.waist_around
+  json.sleeve_length   measurement.sleeve_length
+  json.shoulder_width  measurement.shoulder_width
+  json.shirt_length    measurement.shirt_length
+  json.bicep_around    measurement.bicep_around
 end

data/app/views/ishapi/orders/_item.jbuilder

@@ -2,6 +2,7 @@
 json.kind        item.kind
 json.fabric      item.fabric
 json.quantity    item.quantity
+json.cost        item.cost
 if item.measurement
   json.neck_around item.measurement.neck_around 
 end

data/app/views/ishapi/orders/_show.jbuilder

@@ -1,7 +1,9 @@
 
 # ishapi / orders / _show
 
-json.n_items order.items.length
+json.n_items     order.items.length
+json.order_total order.items.map { |i| i.cost }.reduce( :+ )
+
 json.order do
   json.array! order.items do |item|
     json.partial! 'ishapi/orders/item', :item => item

data/app/views/ishapi/products/show.jbuilder

@@ -0,0 +1,9 @@
+
+params.permit!
+json.cache! [ params, @product ] do
+  json.cost        @product.cost
+  json.title       @product.title
+  json.description @product.description
+  json.kind        @product.kind
+end
+

data/app/views/ishapi/reports/_index.jbuilder

@@ -11,5 +11,14 @@ json.reports do
     json.name        report.name
     json.reportname  report.name_seo
     json.description report.descr
+
+    if report.photo
+      json.photo do
+        json.thumb_url report.photo.photo.url :thumb
+        json.small_url report.photo.photo.url :small
+        json.large_url report.photo.photo.url :large
+      end
+    end
+
   end
 end

data/app/views/ishapi/reports/index.jbuilder

@@ -11,7 +11,12 @@ json.array! @reports do |report|
   json.subhead     report.subhead
   json.description report.descr
   if report.photo
-    json.photo      report.photo.photo.url( :thumb )
+    json.photo      report.photo.photo.url( :thumb ) # @deprecated 20180417
+    json.photos do
+      json.thumb_url report.photo.photo.url( :thumb )
+      json.small_url report.photo.photo.url( :small )
+      json.large_url report.photo.photo.url( :large )
+    end
   end
 end
 

data/app/views/ishapi/reports/show.jbuilder

@@ -24,6 +24,23 @@ json.cache! key do
 
     json.subhead     @report.subhead
     json.description @report.descr
+  
+    if @report.photo
+      json.photo do
+        json.thumb_url @report.photo.photo.url :thumb
+        json.small_url @report.photo.photo.url :small
+        json.large_url @report.photo.photo.url :large
+      end
+    end
+  end
 
+  # @deprecated, but specs use this _vp_ 20180423
+  if @report.photo
+    json.photo do
+      json.thumb_url @report.photo.photo.url :thumb
+      json.small_url @report.photo.photo.url :small
+      json.large_url @report.photo.photo.url :large
+    end
   end
+  
 end

data/app/views/ishapi/users/show.jbuilder

@@ -19,8 +19,8 @@ if @current_profile.addresses[0]
   json.partial! 'ishapi/addresses/show', :address => @current_profile.addresses[0]
 end
 
-if @current_profile.measurements[0]
-  json.partial! 'ishapi/measurements/show', :measurement => @current_profile.measurements[0]
+if @current_profile.measurement
+  json.partial! 'ishapi/measurements/show', :measurement => @current_profile.measurement
 end
 
 json.partial! 'ishapi/orders/show', :order => @current_order

data/app/views/ishapi/venues/_index.jbuilder

@@ -9,9 +9,11 @@ json.venues do
     json.id          venue.id.to_s
     json.name        venue.name
     json.name_seo    venue.name_seo
+    json.subhead     venue.subhead
     json.description venue.descr
     json.x           venue.x
     json.y           venue.y
     json.photo       venue.profile_photo.photo.url( :thumb ) if venue.profile_photo
+    json.partial! 'ishapi/tags/index', :tags => venue.tags
   end
 end

data/config/routes.rb

@@ -7,9 +7,11 @@ Ishapi::Engine.routes.draw do
   get 'cities',                :to => 'cities#index'
   get 'cities/view/:cityname', :to => 'cities#show'
   get 'cities/features',       :to => 'cities#features'
-
-  post 'co_tailors/orders',      :to => 'orders#create'
-  post 'co_tailors/order_items', :to => 'order_items#create'
+ 
+  post 'co_tailors/orders',                 :to => 'orders#create'
+  post 'co_tailors/order_items',            :to => 'order_items#create'
+  post 'co_tailors/measurements',           :to => 'measurements#update'
+  get  'co_tailors/products/by-kind/:kind', :to => 'products#show'
   namespace :co_tailors do
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.74
+  version: 0.1.8.75
 platform: ruby
 authors:
 - piousbox
@@ -188,12 +188,14 @@ files:
 - app/controllers/ishapi/events_controller.rb
 - app/controllers/ishapi/galleries_controller.rb
 - app/controllers/ishapi/invoices_controller.rb
+- app/controllers/ishapi/measurements_controller.rb
 - app/controllers/ishapi/my/my_controller.rb
 - app/controllers/ishapi/my/reports_controller.rb
 - app/controllers/ishapi/newsitems_controller.rb
 - app/controllers/ishapi/order_items_controller.rb
 - app/controllers/ishapi/orders_controller.rb
 - app/controllers/ishapi/payments_controller.rb
+- app/controllers/ishapi/products_controller.rb
 - app/controllers/ishapi/reports_controller.rb
 - app/controllers/ishapi/sites_controller.rb
 - app/controllers/ishapi/tags_controller.rb
@@ -234,6 +236,7 @@ files:
 - app/views/ishapi/orders/_show.jbuilder
 - app/views/ishapi/photos/_index.jbuilder
 - app/views/ishapi/photos/_show.jbuilder
+- app/views/ishapi/products/show.jbuilder
 - app/views/ishapi/reports/_index.jbuilder
 - app/views/ishapi/reports/index.jbuilder
 - app/views/ishapi/reports/show.jbuilder