ishapi 0.1.8.58 → 0.1.8.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c92b67c14e6c55592bdc128aa289ff60ed361b2
-  data.tar.gz: 735a14c7f9fa8f8d2b7b225fc55c7e91ab9da436
+  metadata.gz: c00c8cf678dcdb4701962e756db416e57b067f40
+  data.tar.gz: eeac4ad9a8cbab402d824083d5b1d81b31f3c97b
 SHA512:
-  metadata.gz: d0ad0e81ca3aa3202f03c7fa80ffed7c6d94dd02fb8e4b16fc9276e6ff745faf0cc499390225cbe38d9204df2130344fb9000b4620f12fda7b2ec9d6212e79d7
-  data.tar.gz: af92344d2edc48c8e508599a6521e9b042a26dffcca5ef7b0f806a13ad7b582daa2e395243cba11c688a9ebf9358f6c34da3c63fea384cdb724401baada2c114
+  metadata.gz: ed4954fbd7d16a1fda79184bb644370bc186452845b7661b0823da908b834bcf6dd3f3ecc9730db0039637b6dc5cd1f4068c77ce1dbf16666b77411ad66f9357
+  data.tar.gz: 77f5810cc116ce442cc175528e29412b25a2406a5005096513a693ff770257c51f24ca74de9b6cd212040715bf9ad6e8fbe1fc66b11b220976db6f14c7b80831

data/app/controllers/ishapi/application_controller.rb

@@ -21,6 +21,9 @@ module Ishapi
         @me               = @graph.get_object( 'me', :fields => 'email' )
         @current_user     = User.find_by :email => @me['email']
         @current_profile  = @current_user.profile
+        @current_order    = @current_profile.orders.where( :submitted_at => nil ).first || ::CoTailors::Order.create( :profile_id => @current_profile.id )
+      else
+        @current_user = current_user if Rails.env.test?
       end
     end
 
@@ -55,12 +58,15 @@ module Ishapi
                                                      :name                  => params[:name],
                                                      :signed_request        => params[:signedRequest]
           end
-          @current_user    = @user
-          @current_profile = @profile
+          @current_user     = @user
+          @current_profile  = @profile
+          @current_order    = @current_profile.orders.where( :submitted_at => nil ).first || ::CoTailors::Order.new( :profile_id => @current_profile.id )
         rescue Koala::Facebook::AuthenticationError => e
           render :json => { :status => :not_ok, :errors => "Probably expired token: #{accessToken}" }
           return
         end
+      else
+        @current_user = current_user if Rails.env.test?
       end
     end
     

data/app/controllers/ishapi/galleries_controller.rb

@@ -1,4 +1,5 @@
 require_dependency "ishapi/application_controller"
+
 module Ishapi
   class GalleriesController < ApplicationController
 

data/app/controllers/ishapi/order_items_controller.rb

@@ -0,0 +1,22 @@
+require_dependency "ishapi/application_controller"
+
+module Ishapi
+  class OrderItemsController < ApplicationController
+    before_action :check_profile, :only => [ :create ]
+
+    def create
+      # byebug
+
+      authorize! :add, CoTailors::OrderItem
+      @order_item = CoTailors::OrderItem.new params['order_item'].permit!
+      @order_item.order_id = @current_order.id
+      flag = @order_item.save
+      if flag
+        render :json => { :status => :ok, :message => 'Successfully put an order item' }
+      else
+        render :json => { :status => :not_ok, :error => @order_item.errors.messages }
+      end
+    end
+
+  end
+end

data/app/controllers/ishapi/orders_controller.rb

@@ -0,0 +1,23 @@
+require_dependency "ishapi/application_controller"
+
+module Ishapi
+  class OrdersController < ApplicationController
+    before_action :check_profile, :only => [ :create ]
+
+    def create
+      authorize! :create, CoTailors::Order
+
+      # byebug
+
+      @order = CoTailors::Order.where( :profile_id => @current_profile.id, :submitted_at => nil ).first
+      @order.submitted_at = Time.now
+      flag = @order.save
+      if flag
+        render :json => { :status => :ok, :message => 'Successfully placed the order' }
+      else
+        render :json => { :status => :not_ok, :error => @order.errors.messages }
+      end
+    end
+
+  end
+end

data/app/models/ishapi/ability.rb

@@ -18,7 +18,7 @@ class Ishapi::Ability
       end
 
 
-      can [ :update ], CoTailors::Address do |address|
+      can [ :update ], ::CoTailors::Address do |address|
         puts [ user.inspect, address.inspect ], '+++ user in cancancan'
         true
       end
@@ -31,7 +31,9 @@ class Ishapi::Ability
 
     can [ :index, :show ], City
 
-    can [ :update ], CoTailors::Address
+    can [ :update ], ::CoTailors::Address
+    can [ :add ], ::CoTailors::OrderItem
+    can [ :create ], ::CoTailors::Order
     
     can [ :index, :show ], Event
 

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

@@ -0,0 +1,3 @@
+
+json.kind  item.kind
+json.fabric item.fabric

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

@@ -0,0 +1,9 @@
+
+# ishapi / orders / _show
+
+json.n_items order.items.length
+json.order do
+  order.items.each do |item|
+    json.partial! 'ishapi/orders/item', :item => item
+  end
+end

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

@@ -1,6 +1,6 @@
 
 #
-# ishapi / users / _show.jbuilder
+# ishapi / users / show.jbuilder
 #
 
 json.email                @current_profile.email
@@ -18,3 +18,6 @@ end
 if @current_profile.addresses[0]
   json.partial! 'ishapi/addresses/show', :address => @current_profile.addresses[0]
 end
+
+json.partial! 'ishapi/orders/show', :order => @current_order
+

data/config/routes.rb

@@ -7,6 +7,8 @@ Ishapi::Engine.routes.draw do
   get 'cities',                :to => 'cities#index'
   get 'cities/view/:cityname', :to => 'cities#show'
 
+  post 'co_tailors/orders',      :to => 'orders#create'
+  post 'co_tailors/order_items', :to => 'order_items#create'
   namespace :co_tailors do
   end
 

data/lib/ishapi/engine.rb

@@ -1,3 +1,4 @@
+
 require 'rack/throttle'
 
 module Ishapi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.58
+  version: 0.1.8.59
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jbuilder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 description: " Description of Ishapi."
 email:
 - piousbox@gmail.com
@@ -183,6 +197,8 @@ files:
 - app/controllers/ishapi/my/reports_controller.rb~
 - app/controllers/ishapi/newsitems_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/reports_controller.rb
 - app/controllers/ishapi/reports_controller.rb~
@@ -229,6 +245,8 @@ files:
 - app/views/ishapi/newsitems/_index.jbuilder
 - app/views/ishapi/newsitems/_index.jbuilder~
 - app/views/ishapi/newsitems/index.jbuilder
+- app/views/ishapi/orders/_item.jbuilder
+- app/views/ishapi/orders/_show.jbuilder
 - app/views/ishapi/photos/_index.jbuilder
 - app/views/ishapi/photos/_index.jbuilder~
 - app/views/ishapi/photos/_show.jbuilder