ishapi 0.1.8.69 → 0.1.8.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 673c9fe837a1ba77d8bb26a1ca23fb2b6e135b2e
-  data.tar.gz: 6be81ac105a8e49db4e40d341eef339750620405
+  metadata.gz: 60a5d993e107b12d47480b884b7a77031e35a8c8
+  data.tar.gz: 82650adbc7f1cc677edcad7c86073e811ba62700
 SHA512:
-  metadata.gz: 3890acc78628bada8285236719ca9c480638ddf98e5fa8e0f4061c84122fc9e43b057520cb2cb3569afade071522c5e3526e7db531b04cd5d0cc6b57d398f7bf
-  data.tar.gz: f9b7aaee47cba2bcad6a2d4c8bd84519626580b5d61d270d4fb2570ec28f3587530b56da2b817a94ac62fc1925b36e03e0385d6550e9e92c0f48db59ead0b001
+  metadata.gz: c80d17b2fccfcc9037009bf85d9c84f9f9be5723d661e176df0a352f3b1b08b98a46bafd37161fe36d34301c50b44070bd4d45ba79200f8543c0cdf2ef4dbb07
+  data.tar.gz: 539fb1597817625b4644653b78caeb8c438196e7bb6ccd2b375b1e282ff2f574d0fcc5ef1b2a0b18ae4adf7a93979194fbc95073c434a0cc1b0cbbee9754371b

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::Shirt.cost
+                         when CoTailors::OrderItem::KIND_PANTS
+                           CoTaiilors::Pant.cost
+                         when CoTailors::OrderItem::KIND_SUIT
+                           CoTailors::Suit.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/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,8 @@ class Ishapi::Ability
 
     can [ :update ], ::CoTailors::Address
     can [ :add ], ::CoTailors::OrderItem
-    can [ :create ], ::CoTailors::Order
-    
+    can [ :create, :update_measurements ], ::CoTailors::Order
+
     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/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,10 @@ 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'
   namespace :co_tailors do
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.69
+  version: 0.1.8.70
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-11 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -191,6 +191,7 @@ files:
 - app/controllers/ishapi/galleries_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/my_controller.rb~
 - app/controllers/ishapi/my/reports_controller.rb